Merge pull request #248 from iea-annex60/issue225_stateSelect

Removed stateSelect on pressure for #225
ibpsa · May 26, 2015 · ceaf706 · ceaf706
2 parents e764974 + 9e80052
commit ceaf706
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 42 deletions.
diff --git a/Annex60/Fluid/Interfaces/ConservationEquation.mo b/Annex60/Fluid/Interfaces/ConservationEquation.mo
@@ -17,9 +17,7 @@ model ConservationEquation "Lumped volume with mass and energy balance"
   // Set nominal attributes where literal values can be used.
   Medium.BaseProperties medium(
     preferredMediumStates= not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState),
-    p(start=p_start,
-      stateSelect=if not (massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)
-                     then StateSelect.prefer else StateSelect.default),
+    p(start=p_start),
     h(start=hStart),
     T(start=T_start),
     Xi(start=X_start[1:Medium.nXi],
@@ -275,6 +273,22 @@ Annex60.Fluid.MixingVolumes.MixingVolume</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+May 22, 2015 by Michael Wetter:<br/>
+Removed <pre>
+p(stateSelect=if not (massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)
+then StateSelect.prefer else StateSelect.default)
+</pre>
+because the previous declaration led to the translation error
+<pre>
+The model requires derivatives of some inputs as listed below:
+1 inlet.m_flow
+1 inlet.p
+</pre>
+when translating
+<code>Buildings.Fluid.FMI.Examples.FMU.HeaterCooler_u</code>
+with a dynamic energy balance.
+</li>
+<li>
 May 6, 2015, by Michael Wetter:<br/>
 Corrected documentation.
 </li>

diff --git a/...urces/ReferenceResults/Dymola/Annex60_Fluid_Interfaces_Examples_ReverseFlowHumidifier.txt b/...urces/ReferenceResults/Dymola/Annex60_Fluid_Interfaces_Examples_ReverseFlowHumidifier.txt
diff --git a/...ces/ReferenceResults/Dymola/Annex60_Fluid_MixingVolumes_Examples_MixingVolumeMoistAir.txt b/...ces/ReferenceResults/Dymola/Annex60_Fluid_MixingVolumes_Examples_MixingVolumeMoistAir.txt
diff --git a/Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_Movers_Examples_PumpsParallel.txt b/Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_Movers_Examples_PumpsParallel.txt
@@ -1,6 +1,6 @@
-last-generated=2015-05-08
-statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '2', 'linear': '2'}
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '2', 'number of continuous time states': '6', 'linear': '4'}
+last-generated=2015-05-22
+statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '2'}
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '2', 'number of continuous time states': '6', 'linear': ' '}
 floMac1.y=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
 time=[0., 300.]
 floMac2.dp=[0., -1166.6256103515625, -2483.97021484375, -3253.6982421875, -3641.571044921875, -3827.016845703125, -3913.8603515625, -3953.973388671875, -3972.57373046875, -3980.77197265625, -3984.939697265625, -3986.81396484375, -3987.4697265625, -3987.805419921875, -3988.013427734375, -3988.13818359375, -3988.198974609375, -3988.214111328125, -3988.203369140625, -3988.18505859375, -3988.1787109375, -3988.185546875, -3988.1904296875, -3988.194091796875, -3988.19677734375, -3988.19873046875, -3988.19970703125, -3988.2001953125, -3988.199951171875, -3988.199462890625, -3988.19873046875, -3988.197998046875, -3988.197265625, -3988.196533203125, -3988.196044921875, -3988.196044921875, -3988.196533203125, -3988.197021484375, -3988.197265625, -3988.197509765625, -3988.197509765625, -3988.197509765625, -3988.19775390625, -3988.19775390625, -3988.197509765625, -3988.197509765625, -3988.197509765625, -3988.197509765625, -3988.197509765625, -3988.197509765625, -3988.197509765625, -3811.538818359375, -3566.976318359375, -3379.406982421875, -3265.297119140625, -3220.5107421875, -3202.815673828125, -3192.431884765625, -3189.127685546875, -3188.244873046875, -3188.012451171875, -3187.94873046875, -3187.93212890625, -3187.927490234375, -3187.92578125, -3187.92529296875, -3187.925048828125, -3187.925048828125, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875, -3187.9248046875]

diff --git a/.../ReferenceResults/Dymola/Annex60_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt b/.../ReferenceResults/Dymola/Annex60_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
diff --git a/Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_Movers_Validation_Pump_stratos.txt b/Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_Movers_Validation_Pump_stratos.txt
@@ -1,6 +1,6 @@
-last-generated=2015-05-08
-statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '1, 1', 'linear': '0'}
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1, 1, 2', 'number of continuous time states': '1', 'linear': '0'}
+last-generated=2015-05-22
+statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '1, 1'}
+statistics-simulation={'numerical Jacobians': '0', 'nonlinear': '1, 1, 2', 'number of continuous time states': '1', 'linear': ' '}
 gain.u=[1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 0.97999999999999998224, 0.95999999999999996447, 0.93999999999999994671, 0.92000000000000003997, 0.9000000000000000222, 0.88000000000000000444, 0.85999999999999998668, 0.83999999999999996891, 0.81999999999999995115, 0.80000000000000004441, 0.78000000000000002665, 0.76000000000000000888, 0.73999999999999999112, 0.71999999999999997335, 0.69999999999999995559, 0.68000000000000004885, 0.66000000000000003109, 0.64000000000000001332, 0.61999999999999999556, 0.5999999999999999778, 0.57999999999999996003, 0.56000000000000005329, 0.54000000000000003553, 0.52000000000000001776, 0.5, 0.47999997019810392018, 0.45999997019824601097, 0.4399999403962078226, 0.42000002980168282818, 0.40000002980196702751, 0.38000000000007094769, 0.36000000000021326052, 0.33999997019817507216, 0.3199999403965276823, 0.3000000596035790057, 0.2800000298018960887, 0.25999999999985790033, 0.23999998509901643295, 0.21999997019821049271, 0.19999995529722691678, 0.18000005960366774471, 0.16000002980182492784, 0.14000001490089464262, 0.11999999254935733717, 0.09999997764865797834, 0.07999995529723590015, 0.06000005587844860211, 0.04000003725226354556, 0.02000001862613177278, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]
 time=[0., 1.]
 floMacDyn.dpMachine=[33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 33061.0234375, 31751.75462589662856771611, 30468.94277120873084641062, 29212.57632038455631118268, 27982.66304942565693636425, 26779.20259389691636897624, 25602.1897312243418127764, 24451.62809465989994350821, 23327.52099141531653003767, 22229.85976376934195286594, 21158.65171471854773699306, 20113.89601065291208215058, 19095.58837114456400740892, 18103.73195648939508828335, 17138.32481356240168679506, 16199.37360022500433842652, 15286.86979652622176217847, 14400.81624174500757362694, 13541.21642757666268153116, 12708.06425827059319999535, 11901.3642916339922521729, 11121.11587663877435261384, 10367.31729484460629464593, 9639.96896323460350686219, 8939.07390052412483782973, 8264.626953125, 7616.63172138850768533302, 6995.08673541340613155626, 6399.99297176917843898991, 5831.35324823633618507301, 5289.16127825060721079353, 4773.41955403509746247437, 4284.12905592206607252592, 3821.28953725576639044448, 3384.90075263618155076983, 2974.96530759317829506472, 2591.47807250048936111853, 2234.44181559106573331519, 1903.85641731785381125519, 1599.72187768871140178817, 1322.48192247263637000287, 1072.80250593096843658714, 850.38756017551554577949, 654.79151416190154577635, 485.34627672188128144626, 341.0634744985282509333, 220.70257662097625939168, 124.77137804215394112362, 53.92853344064926801593, 14.59154507711063786246, 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]