From b0044fd05eac196c68a6710cd85338e4db5f9d07 Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Mon, 19 Aug 2024 14:34:15 -0700
Subject: [PATCH 01/47] Changed markup commands
This is to allow use of the refactored BuildingsPy, see https://github.com/lbl-srg/BuildingsPy/issues/566
---
.../PartialReversibleRefrigerantMachine.mo | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
index 8b2929f42d..94359a289b 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
@@ -382,9 +382,9 @@ partial model PartialReversibleRefrigerantMachine
rotation=180,
origin={110,30})));
// To avoid using the bus, set the section below to protected
-//
+//@modelica_select_end
RefrigerantMachineControlBus sigBus
"Bus with model outputs and possibly inputs" annotation (Placement(transformation(
extent={{-156,-58},{-126,-24}}),iconTransformation(extent={{-108,-52},
@@ -393,12 +393,12 @@ protected
parameter Boolean use_busConOnl=false
"=true to allow input to bus connector,
not applicable with internal safety control"
- annotation(choices(checkBox=true), Dialog(group="Input Connectors", enable=not
- use_intSafCtr));
+ annotation(choices(checkBox=true),
+ Dialog(group="Input Connectors", enable=not use_intSafCtr));
-//
+//@modelica_select_end
parameter Boolean use_COP "=true to enable COP output";
parameter Boolean use_EER "=true to enable EER output";
parameter MediumCon.ThermodynamicState staCon_nominal=MediumCon.setState_pTX(
@@ -692,6 +692,12 @@ equation
fillPattern=FillPattern.Solid)}),
Diagram(coordinateSystem(extent={{-140,-160},{140,160}})),
Documentation(revisions="
+ -
+ August 19, 2024 by Michael Wetter:
+ Changed markup commands for code merge.
+ This is for
+ IBPSA #1919.
+
-
July 15, 2024 by Fabian Wuellhorst:
Adjust hysteresis bandwidth (see issue
From 644d30e8e7d06a86c402a41e738dcedd84521169 Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Tue, 20 Aug 2024 15:24:00 -0700
Subject: [PATCH 02/47] wrapped getPeak in if-statement to skip it unless
needed
---
IBPSA/Fluid/Movers/Data/Generic.mo | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/IBPSA/Fluid/Movers/Data/Generic.mo b/IBPSA/Fluid/Movers/Data/Generic.mo
index e49bd6f4e3..47094f6ce5 100644
--- a/IBPSA/Fluid/Movers/Data/Generic.mo
+++ b/IBPSA/Fluid/Movers/Data/Generic.mo
@@ -91,7 +91,11 @@ record Generic "Generic data record for movers"
enable = etaHydMet==
IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber));
final parameter IBPSA.Fluid.Movers.BaseClasses.Euler.peak peak_internal=
- IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak(pressure=pressure,power=power)
+ if etaHydMet == IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber
+ then IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak(pressure=pressure,power=power)
+ else IBPSA.Fluid.Movers.BaseClasses.Euler.peak(V_flow=V_flow_max/2,
+ dp=dpMax/2,
+ eta=0.7)
"Internal peak variable";
// The getPeak() function automatically handles the estimation of peak point
// when insufficient information is provided from the pressure curve.
@@ -161,6 +165,15 @@ record Generic "Generic data record for movers"
Documentation(revisions="
-
+August 20, 2024, by Hongxiang Fu:
+Now the function
+
+IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak
+is not called unless the Euler number method is selected.
+This is for
+IBPSA, #1912.
+
+-
April 8, 2024, by Hongxiang Fu:
Default efficiency methods now depend on whether a pressure curve is available.
This is for
From b6ec41d2650a800babb3d10b8669dcaadb56637c Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Tue, 20 Aug 2024 15:24:17 -0700
Subject: [PATCH 03/47] refactored validation model
---
.../Movers/Validation/ComparePowerHydraulic.mo | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo b/IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo
index 91abcbd8e1..097394940f 100644
--- a/IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo
+++ b/IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo
@@ -19,7 +19,7 @@ model ComparePowerHydraulic
powerOrEfficiencyIsHydraulic=per.powerOrEfficiencyIsHydraulic,
pressure=per.pressure,
etaHydMet=IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber,
- peak=per.peak,
+ peak=peak,
etaMotMet=per.etaMotMet),
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
addPowerToMedium=false,
@@ -30,12 +30,18 @@ model ComparePowerHydraulic
powerOrEfficiencyIsHydraulic=per.powerOrEfficiencyIsHydraulic,
pressure=per.pressure,
etaHydMet=IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Efficiency_VolumeFlowRate,
- efficiency(V_flow={per.peak.V_flow}, eta={per.peak.eta}),
+ efficiency(V_flow={peak.V_flow}, eta={peak.eta}),
etaMotMet=per.etaMotMet),
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
addPowerToMedium=false,
use_inputFilter=false));
+ final parameter IBPSA.Fluid.Movers.BaseClasses.Euler.peak peak =
+ IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak(
+ pressure=per.pressure,
+ power=per.power)
+ "Peak operating point";
+
equation
connect(ramSpe.y, mov2.y) annotation (Line(points={{-59,80},{-52,80},{-52,0},
{-30,0},{-30,-8}}, color={0,0,127}));
@@ -86,6 +92,13 @@ to capture this characteristic.
", revisions="
-
+August 20, 2024, by Hongxiang Fu:
+Added standalone declaration for the peak operating condition to ensure that
+the same values are used for each mover.
+This is for
+IBPSA, #1912.
+
+-
May 15, 2024, by Hongxiang Fu:
First implementation. This is for
IBPSA, #1880.
From 7f8ba821676cfded7934e3d3565faa5892a18e8b Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Tue, 20 Aug 2024 15:24:41 -0700
Subject: [PATCH 04/47] updated results Fluid.Movers.Validation
---
...overs_Validation_ComparePowerHydraulic.txt | 16 +++++++-------
...id_Movers_Validation_ComparePowerInput.txt | 22 +++++++++----------
...id_Movers_Validation_ComparePowerTotal.txt | 22 +++++++++----------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerHydraulic.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerHydraulic.txt
index cd090ef000..fa717748c7 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerHydraulic.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerHydraulic.txt
@@ -1,4 +1,4 @@
-last-generated=2024-05-15
+last-generated=2024-08-20
statistics-initialization=
{
"nonlinear": "1, 1, 1",
@@ -11,17 +11,17 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 2e+02]
-mov1.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.662420831620693e-02, 4.886708855628967e-01, 4.575706720352173e-01, 4.664972424507141e-01, 4.722372889518738e-01, 4.730210602283478e-01, 4.732595980167389e-01, 4.733445346355438e-01, 4.733809530735016e-01, 4.734058976173401e-01, 4.734263122081757e-01, 4.734432995319366e-01, 4.734576940536499e-01, 4.734700322151184e-01, 4.734807312488556e-01, 4.734900891780853e-01, 4.734983444213867e-01, 4.735057055950165e-01, 4.735122621059418e-01, 4.735181629657745e-01, 4.735235273838043e-01, 4.735283851623535e-01, 4.735328257083893e-01, 4.73536878824234e-01, 4.735406339168549e-01, 4.735440909862518e-01, 4.735472798347473e-01, 4.735502600669861e-01, 4.735530316829681e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.720738530158997e-01, 4.685670733451843e-01, 4.624316990375519e-01, 4.531229436397552e-01, 4.401520192623138e-01, 4.22771155834198e-01, 4.018683433532715e-01, 3.787632882595062e-01, 3.543288707733154e-01, 3.284392654895782e-01, 3.014431297779083e-01, 2.739090621471405e-01, 2.469863593578339e-01, 2.209040075540543e-01, 1.954464465379715e-01, 1.705373078584671e-01, 1.462413817644119e-01, 1.227991729974747e-01, 1.006607487797737e-01, 8.044449985027313e-02, 6.276434659957886e-02, 4.799483716487885e-02, 3.614896535873413e-02, 2.694092504680157e-02, 1.993774995207787e-02, 1.004645973443985e-02, 2.319475170224905e-03, 2.447633305564523e-04, 6.818353995186044e-06, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07, 1.332103067852586e-07]
-mov1.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.80345806479454e-02, 6.981012225151062e-01, 6.536723971366882e-01, 6.664246320724487e-01, 6.746246814727783e-01, 6.75744354724884e-01, 6.760851144790649e-01, 6.762064695358276e-01, 6.762585043907166e-01, 6.762941479682922e-01, 6.763232946395874e-01, 6.763476133346558e-01, 6.763681769371033e-01, 6.76385760307312e-01, 6.764010787010193e-01, 6.76414430141449e-01, 6.764262318611145e-01, 6.76436722278595e-01, 6.764460802078247e-01, 6.764545440673828e-01, 6.764621734619141e-01, 6.76469087600708e-01, 6.76475465297699e-01, 6.764812469482422e-01, 6.76486611366272e-01, 6.764915585517883e-01, 6.764960885047913e-01, 6.765003800392151e-01, 6.765043139457703e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.743912100791931e-01, 6.693814992904663e-01, 6.606167554855347e-01, 6.473184823989868e-01, 6.287885904312134e-01, 6.03958785533905e-01, 5.740976333618164e-01, 5.410903692245483e-01, 5.061841011047363e-01, 4.691989421844482e-01, 4.306330382823944e-01, 3.912986516952515e-01, 3.528376519680023e-01, 3.155771493911743e-01, 2.792091965675354e-01, 2.436247318983078e-01, 2.089162617921829e-01, 1.754273921251297e-01, 1.438010782003403e-01, 1.149207204580307e-01, 8.966335654258728e-02, 6.856404989957809e-02, 5.164137855172157e-02, 3.84870357811451e-02, 2.848249860107899e-02, 1.435208506882191e-02, 3.313535824418068e-03, 3.496618883218616e-04, 9.740506357047707e-06, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07, 1.903004402947772e-07]
+mov1.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.437269270420074e-02, 5.481759905815125e-01, 4.714193344116211e-01, 4.638824164867401e-01, 4.620190858840942e-01, 4.607722163200378e-01, 4.605394303798676e-01, 4.605742394924164e-01, 4.606086611747742e-01, 4.606361985206604e-01, 4.606587290763855e-01, 4.606775045394897e-01, 4.606933891773224e-01, 4.607070088386536e-01, 4.607188105583191e-01, 4.607291221618652e-01, 4.607382416725159e-01, 4.607463479042053e-01, 4.607535898685455e-01, 4.607601165771484e-01, 4.607660174369812e-01, 4.60771381855011e-01, 4.60776299238205e-01, 4.607807695865631e-01, 4.60784912109375e-01, 4.607887268066406e-01, 4.607922434806824e-01, 4.60795521736145e-01, 4.60798591375351e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.666680991649628e-01, 4.713804721832275e-01, 4.736599326133728e-01, 4.725481569766998e-01, 4.673967063426971e-01, 4.575338065624237e-01, 4.426591992378235e-01, 4.22135204076767e-01, 3.975521922111511e-01, 3.710594773292542e-01, 3.434852361679077e-01, 3.147880136966705e-01, 2.862003147602081e-01, 2.584343552589417e-01, 2.318070232868195e-01, 2.061139196157455e-01, 1.811380237340927e-01, 1.568211019039154e-01, 1.332632750272751e-01, 1.107579991221428e-01, 8.980277925729752e-02, 7.100936025381088e-02, 5.489465966820717e-02, 4.167637228965759e-02, 3.122827224433422e-02, 1.596144773066044e-02, 3.714530495926738e-03, 3.926155040971935e-04, 1.178046932182042e-05, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07, 2.141434265467979e-07]
+mov1.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.338956207036972e-02, 7.831085324287415e-01, 6.734561920166016e-01, 6.626891493797302e-01, 6.600272655487061e-01, 6.582460403442383e-01, 6.579135060310364e-01, 6.579632163047791e-01, 6.580123901367188e-01, 6.580517292022705e-01, 6.580839157104492e-01, 6.581107378005981e-01, 6.581333875656128e-01, 6.581528782844543e-01, 6.581697463989258e-01, 6.581844687461853e-01, 6.581975221633911e-01, 6.582090854644775e-01, 6.582193970680237e-01, 6.582287549972534e-01, 6.582371592521667e-01, 6.582448482513428e-01, 6.582518219947815e-01, 6.582582592964172e-01, 6.5826416015625e-01, 6.582695841789246e-01, 6.582746505737305e-01, 6.582793593406677e-01, 6.582837104797363e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.66668713092804e-01, 6.734006404876709e-01, 6.766570210456848e-01, 6.750687956809998e-01, 6.677095890045166e-01, 6.536197066307068e-01, 6.323702931404114e-01, 6.030502915382385e-01, 5.679317116737366e-01, 5.300849676132202e-01, 4.90693211555481e-01, 4.496971666812897e-01, 4.088576138019562e-01, 3.691919147968292e-01, 3.311528861522675e-01, 2.944484651088715e-01, 2.58768618106842e-01, 2.240301370620728e-01, 1.903761029243469e-01, 1.582257151603699e-01, 1.282896846532822e-01, 1.014419421553612e-01, 7.842094451189041e-02, 5.953767523169518e-02, 4.461181536316872e-02, 2.280206978321075e-02, 5.306472070515156e-03, 5.608792998827994e-04, 1.682924266788177e-05, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07, 3.059191726606514e-07]
mov1.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
-mov2.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.662420831620693e-02, 4.772703945636749e-01, 4.555684626102448e-01, 4.655129611492157e-01, 4.716578423976898e-01, 4.729596972465515e-01, 4.734602570533752e-01, 4.736304879188538e-01, 4.736784398555756e-01, 4.737041294574738e-01, 4.737251698970795e-01, 4.737426936626434e-01, 4.737575054168701e-01, 4.737702012062073e-01, 4.737812280654907e-01, 4.737908542156219e-01, 4.737993776798248e-01, 4.738069176673889e-01, 4.738136827945709e-01, 4.73819762468338e-01, 4.738252758979797e-01, 4.738302826881409e-01, 4.738348722457886e-01, 4.738390445709229e-01, 4.738429188728333e-01, 4.738464653491974e-01, 4.738497734069824e-01, 4.73852813243866e-01, 4.738556742668152e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.738583266735077e-01, 4.713123440742493e-01, 4.671888649463654e-01, 4.60603654384613e-01, 4.509723782539368e-01, 4.37668114900589e-01, 4.199198484420776e-01, 3.982676267623901e-01, 3.736592829227448e-01, 3.481574058532715e-01, 3.220967352390289e-01, 2.963062822818756e-01, 2.711859941482544e-01, 2.468719780445099e-01, 2.229952812194824e-01, 1.991135478019714e-01, 1.751594394445419e-01, 1.513972282409668e-01, 1.281031966209412e-01, 1.057700365781784e-01, 8.508840203285217e-02, 6.677346676588058e-02, 5.130886659026146e-02, 3.879599645733833e-02, 2.900158800184727e-02, 2.151241898536682e-02, 1.087541785091162e-02, 2.517290879040956e-03, 2.658205339685082e-04, 7.40551513445098e-06, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07, 1.446822324169261e-07]
-mov2.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.80345806479454e-02, 6.818148493766785e-01, 6.508120894432068e-01, 6.650184988975525e-01, 6.737968921661377e-01, 6.756567358970642e-01, 6.763718128204346e-01, 6.766149997711182e-01, 6.766834855079651e-01, 6.767202019691467e-01, 6.767502427101135e-01, 6.767752766609192e-01, 6.767964363098145e-01, 6.768146157264709e-01, 6.768303513526917e-01, 6.768441200256348e-01, 6.768562197685242e-01, 6.768670082092285e-01, 6.768767237663269e-01, 6.768853664398193e-01, 6.768932342529297e-01, 6.769003868103027e-01, 6.76906943321228e-01, 6.769129037857056e-01, 6.769184470176697e-01, 6.769235134124756e-01, 6.769282221794128e-01, 6.769325733184814e-01, 6.769366860389709e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.769404411315918e-01, 6.733033061027527e-01, 6.674126386642456e-01, 6.580052375793457e-01, 6.442462205886841e-01, 6.252401471138e-01, 5.998855233192444e-01, 5.689537525177002e-01, 5.337989926338196e-01, 4.973677396774292e-01, 4.601381719112396e-01, 4.232946932315826e-01, 3.874085545539856e-01, 3.526742458343506e-01, 3.185646831989288e-01, 2.844479382038116e-01, 2.502277791500092e-01, 2.162817567586899e-01, 1.830045729875565e-01, 1.511000543832779e-01, 1.215548664331436e-01, 9.539066255092621e-02, 7.3298379778862e-02, 5.542285367846489e-02, 4.143083840608597e-02, 3.073202818632126e-02, 1.553631201386452e-02, 3.59613006003201e-03, 3.79743636585772e-04, 1.057930694514653e-05, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07, 2.066889095431179e-07]
+mov2.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.437269270420074e-02, 5.435284972190857e-01, 4.745968282222748e-01, 4.679819941520691e-01, 4.660753607749939e-01, 4.646429121494293e-01, 4.643639624118805e-01, 4.643966853618622e-01, 4.644306004047394e-01, 4.644577205181122e-01, 4.64479923248291e-01, 4.644984304904938e-01, 4.645140767097473e-01, 4.645274877548218e-01, 4.64539110660553e-01, 4.645493030548096e-01, 4.645582735538483e-01, 4.645662605762482e-01, 4.645733833312988e-01, 4.645798206329346e-01, 4.645856320858002e-01, 4.645909368991852e-01, 4.64595764875412e-01, 4.646001756191254e-01, 4.646042585372925e-01, 4.646080136299133e-01, 4.646115005016327e-01, 4.646147191524506e-01, 4.646177291870117e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.646205306053162e-01, 4.709663689136505e-01, 4.749200344085693e-01, 4.751509428024292e-01, 4.71950501203537e-01, 4.658993184566498e-01, 4.55511748790741e-01, 4.402367174625397e-01, 4.192683398723602e-01, 3.937205374240875e-01, 3.654965758323669e-01, 3.371032178401947e-01, 3.088672161102295e-01, 2.823172211647034e-01, 2.572263479232788e-01, 2.330376654863358e-01, 2.091998904943466e-01, 1.854071021080017e-01, 1.617918461561203e-01, 1.385459452867508e-01, 1.159966886043549e-01, 9.469646215438843e-02, 7.53411203622818e-02, 5.855219066143036e-02, 4.464682191610336e-02, 3.356937319040298e-02, 1.724470965564251e-02, 4.029461182653904e-03, 4.263716982677579e-04, 1.279491152672563e-05, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07, 2.325852079820834e-07]
+mov2.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.338956207036972e-02, 7.764692902565002e-01, 6.779954433441162e-01, 6.685457229614258e-01, 6.658219695091248e-01, 6.63775622844696e-01, 6.633771061897278e-01, 6.634238362312317e-01, 6.634722948074341e-01, 6.635110378265381e-01, 6.635427474975586e-01, 6.635691523551941e-01, 6.635915040969849e-01, 6.636106967926025e-01, 6.636273264884949e-01, 6.636418700218201e-01, 6.636546850204468e-01, 6.636660695075989e-01, 6.636762619018555e-01, 6.636854410171509e-01, 6.636937856674194e-01, 6.637012958526611e-01, 6.637082099914551e-01, 6.637145280838013e-01, 6.637203693389893e-01, 6.63725733757019e-01, 6.637306809425354e-01, 6.637353301048279e-01, 6.637396216392517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.637436151504517e-01, 6.728090643882751e-01, 6.784572005271912e-01, 6.787870526313782e-01, 6.742150187492371e-01, 6.655704379081726e-01, 6.50731086730957e-01, 6.289095878601074e-01, 5.989547371864319e-01, 5.624579191207886e-01, 5.221379995346069e-01, 4.815760254859924e-01, 4.412388801574707e-01, 4.033102989196777e-01, 3.674662113189697e-01, 3.3291095495224e-01, 2.988569736480713e-01, 2.648673057556152e-01, 2.311312109231949e-01, 1.979227662086487e-01, 1.657095551490784e-01, 1.35280653834343e-01, 1.076301708817482e-01, 8.364598453044891e-02, 6.378117948770523e-02, 4.795624688267708e-02, 2.463530004024506e-02, 5.756373051553965e-03, 6.09102426096797e-04, 1.827844425861258e-05, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07, 3.322645909520361e-07]
mov2.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
mov3.eta=[4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01, 4.739425182342529e-01]
mov3.etaHyd=[6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01, 6.770607829093933e-01]
mov3.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
ramSpe.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.333333507180214e-02, 6.666667014360428e-02, 1.000000014901161e-01, 1.333333402872086e-01, 1.666666716337204e-01, 2.000000029802322e-01, 2.333333343267441e-01, 2.666666805744171e-01, 3.00000011920929e-01, 3.333333432674408e-01, 3.666666746139526e-01, 4.000000059604645e-01, 4.333333373069763e-01, 4.666666686534882e-01, 5e-01, 5.333333611488342e-01, 5.666666626930237e-01, 6.00000023841858e-01, 6.333333253860473e-01, 6.666666865348816e-01, 6.99999988079071e-01, 7.333333492279053e-01, 7.666666507720947e-01, 8.00000011920929e-01, 8.333333134651184e-01, 8.666666746139526e-01, 8.999999761581421e-01, 9.333333373069763e-01, 9.666666388511658e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
ramDam.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.666666388511658e-01, 9.333333373069763e-01, 8.999999761581421e-01, 8.666666746139526e-01, 8.333333134651184e-01, 8.00000011920929e-01, 7.666666507720947e-01, 7.333333492279053e-01, 6.99999988079071e-01, 6.666666865348816e-01, 6.333333253860474e-01, 6.000000238418579e-01, 5.666666626930237e-01, 5.333333611488342e-01, 5e-01, 4.666666686534882e-01, 4.333333373069763e-01, 4.000000059604645e-01, 3.666666746139526e-01, 3.333333432674408e-01, 3.00000011920929e-01, 2.666666805744171e-01, 2.333333343267441e-01, 2.000000029802322e-01, 1.666666716337204e-01, 1.333333402872086e-01, 1.000000014901161e-01, 6.666667014360428e-02, 3.333333507180214e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-mov1.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 4.784634113311768e+00, 2.153220748901367e+01, 5.322282409667977e+01, 1.047782287597656e+02, 1.820938262939453e+02, 2.897984619140625e+02, 4.328740539550781e+02, 6.163928833007812e+02, 8.455368041992188e+02, 1.125414672851562e+03, 1.461099853515625e+03, 1.857665893554688e+03, 2.320186279296875e+03, 2.853734619140625e+03, 3.463384033203125e+03, 4.15420849609375e+03, 4.931280761718753e+03, 5.799675292968746e+03, 6.76446435546875e+03, 7.83072265625e+03, 9.0035224609375e+03, 1.02879384765625e+04, 1.16890439453125e+04, 1.32119111328125e+04, 1.4861615234375e+04, 1.6643228515625e+04, 1.856182421875e+04, 2.06224765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2562322265625e+04, 2.2222333984375e+04, 2.17934296875e+04, 2.1258087890625e+04, 2.059309375e+04, 1.97520625e+04, 1.880525e+04, 1.7863771484375e+04, 1.7009693359375e+04, 1.6212673828125e+04, 1.54711806640625e+04, 1.47925595703125e+04, 1.41923935546875e+04, 1.36617255859375e+04, 1.3185326171875e+04, 1.2753912109375e+04, 1.23623388671875e+04, 1.200891796875e+04, 1.169495703125e+04, 1.1423541015625e+04, 1.11971806640625e+04, 1.1015421875e+04, 1.0874197265625e+04, 1.07670966796875e+04, 1.0687154296875e+04, 1.05992001953125e+04, 2.43349658203125e+03, 2.56244140625e+02, 7.136455059051514e+00, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01]
-mov2.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 4.898924350738525e+00, 2.16268424987793e+01, 5.33353576660157e+01, 1.049069595336914e+02, 1.821174468994141e+02, 2.896756286621094e+02, 4.326127319335938e+02, 6.160057373046875e+02, 8.450044555664062e+02, 1.12470458984375e+03, 1.460176513671875e+03, 1.856490356445312e+03, 2.31871630859375e+03, 2.851924560546875e+03, 3.461185546875e+03, 4.1515693359375e+03, 4.928145507812503e+03, 5.795985351562496e+03, 6.76015869140625e+03, 7.8257353515625e+03, 8.9977861328125e+03, 1.0281380859375e+04, 1.168158984375e+04, 1.32034833984375e+04, 1.4852130859375e+04, 1.6632603515625e+04, 1.854997265625e+04, 2.06093046875e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2815673828125e+04, 2.2598779296875e+04, 2.2287890625e+04, 2.1879923828125e+04, 2.1359462890625e+04, 2.0709966796875e+04, 1.9886181640625e+04, 1.8975267578125e+04, 1.810778125e+04, 1.7311208984375e+04, 1.6531923828125e+04, 1.5739392578125e+04, 1.49410966796875e+04, 1.419896875e+04, 1.35336044921875e+04, 1.2942490234375e+04, 1.2417359375e+04, 1.1941337890625e+04, 1.15116962890625e+04, 1.11300244140625e+04, 1.080007421875e+04, 1.05248955078125e+04, 1.03039375e+04, 1.0132255859375e+04, 1.0002056640625e+04, 9.904873046875e+03, 9.7790146484375e+03, 2.43349658203125e+03, 2.56244140625e+02, 7.136455059051514e+00, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01, 1.394233703613281e-01]
-mov3.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.012787908315659e-01, 4.933322429656982e+00, 2.078840065002441e+01, 5.238673019409188e+01, 1.044012451171875e+02, 1.817397918701172e+02, 2.89380859375e+02, 4.32327880859375e+02, 6.156624755859375e+02, 8.445794067382812e+02, 1.124188842773438e+03, 1.459560791015625e+03, 1.855765625e+03, 2.317873291015625e+03, 2.8509541015625e+03, 3.460077880859375e+03, 4.15031494140625e+03, 4.926735839843753e+03, 5.794409667968746e+03, 6.75840771484375e+03, 7.82379931640625e+03, 8.9956552734375e+03, 1.0279044921875e+04, 1.16790390625e+04, 1.32007080078125e+04, 1.48491201171875e+04, 1.662934765625e+04, 1.85464609375e+04, 2.060552734375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.281162109375e+04, 2.247336328125e+04, 2.1970287109375e+04, 2.1264125e+04, 2.0324251953125e+04, 1.9124876953125e+04, 1.761944140625e+04, 1.5945466796875e+04, 1.42762890625e+04, 1.271678515625e+04, 1.1235283203125e+04, 9.8401826171875e+03, 8.549171875e+03, 7.3961025390625e+03, 6.367712890625e+03, 5.4374208984375e+03, 4.58920166015625e+03, 3.81456689453125e+03, 3.11152734375e+03, 2.483894287109375e+03, 1.938971557617188e+03, 1.482845947265625e+03, 1.1155009765625e+03, 8.294064331054688e+02, 6.120479125976562e+02, 4.495857238769531e+02, 2.241946105957031e+02, 5.13458137512207e+01, 5.406650066375732e+00, 1.505763828754425e-01, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03, 2.941777929663658e-03]
+mov1.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 5.616763114929199e+00, 2.323433303833008e+01, 5.588132476806648e+01, 1.091670455932617e+02, 1.888549194335938e+02, 2.999674377441406e+02, 4.47770751953125e+02, 6.375513916015625e+02, 8.745592041015625e+02, 1.164041625976562e+03, 1.511246215820312e+03, 1.921420654296875e+03, 2.399812255859375e+03, 2.95166845703125e+03, 3.582237060546875e+03, 4.296765625e+03, 5.100500976562503e+03, 5.998691894531246e+03, 6.99658447265625e+03, 8.09942724609375e+03, 9.3124677734375e+03, 1.06409521484375e+04, 1.20901298828125e+04, 1.36652470703125e+04, 1.5371552734375e+04, 1.721429296875e+04, 1.919871484375e+04, 2.1330068359375e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.3478103515625e+04, 2.3288015625e+04, 2.3008984375e+04, 2.26262421875e+04, 2.2131185546875e+04, 2.1501841796875e+04, 2.0718240234375e+04, 1.9722154296875e+04, 1.8620125e+04, 1.7579431640625e+04, 1.6664498046875e+04, 1.58273857421875e+04, 1.50867109375e+04, 1.44406025390625e+04, 1.38779609375e+04, 1.3380314453125e+04, 1.29335908203125e+04, 1.25295185546875e+04, 1.21638828125e+04, 1.1835888671875e+04, 1.15474501953125e+04, 1.13015146484375e+04, 1.10995302734375e+04, 1.0939603515625e+04, 1.08166787109375e+04, 1.06423310546875e+04, 3.902778076171875e+03, 4.110943298339844e+02, 1.233016300201416e+01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01]
+mov2.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 5.66478967666626e+00, 2.307877731323242e+01, 5.539179611206063e+01, 1.082169570922852e+02, 1.872816619873047e+02, 2.974969177246094e+02, 4.440851440429688e+02, 6.323048095703125e+02, 8.673634033203125e+02, 1.154465209960938e+03, 1.49881494140625e+03, 1.90561669921875e+03, 2.380074951171875e+03, 2.927394287109375e+03, 3.552779052734375e+03, 4.26143359375e+03, 5.058562011718753e+03, 5.949369628906246e+03, 6.9390595703125e+03, 8.03283740234375e+03, 9.2359072265625e+03, 1.055347265625e+04, 1.19907392578125e+04, 1.355291015625e+04, 1.524519140625e+04, 1.7072787109375e+04, 1.9040900390625e+04, 2.1154734375e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.3419498046875e+04, 2.326383203125e+04, 2.311444921875e+04, 2.2936783203125e+04, 2.265489453125e+04, 2.220231640625e+04, 2.1597291015625e+04, 2.083224609375e+04, 1.985701171875e+04, 1.8801333984375e+04, 1.7846994140625e+04, 1.697998828125e+04, 1.6130787109375e+04, 1.52942197265625e+04, 1.4508419921875e+04, 1.3804673828125e+04, 1.31829384765625e+04, 1.26357890625e+04, 1.21445732421875e+04, 1.170008203125e+04, 1.13013515625e+04, 1.095070703125e+04, 1.06517314453125e+04, 1.04061845703125e+04, 1.0211767578125e+04, 1.006233203125e+04, 9.8503837890625e+03, 3.902778076171875e+03, 4.110943298339844e+02, 1.233016300201416e+01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01, 2.241313308477402e-01]
+mov3.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.354572057723999e-01, 6.496514320373535e+00, 2.311063766479492e+01, 5.469516372680672e+01, 1.064206237792969e+02, 1.836068572998047e+02, 2.91484375e+02, 4.351406860351562e+02, 6.196145629882812e+02, 8.500051879882812e+02, 1.13141552734375e+03, 1.468948486328125e+03, 1.867706909179688e+03, 2.3327939453125e+03, 2.8693125e+03, 3.482365234375e+03, 4.17705517578125e+03, 4.958485839843753e+03, 5.831759277343746e+03, 6.80197900390625e+03, 7.87424755859375e+03, 9.0536689453125e+03, 1.034534375e+04, 1.17543779296875e+04, 1.32858720703125e+04, 1.49449306640625e+04, 1.6736654296875e+04, 1.8666150390625e+04, 2.0738515625e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.2958859375e+04, 2.3117744140625e+04, 2.3162123046875e+04, 2.2995265625e+04, 2.2559673828125e+04, 2.18255234375e+04, 2.075741015625e+04, 1.9350701171875e+04, 1.7566298828125e+04, 1.56189228515625e+04, 1.37633037109375e+04, 1.20774326171875e+04, 1.05123955078125e+04, 9.1104326171875e+03, 7.87426220703125e+03, 6.78776171875e+03, 5.8189951171875e+03, 4.9431416015625e+03, 4.14584619140625e+03, 3.42024365234375e+03, 2.765988037109375e+03, 2.1880146484375e+03, 1.693271484375e+03, 1.285609252929688e+03, 9.619794311523438e+02, 7.127154541015625e+02, 3.584126892089844e+02, 8.234707641601562e+01, 8.673928260803223e+00, 2.601615488529205e-01, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03, 4.729082342237234e-03]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerInput.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerInput.txt
index a6dbfa4c77..68dd8c282f 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerInput.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerInput.txt
@@ -1,7 +1,7 @@
-last-generated=2024-05-15
+last-generated=2024-08-20
statistics-initialization=
{
- "nonlinear": "1, 1, 1, 1",
+ "nonlinear": "1, 0, 0, 1, 1",
"numerical Jacobians": "0"
}
statistics-simulation=
@@ -11,17 +11,17 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 2e+02]
-mov1.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.662420831620693e-02, 4.886708855628967e-01, 4.575706720352173e-01, 4.664972424507141e-01, 4.722372889518738e-01, 4.730210602283478e-01, 4.732595980167389e-01, 4.733445346355438e-01, 4.733809530735016e-01, 4.734058976173401e-01, 4.734263122081757e-01, 4.734432995319366e-01, 4.734576940536499e-01, 4.734700322151184e-01, 4.734807312488556e-01, 4.734900891780853e-01, 4.734983444213867e-01, 4.735057055950165e-01, 4.735122621059418e-01, 4.735181629657745e-01, 4.735235273838043e-01, 4.735283851623535e-01, 4.735328257083893e-01, 4.73536878824234e-01, 4.735406339168549e-01, 4.735440909862518e-01, 4.735472798347473e-01, 4.735502600669861e-01, 4.735530316829681e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.730305075645447e-01, 4.720738530158997e-01, 4.706114828586578e-01, 4.685670733451843e-01, 4.658646285533905e-01, 4.624316990375519e-01, 4.582027494907379e-01, 4.531229436397552e-01, 4.471518993377686e-01, 4.401520192623138e-01, 4.319839179515839e-01, 4.22771155834198e-01, 4.126746654510498e-01, 4.018683433532715e-01, 3.905176222324371e-01, 3.787632882595062e-01, 3.667131364345551e-01, 3.543288707733154e-01, 3.415527045726776e-01, 3.284392654895782e-01, 3.150481879711151e-01, 3.014431297779083e-01, 2.876905202865601e-01, 2.739090621471405e-01, 2.603259384632111e-01, 2.469863593578339e-01, 2.338569611310959e-01, 2.209040075540543e-01, 2.081050276756287e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01]
-mov1.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.80345806479454e-02, 6.981012225151062e-01, 6.536723971366882e-01, 6.664246320724487e-01, 6.746246814727783e-01, 6.75744354724884e-01, 6.760851144790649e-01, 6.762064695358276e-01, 6.762585043907166e-01, 6.762941479682922e-01, 6.763232946395874e-01, 6.763476133346558e-01, 6.763681769371033e-01, 6.76385760307312e-01, 6.764010787010193e-01, 6.76414430141449e-01, 6.764262318611145e-01, 6.76436722278595e-01, 6.764460802078247e-01, 6.764545440673828e-01, 6.764621734619141e-01, 6.76469087600708e-01, 6.76475465297699e-01, 6.764812469482422e-01, 6.76486611366272e-01, 6.764915585517883e-01, 6.764960885047913e-01, 6.765003800392151e-01, 6.765043139457703e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.75757884979248e-01, 6.743912100791931e-01, 6.723021268844604e-01, 6.693814992904663e-01, 6.655209064483643e-01, 6.606167554855347e-01, 6.545753479003906e-01, 6.473184823989868e-01, 6.387884020805359e-01, 6.287885904312134e-01, 6.171198487281799e-01, 6.03958785533905e-01, 5.895352363586426e-01, 5.740976333618164e-01, 5.578823089599609e-01, 5.410903692245483e-01, 5.238759517669678e-01, 5.061841011047363e-01, 4.879324436187744e-01, 4.691989421844482e-01, 4.50068861246109e-01, 4.306330382823944e-01, 4.10986453294754e-01, 3.912986516952515e-01, 3.718942105770111e-01, 3.528376519680023e-01, 3.340813517570496e-01, 3.155771493911743e-01, 2.972928881645203e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01]
+mov1.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.437269270420074e-02, 5.481759905815125e-01, 4.714193344116211e-01, 4.638824164867401e-01, 4.620190858840942e-01, 4.607722163200378e-01, 4.605394303798676e-01, 4.605742394924164e-01, 4.606086611747742e-01, 4.606361985206604e-01, 4.606587290763855e-01, 4.606775045394897e-01, 4.606933891773224e-01, 4.607070088386536e-01, 4.607188105583191e-01, 4.607291221618652e-01, 4.607382416725159e-01, 4.607463479042053e-01, 4.607535898685455e-01, 4.607601165771484e-01, 4.607660174369812e-01, 4.60771381855011e-01, 4.60776299238205e-01, 4.607807695865631e-01, 4.60784912109375e-01, 4.607887268066406e-01, 4.607922434806824e-01, 4.60795521736145e-01, 4.60798591375351e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.638181924819946e-01, 4.666680991649628e-01, 4.692365527153015e-01, 4.713804721832275e-01, 4.729235470294952e-01, 4.736599326133728e-01, 4.735555052757263e-01, 4.725481569766998e-01, 4.705272018909454e-01, 4.673967063426971e-01, 4.630817174911499e-01, 4.575338065624237e-01, 4.507355391979218e-01, 4.426591992378235e-01, 4.330606162548065e-01, 4.22135204076767e-01, 4.101988077163696e-01, 3.975521922111511e-01, 3.844450414180756e-01, 3.710594773292542e-01, 3.574478626251221e-01, 3.434852361679077e-01, 3.292240798473358e-01, 3.147880136966705e-01, 3.004205226898193e-01, 2.862003147602081e-01, 2.721870541572571e-01, 2.584343552589417e-01, 2.449826449155807e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01]
+mov1.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.338956207036972e-02, 7.831085324287415e-01, 6.734561920166016e-01, 6.626891493797302e-01, 6.600272655487061e-01, 6.582460403442383e-01, 6.579135060310364e-01, 6.579632163047791e-01, 6.580123901367188e-01, 6.580517292022705e-01, 6.580839157104492e-01, 6.581107378005981e-01, 6.581333875656128e-01, 6.581528782844543e-01, 6.581697463989258e-01, 6.581844687461853e-01, 6.581975221633911e-01, 6.582090854644775e-01, 6.582193970680237e-01, 6.582287549972534e-01, 6.582371592521667e-01, 6.582448482513428e-01, 6.582518219947815e-01, 6.582582592964172e-01, 6.5826416015625e-01, 6.582695841789246e-01, 6.582746505737305e-01, 6.582793593406677e-01, 6.582837104797363e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.625974178314209e-01, 6.66668713092804e-01, 6.703379154205322e-01, 6.734006404876709e-01, 6.756050586700439e-01, 6.766570210456848e-01, 6.76507830619812e-01, 6.750687956809998e-01, 6.721817255020142e-01, 6.677095890045166e-01, 6.615453362464905e-01, 6.536197066307068e-01, 6.43907904624939e-01, 6.323702931404114e-01, 6.186580657958984e-01, 6.030502915382385e-01, 5.859982967376709e-01, 5.679317116737366e-01, 5.492072105407715e-01, 5.300849676132202e-01, 5.106397867202759e-01, 4.90693211555481e-01, 4.703201353549957e-01, 4.496971666812897e-01, 4.291721880435944e-01, 4.088576138019562e-01, 3.888386487960815e-01, 3.691919147968292e-01, 3.49975198507309e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01]
mov1.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
-mov2.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.302249170839787e-02, 3.376121520996094e-01, 3.689912557601929e-01, 4.125420749187471e-01, 4.502602219581604e-01, 4.660475254058838e-01, 4.718737602233887e-01, 4.732204079627991e-01, 4.733809530735016e-01, 4.734058976173401e-01, 4.734263122081757e-01, 4.734432995319366e-01, 4.734576940536499e-01, 4.734700322151184e-01, 4.734807312488556e-01, 4.734900891780853e-01, 4.734983444213867e-01, 4.735057055950165e-01, 4.735122621059418e-01, 4.735181629657745e-01, 4.735235273838043e-01, 4.735283851623535e-01, 4.735328257083893e-01, 4.73536878824234e-01, 4.735406339168549e-01, 4.735440909862518e-01, 4.735472798347473e-01, 4.735502600669861e-01, 4.735530316829681e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.730305075645447e-01, 4.720738530158997e-01, 4.706114828586578e-01, 4.685670733451843e-01, 4.658646285533905e-01, 4.624316990375519e-01, 4.582027494907379e-01, 4.531229436397552e-01, 4.471518993377686e-01, 4.401520192623138e-01, 4.319839179515839e-01, 4.22771155834198e-01, 4.126746654510498e-01, 4.018683433532715e-01, 3.905176222324371e-01, 3.787632882595062e-01, 3.667131364345551e-01, 3.543288707733154e-01, 3.415527045726776e-01, 3.284392654895782e-01, 3.150481879711151e-01, 3.014431297779083e-01, 2.876905202865601e-01, 2.739090621471405e-01, 2.603258490562439e-01, 2.465216070413589e-01, 2.313000857830048e-01, 2.14568093419075e-01, 1.968347430229187e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01, 1.787372678518295e-01]
-mov2.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.860355958342552e-02, 4.823030531406403e-01, 5.271303653717041e-01, 5.893458127975465e-01, 6.432288885116577e-01, 6.657821536064148e-01, 6.741054058074951e-01, 6.760291457176208e-01, 6.762585043907166e-01, 6.762941479682922e-01, 6.763232946395874e-01, 6.763476133346558e-01, 6.763681769371033e-01, 6.76385760307312e-01, 6.764010787010193e-01, 6.76414430141449e-01, 6.764262318611145e-01, 6.76436722278595e-01, 6.764460802078247e-01, 6.764545440673828e-01, 6.764621734619141e-01, 6.76469087600708e-01, 6.76475465297699e-01, 6.764812469482422e-01, 6.76486611366272e-01, 6.764915585517883e-01, 6.764960885047913e-01, 6.765003800392151e-01, 6.765043139457703e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.75757884979248e-01, 6.743912100791931e-01, 6.723021268844604e-01, 6.693814992904663e-01, 6.655209064483643e-01, 6.606167554855347e-01, 6.545753479003906e-01, 6.473184823989868e-01, 6.387884020805359e-01, 6.287885904312134e-01, 6.171198487281799e-01, 6.03958785533905e-01, 5.895352363586426e-01, 5.740976333618164e-01, 5.578823089599609e-01, 5.410903692245483e-01, 5.238759517669678e-01, 5.061841011047363e-01, 4.879324436187744e-01, 4.691989421844482e-01, 4.50068861246109e-01, 4.306330382823944e-01, 4.10986453294754e-01, 3.912986516952515e-01, 3.718940615653992e-01, 3.521737158298492e-01, 3.304286897182465e-01, 3.06525856256485e-01, 2.811924815177917e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01, 2.553389668464661e-01]
+mov2.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.111124806106091e-02, 4.560115039348602e-01, 4.529264867305756e-01, 4.649955332279206e-01, 4.722391068935394e-01, 4.649357199668884e-01, 4.607607126235962e-01, 4.605742394924164e-01, 4.606086611747742e-01, 4.606361985206604e-01, 4.606587290763855e-01, 4.606775045394897e-01, 4.606933891773224e-01, 4.607070088386536e-01, 4.607188105583191e-01, 4.607291221618652e-01, 4.607382416725159e-01, 4.607463479042053e-01, 4.607535898685455e-01, 4.607601165771484e-01, 4.607660174369812e-01, 4.60771381855011e-01, 4.60776299238205e-01, 4.607807695865631e-01, 4.60784912109375e-01, 4.607887268066406e-01, 4.607922434806824e-01, 4.60795521736145e-01, 4.60798591375351e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.638181924819946e-01, 4.666680991649628e-01, 4.692365527153015e-01, 4.713804721832275e-01, 4.729235470294952e-01, 4.736599326133728e-01, 4.735555052757263e-01, 4.725481569766998e-01, 4.705272018909454e-01, 4.673967063426971e-01, 4.630817174911499e-01, 4.575338065624237e-01, 4.507355391979218e-01, 4.426591992378235e-01, 4.330606162548065e-01, 4.22135204076767e-01, 4.101988077163696e-01, 3.975521922111511e-01, 3.844450414180756e-01, 3.710594773292542e-01, 3.574478626251221e-01, 3.434852361679077e-01, 3.292240798473358e-01, 3.147880136966705e-01, 3.004205226898193e-01, 2.862003147602081e-01, 2.721870541572571e-01, 2.584343552589417e-01, 2.448154389858246e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01, 2.301269769668579e-01]
+mov2.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.015892580151558e-02, 6.514450311660767e-01, 6.470378637313843e-01, 6.642793416976929e-01, 6.746273040771484e-01, 6.64193868637085e-01, 6.582295894622803e-01, 6.579632163047791e-01, 6.580123901367188e-01, 6.580517292022705e-01, 6.580839157104492e-01, 6.581107378005981e-01, 6.581333875656128e-01, 6.581528782844543e-01, 6.581697463989258e-01, 6.581844687461853e-01, 6.581975221633911e-01, 6.582090854644775e-01, 6.582193970680237e-01, 6.582287549972534e-01, 6.582371592521667e-01, 6.582448482513428e-01, 6.582518219947815e-01, 6.582582592964172e-01, 6.5826416015625e-01, 6.582695841789246e-01, 6.582746505737305e-01, 6.582793593406677e-01, 6.582837104797363e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.625974178314209e-01, 6.66668713092804e-01, 6.703379154205322e-01, 6.734006404876709e-01, 6.756050586700439e-01, 6.766570210456848e-01, 6.76507830619812e-01, 6.750687956809998e-01, 6.721817255020142e-01, 6.677095890045166e-01, 6.615453362464905e-01, 6.536197066307068e-01, 6.43907904624939e-01, 6.323702931404114e-01, 6.186580657958984e-01, 6.030502915382385e-01, 5.859982967376709e-01, 5.679317116737366e-01, 5.492072105407715e-01, 5.300849676132202e-01, 5.106397867202759e-01, 4.90693211555481e-01, 4.703201353549957e-01, 4.496971666812897e-01, 4.291721880435944e-01, 4.088576138019562e-01, 3.888386487960815e-01, 3.691919147968292e-01, 3.497363328933716e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01, 3.287528455257416e-01]
mov2.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
-mov3.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.662420831620693e-02, 4.886708855628967e-01, 4.575706720352173e-01, 4.664972424507141e-01, 4.722372889518738e-01, 4.730210602283478e-01, 4.732595980167389e-01, 4.733445346355438e-01, 4.733809530735016e-01, 4.734058976173401e-01, 4.734263122081757e-01, 4.734432995319366e-01, 4.734576940536499e-01, 4.734700322151184e-01, 4.734807312488556e-01, 4.734900891780853e-01, 4.734983444213867e-01, 4.735057055950165e-01, 4.735122621059418e-01, 4.735181629657745e-01, 4.735235273838043e-01, 4.735283851623535e-01, 4.735328257083893e-01, 4.73536878824234e-01, 4.735406339168549e-01, 4.735440909862518e-01, 4.735472798347473e-01, 4.735502600669861e-01, 4.735530316829681e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.735555946826935e-01, 4.730305075645447e-01, 4.720738530158997e-01, 4.706114828586578e-01, 4.685670733451843e-01, 4.658646285533905e-01, 4.624316990375519e-01, 4.582027494907379e-01, 4.531229436397552e-01, 4.471518993377686e-01, 4.401520192623138e-01, 4.319839179515839e-01, 4.22771155834198e-01, 4.126746654510498e-01, 4.018683433532715e-01, 3.905176222324371e-01, 3.787632882595062e-01, 3.667131364345551e-01, 3.543288707733154e-01, 3.415527045726776e-01, 3.284392654895782e-01, 3.150481879711151e-01, 3.014431297779083e-01, 2.876905202865601e-01, 2.739090621471405e-01, 2.603259384632111e-01, 2.469863593578339e-01, 2.338569611310959e-01, 2.209040075540543e-01, 2.081050276756287e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01, 1.954464465379715e-01]
-mov3.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.80345806479454e-02, 6.981012225151062e-01, 6.536723971366882e-01, 6.664246320724487e-01, 6.746246814727783e-01, 6.75744354724884e-01, 6.760851144790649e-01, 6.762064695358276e-01, 6.762585043907166e-01, 6.762941479682922e-01, 6.763232946395874e-01, 6.763476133346558e-01, 6.763681769371033e-01, 6.76385760307312e-01, 6.764010787010193e-01, 6.76414430141449e-01, 6.764262318611145e-01, 6.76436722278595e-01, 6.764460802078247e-01, 6.764545440673828e-01, 6.764621734619141e-01, 6.76469087600708e-01, 6.76475465297699e-01, 6.764812469482422e-01, 6.76486611366272e-01, 6.764915585517883e-01, 6.764960885047913e-01, 6.765003800392151e-01, 6.765043139457703e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.765080094337463e-01, 6.75757884979248e-01, 6.743912100791931e-01, 6.723021268844604e-01, 6.693814992904663e-01, 6.655209064483643e-01, 6.606167554855347e-01, 6.545753479003906e-01, 6.473184823989868e-01, 6.387884020805359e-01, 6.287885904312134e-01, 6.171198487281799e-01, 6.03958785533905e-01, 5.895352363586426e-01, 5.740976333618164e-01, 5.578823089599609e-01, 5.410903692245483e-01, 5.238759517669678e-01, 5.061841011047363e-01, 4.879324436187744e-01, 4.691989421844482e-01, 4.50068861246109e-01, 4.306330382823944e-01, 4.10986453294754e-01, 3.912986516952515e-01, 3.718942105770111e-01, 3.528376519680023e-01, 3.340813517570496e-01, 3.155771493911743e-01, 2.972928881645203e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01, 2.792091965675354e-01]
+mov3.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.437269270420074e-02, 5.481759905815125e-01, 4.714193344116211e-01, 4.638824164867401e-01, 4.620190858840942e-01, 4.607722163200378e-01, 4.605394303798676e-01, 4.605742394924164e-01, 4.606086611747742e-01, 4.606361985206604e-01, 4.606587290763855e-01, 4.606775045394897e-01, 4.606933891773224e-01, 4.607070088386536e-01, 4.607188105583191e-01, 4.607291221618652e-01, 4.607382416725159e-01, 4.607463479042053e-01, 4.607535898685455e-01, 4.607601165771484e-01, 4.607660174369812e-01, 4.60771381855011e-01, 4.60776299238205e-01, 4.607807695865631e-01, 4.60784912109375e-01, 4.607887268066406e-01, 4.607922434806824e-01, 4.60795521736145e-01, 4.60798591375351e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.608014225959778e-01, 4.638181924819946e-01, 4.666680991649628e-01, 4.692365527153015e-01, 4.713804721832275e-01, 4.729235470294952e-01, 4.736599326133728e-01, 4.735555052757263e-01, 4.725481569766998e-01, 4.705272018909454e-01, 4.673967063426971e-01, 4.630817174911499e-01, 4.575338065624237e-01, 4.507355391979218e-01, 4.426591992378235e-01, 4.330606162548065e-01, 4.22135204076767e-01, 4.101988077163696e-01, 3.975521922111511e-01, 3.844450414180756e-01, 3.710594773292542e-01, 3.574478626251221e-01, 3.434852361679077e-01, 3.292240798473358e-01, 3.147880136966705e-01, 3.004205226898193e-01, 2.862003147602081e-01, 2.721870541572571e-01, 2.584343552589417e-01, 2.449826449155807e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01, 2.318070232868195e-01]
+mov3.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.338956207036972e-02, 7.831085324287415e-01, 6.734561920166016e-01, 6.626891493797302e-01, 6.600272655487061e-01, 6.582460403442383e-01, 6.579135060310364e-01, 6.579632163047791e-01, 6.580123901367188e-01, 6.580517292022705e-01, 6.580839157104492e-01, 6.581107378005981e-01, 6.581333875656128e-01, 6.581528782844543e-01, 6.581697463989258e-01, 6.581844687461853e-01, 6.581975221633911e-01, 6.582090854644775e-01, 6.582193970680237e-01, 6.582287549972534e-01, 6.582371592521667e-01, 6.582448482513428e-01, 6.582518219947815e-01, 6.582582592964172e-01, 6.5826416015625e-01, 6.582695841789246e-01, 6.582746505737305e-01, 6.582793593406677e-01, 6.582837104797363e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.582877635955811e-01, 6.625974178314209e-01, 6.66668713092804e-01, 6.703379154205322e-01, 6.734006404876709e-01, 6.756050586700439e-01, 6.766570210456848e-01, 6.76507830619812e-01, 6.750687956809998e-01, 6.721817255020142e-01, 6.677095890045166e-01, 6.615453362464905e-01, 6.536197066307068e-01, 6.43907904624939e-01, 6.323702931404114e-01, 6.186580657958984e-01, 6.030502915382385e-01, 5.859982967376709e-01, 5.679317116737366e-01, 5.492072105407715e-01, 5.300849676132202e-01, 5.106397867202759e-01, 4.90693211555481e-01, 4.703201353549957e-01, 4.496971666812897e-01, 4.291721880435944e-01, 4.088576138019562e-01, 3.888386487960815e-01, 3.691919147968292e-01, 3.49975198507309e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01, 3.311528861522675e-01]
mov3.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
ramSpe.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.333333507180214e-02, 6.666667014360428e-02, 1.000000014901161e-01, 1.333333402872086e-01, 1.666666716337204e-01, 2.000000029802322e-01, 2.333333343267441e-01, 2.666666805744171e-01, 3.00000011920929e-01, 3.333333432674408e-01, 3.666666746139526e-01, 4.000000059604645e-01, 4.333333373069763e-01, 4.666666686534882e-01, 5e-01, 5.333333611488342e-01, 5.666666626930237e-01, 6.00000023841858e-01, 6.333333253860473e-01, 6.666666865348816e-01, 6.99999988079071e-01, 7.333333492279053e-01, 7.666666507720947e-01, 8.00000011920929e-01, 8.333333134651184e-01, 8.666666746139526e-01, 8.999999761581421e-01, 9.333333373069763e-01, 9.666666388511658e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
ramDam.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.833333492279053e-01, 9.666666388511658e-01, 9.49999988079071e-01, 9.333333373069763e-01, 9.166666865348816e-01, 8.999999761581421e-01, 8.833333253860474e-01, 8.666666746139526e-01, 8.500000238418579e-01, 8.333333134651184e-01, 8.166666626930237e-01, 8.00000011920929e-01, 7.833333611488342e-01, 7.666666507720947e-01, 7.5e-01, 7.333333492279053e-01, 7.166666388511658e-01, 6.99999988079071e-01, 6.833333373069763e-01, 6.666666865348816e-01, 6.499999761581421e-01, 6.333333253860474e-01, 6.166666746139526e-01, 6.000000238418579e-01, 5.833333134651184e-01, 5.666666626930237e-01, 5.50000011920929e-01, 5.333333611488342e-01, 5.166666507720947e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01, 5e-01]
-mov1.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 4.784634113311768e+00, 2.153220748901367e+01, 5.322282409667977e+01, 1.047782287597656e+02, 1.820938262939453e+02, 2.897984619140625e+02, 4.328740539550781e+02, 6.163928833007812e+02, 8.455368041992188e+02, 1.125414672851562e+03, 1.461099853515625e+03, 1.857665893554688e+03, 2.320186279296875e+03, 2.853734619140625e+03, 3.463384033203125e+03, 4.15420849609375e+03, 4.931280761718753e+03, 5.799675292968746e+03, 6.76446435546875e+03, 7.83072265625e+03, 9.0035224609375e+03, 1.02879384765625e+04, 1.16890439453125e+04, 1.32119111328125e+04, 1.4861615234375e+04, 1.6643228515625e+04, 1.856182421875e+04, 2.06224765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.27043125e+04, 2.2562322265625e+04, 2.2402353515625e+04, 2.2222333984375e+04, 2.2020099609375e+04, 2.17934296875e+04, 2.1540125e+04, 2.1258087890625e+04, 2.0945421875e+04, 2.059309375e+04, 2.019223828125e+04, 1.97520625e+04, 1.9285013671875e+04, 1.880525e+04, 1.832712109375e+04, 1.7863771484375e+04, 1.74261875e+04, 1.7009693359375e+04, 1.66047578125e+04, 1.6212673828125e+04, 1.58345244140625e+04, 1.54711806640625e+04, 1.51233076171875e+04, 1.47925595703125e+04, 1.4482583984375e+04, 1.41923935546875e+04, 1.39194921875e+04, 1.36617255859375e+04, 1.341743359375e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04]
-mov2.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 3.79670524597168e+00, 1.615411186218262e+01, 4.153712844848639e+01, 8.657707214355469e+01, 1.628532867431641e+02, 2.77126953125e+02, 4.296744995117188e+02, 6.163928833007812e+02, 8.455368041992188e+02, 1.125414672851562e+03, 1.461099853515625e+03, 1.857665893554688e+03, 2.320186279296875e+03, 2.853734619140625e+03, 3.463384033203125e+03, 4.15420849609375e+03, 4.931280761718753e+03, 5.799675292968746e+03, 6.76446435546875e+03, 7.83072265625e+03, 9.0035224609375e+03, 1.02879384765625e+04, 1.16890439453125e+04, 1.32119111328125e+04, 1.4861615234375e+04, 1.6643228515625e+04, 1.856182421875e+04, 2.06224765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.27043125e+04, 2.2562322265625e+04, 2.2402353515625e+04, 2.2222333984375e+04, 2.2020099609375e+04, 2.17934296875e+04, 2.1540125e+04, 2.1258087890625e+04, 2.0945421875e+04, 2.059309375e+04, 2.019223828125e+04, 1.97520625e+04, 1.9285013671875e+04, 1.880525e+04, 1.832712109375e+04, 1.7863771484375e+04, 1.74261875e+04, 1.7009693359375e+04, 1.66047578125e+04, 1.6212673828125e+04, 1.58345244140625e+04, 1.54711806640625e+04, 1.51233076171875e+04, 1.47925595703125e+04, 1.44825810546875e+04, 1.418096484375e+04, 1.385976171875e+04, 1.352121484375e+04, 1.318010546875e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04, 1.28507724609375e+04]
-mov3.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 4.784634113311768e+00, 2.153220748901367e+01, 5.322282409667977e+01, 1.047782287597656e+02, 1.820938262939453e+02, 2.897984619140625e+02, 4.328740539550781e+02, 6.163928833007812e+02, 8.455368041992188e+02, 1.125414672851562e+03, 1.461099853515625e+03, 1.857665893554688e+03, 2.320186279296875e+03, 2.853734619140625e+03, 3.463384033203125e+03, 4.15420849609375e+03, 4.931280761718753e+03, 5.799675292968746e+03, 6.76446435546875e+03, 7.83072265625e+03, 9.0035224609375e+03, 1.02879384765625e+04, 1.16890439453125e+04, 1.32119111328125e+04, 1.4861615234375e+04, 1.6643228515625e+04, 1.856182421875e+04, 2.06224765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.2830259765625e+04, 2.27043125e+04, 2.2562322265625e+04, 2.2402353515625e+04, 2.2222333984375e+04, 2.2020099609375e+04, 2.17934296875e+04, 2.1540125e+04, 2.1258087890625e+04, 2.0945421875e+04, 2.059309375e+04, 2.019223828125e+04, 1.97520625e+04, 1.9285013671875e+04, 1.880525e+04, 1.832712109375e+04, 1.7863771484375e+04, 1.74261875e+04, 1.7009693359375e+04, 1.66047578125e+04, 1.6212673828125e+04, 1.58345244140625e+04, 1.54711806640625e+04, 1.51233076171875e+04, 1.47925595703125e+04, 1.4482583984375e+04, 1.41923935546875e+04, 1.39194921875e+04, 1.36617255859375e+04, 1.341743359375e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04, 1.3185326171875e+04]
+mov1.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 5.616763114929199e+00, 2.323433303833008e+01, 5.588132476806648e+01, 1.091670455932617e+02, 1.888549194335938e+02, 2.999674377441406e+02, 4.47770751953125e+02, 6.375513916015625e+02, 8.745592041015625e+02, 1.164041625976562e+03, 1.511246215820312e+03, 1.921420654296875e+03, 2.399812255859375e+03, 2.95166845703125e+03, 3.582237060546875e+03, 4.296765625e+03, 5.100500976562503e+03, 5.998691894531246e+03, 6.99658447265625e+03, 8.09942724609375e+03, 9.3124677734375e+03, 1.06409521484375e+04, 1.20901298828125e+04, 1.36652470703125e+04, 1.5371552734375e+04, 1.721429296875e+04, 1.919871484375e+04, 2.1330068359375e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.3551140625e+04, 2.3478103515625e+04, 2.33916328125e+04, 2.3288015625e+04, 2.3162412109375e+04, 2.3008984375e+04, 2.2830220703125e+04, 2.26262421875e+04, 2.2394181640625e+04, 2.2131185546875e+04, 2.1834544921875e+04, 2.1501841796875e+04, 2.1131130859375e+04, 2.0718240234375e+04, 2.0244505859375e+04, 1.9722154296875e+04, 1.917315234375e+04, 1.8620125e+04, 1.80834609375e+04, 1.7579431640625e+04, 1.7112265625e+04, 1.6664498046875e+04, 1.623551171875e+04, 1.58273857421875e+04, 1.54446650390625e+04, 1.50867109375e+04, 1.47524111328125e+04, 1.44406025390625e+04, 1.41499541015625e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04]
+mov2.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 3.864067316055298e+00, 1.595206928253174e+01, 4.302204132080085e+01, 9.428480529785156e+01, 1.805681304931641e+02, 2.992999877929688e+02, 4.47770751953125e+02, 6.375513916015625e+02, 8.745592041015625e+02, 1.164041625976562e+03, 1.511246215820312e+03, 1.921420654296875e+03, 2.399812255859375e+03, 2.95166845703125e+03, 3.582237060546875e+03, 4.296765625e+03, 5.100500976562503e+03, 5.998691894531246e+03, 6.99658447265625e+03, 8.09942724609375e+03, 9.3124677734375e+03, 1.06409521484375e+04, 1.20901298828125e+04, 1.36652470703125e+04, 1.5371552734375e+04, 1.721429296875e+04, 1.919871484375e+04, 2.1330068359375e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.3551140625e+04, 2.3478103515625e+04, 2.33916328125e+04, 2.3288015625e+04, 2.3162412109375e+04, 2.3008984375e+04, 2.2830220703125e+04, 2.26262421875e+04, 2.2394181640625e+04, 2.2131185546875e+04, 2.1834544921875e+04, 2.1501841796875e+04, 2.1131130859375e+04, 2.0718240234375e+04, 2.0244505859375e+04, 1.9722154296875e+04, 1.917315234375e+04, 1.8620125e+04, 1.80834609375e+04, 1.7579431640625e+04, 1.7112265625e+04, 1.6664498046875e+04, 1.623551171875e+04, 1.58273857421875e+04, 1.54446650390625e+04, 1.50867109375e+04, 1.47524111328125e+04, 1.44406025390625e+04, 1.41458701171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04, 1.38389326171875e+04]
+mov3.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.583001613616943e+00, 5.616763114929199e+00, 2.323433303833008e+01, 5.588132476806648e+01, 1.091670455932617e+02, 1.888549194335938e+02, 2.999674377441406e+02, 4.47770751953125e+02, 6.375513916015625e+02, 8.745592041015625e+02, 1.164041625976562e+03, 1.511246215820312e+03, 1.921420654296875e+03, 2.399812255859375e+03, 2.95166845703125e+03, 3.582237060546875e+03, 4.296765625e+03, 5.100500976562503e+03, 5.998691894531246e+03, 6.99658447265625e+03, 8.09942724609375e+03, 9.3124677734375e+03, 1.06409521484375e+04, 1.20901298828125e+04, 1.36652470703125e+04, 1.5371552734375e+04, 1.721429296875e+04, 1.919871484375e+04, 2.1330068359375e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.361359765625e+04, 2.3551140625e+04, 2.3478103515625e+04, 2.33916328125e+04, 2.3288015625e+04, 2.3162412109375e+04, 2.3008984375e+04, 2.2830220703125e+04, 2.26262421875e+04, 2.2394181640625e+04, 2.2131185546875e+04, 2.1834544921875e+04, 2.1501841796875e+04, 2.1131130859375e+04, 2.0718240234375e+04, 2.0244505859375e+04, 1.9722154296875e+04, 1.917315234375e+04, 1.8620125e+04, 1.80834609375e+04, 1.7579431640625e+04, 1.7112265625e+04, 1.6664498046875e+04, 1.623551171875e+04, 1.58273857421875e+04, 1.54446650390625e+04, 1.50867109375e+04, 1.47524111328125e+04, 1.44406025390625e+04, 1.41499541015625e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04, 1.38779609375e+04]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerTotal.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerTotal.txt
index fc49867833..b1ec296850 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerTotal.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ComparePowerTotal.txt
@@ -1,4 +1,4 @@
-last-generated=2024-05-15
+last-generated=2024-08-20
statistics-initialization=
{
"nonlinear": "1, 1, 1",
@@ -11,17 +11,17 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 2e+02]
-mov1.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.492167964577675e-02, 6.11555814743042e-01, 5.761631727218628e-01, 5.817868113517761e-01, 5.880606770515442e-01, 5.883736610412598e-01, 5.883923768997192e-01, 5.884082913398743e-01, 5.884376764297485e-01, 5.884642004966736e-01, 5.884859561920166e-01, 5.885040760040283e-01, 5.885193943977356e-01, 5.885325074195862e-01, 5.885439515113831e-01, 5.885539054870605e-01, 5.885626673698425e-01, 5.885704755783081e-01, 5.885775089263916e-01, 5.88583767414093e-01, 5.885894894599915e-01, 5.885946750640869e-01, 5.885993838310242e-01, 5.886037349700928e-01, 5.886076688766479e-01, 5.88611364364624e-01, 5.886147618293762e-01, 5.886179208755493e-01, 5.886209011077881e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.886236429214478e-01, 5.881841778755188e-01, 5.859197378158569e-01, 5.808865427970886e-01, 5.715749263763428e-01, 5.577517747879028e-01, 5.388244390487671e-01, 5.128459334373474e-01, 4.812151193618774e-01, 4.474658071994781e-01, 4.11169171333313e-01, 3.724821209907532e-01, 3.330301940441132e-01, 2.952267229557037e-01, 2.595611214637756e-01, 2.257571220397949e-01, 1.936779171228409e-01, 1.633393317461014e-01, 1.349484473466873e-01, 1.089258715510368e-01, 8.583158254623413e-02, 6.615643203258514e-02, 5.008816719055176e-02, 3.743508085608482e-02, 2.773764170706272e-02, 2.043944224715233e-02, 1.023917552083731e-02, 2.353599993512034e-03, 2.480772382114083e-04, 6.800326900702203e-06, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07, 1.349403788708514e-07]
-mov1.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.988811537623405e-02, 8.736511468887329e-01, 8.230902552604675e-01, 8.311240077018738e-01, 8.400866985321045e-01, 8.405337929725647e-01, 8.405605554580688e-01, 8.405832648277283e-01, 8.406252264976501e-01, 8.406631946563721e-01, 8.406942486763e-01, 8.407201170921326e-01, 8.407419919967651e-01, 8.407607674598694e-01, 8.407770395278931e-01, 8.407912850379944e-01, 8.408038020133972e-01, 8.40815007686615e-01, 8.408249616622925e-01, 8.408339619636536e-01, 8.408421277999878e-01, 8.408495187759399e-01, 8.408562541007996e-01, 8.408624529838562e-01, 8.408681154251099e-01, 8.408733606338501e-01, 8.408782482147217e-01, 8.408827781677246e-01, 8.408869504928589e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.408908843994141e-01, 8.402630686759949e-01, 8.370281457901001e-01, 8.298378586769104e-01, 8.165356516838074e-01, 7.96788215637207e-01, 7.697492241859436e-01, 7.326370477676392e-01, 6.874501705169678e-01, 6.392368674278259e-01, 5.873845219612122e-01, 5.321173071861267e-01, 4.757574200630188e-01, 4.217524826526642e-01, 3.708015978336334e-01, 3.225101828575134e-01, 2.766827344894409e-01, 2.333419024944305e-01, 1.927835047245026e-01, 1.556083858013153e-01, 1.226165443658829e-01, 9.450918436050415e-02, 7.15545266866684e-02, 5.347868800163269e-02, 3.962520137429237e-02, 2.919920347630978e-02, 1.462739333510399e-02, 3.362285671755672e-03, 3.543960629031062e-04, 9.714752195577603e-06, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07, 1.927719637251357e-07]
-mov1.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
-mov2.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.492167964577675e-02, 5.92879593372345e-01, 5.657358169555664e-01, 5.788192749023438e-01, 5.865644812583923e-01, 5.878311395645142e-01, 5.882200002670288e-01, 5.883476138114929e-01, 5.883917212486267e-01, 5.884190797805786e-01, 5.884414911270142e-01, 5.884601473808289e-01, 5.884759426116943e-01, 5.884895324707031e-01, 5.885012149810791e-01, 5.885115265846252e-01, 5.885205864906311e-01, 5.885286331176758e-01, 5.885358452796936e-01, 5.885423421859741e-01, 5.885481834411621e-01, 5.885535478591919e-01, 5.885583758354187e-01, 5.885628461837769e-01, 5.885669589042664e-01, 5.88570773601532e-01, 5.885742902755737e-01, 5.885775685310364e-01, 5.885806083679199e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.885834097862244e-01, 5.861287117004395e-01, 5.808544754981995e-01, 5.722164511680603e-01, 5.595765709877014e-01, 5.428499579429626e-01, 5.21874725818634e-01, 4.955168962478638e-01, 4.648153483867645e-01, 4.328055679798126e-01, 3.999639451503754e-01, 3.67229700088501e-01, 3.350251019001007e-01, 3.03729772567749e-01, 2.731014788150787e-01, 2.427066415548325e-01, 2.126321047544479e-01, 1.830179840326309e-01, 1.541810482740402e-01, 1.267272680997849e-01, 1.014975160360336e-01, 7.933250069618225e-02, 6.075737625360489e-02, 4.582284018397331e-02, 3.418998420238495e-02, 2.532674372196198e-02, 1.278107706457376e-02, 2.954669762402773e-03, 3.119076427537948e-04, 8.551518476451747e-06, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07, 1.696911056114914e-07]
-mov2.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.988811537623405e-02, 8.469708561897278e-01, 8.081939816474915e-01, 8.268846869468689e-01, 8.37949275970459e-01, 8.397587537765503e-01, 8.403142690658569e-01, 8.404965400695801e-01, 8.405595421791077e-01, 8.405987024307251e-01, 8.406307101249695e-01, 8.406573534011841e-01, 8.40679943561554e-01, 8.40699315071106e-01, 8.407160639762878e-01, 8.407307267189026e-01, 8.407436609268188e-01, 8.407551646232605e-01, 8.407654762268066e-01, 8.407747745513916e-01, 8.407831192016602e-01, 8.407907485961914e-01, 8.407977223396301e-01, 8.408041000366211e-01, 8.408099412918091e-01, 8.408153653144836e-01, 8.408204317092896e-01, 8.40825080871582e-01, 8.408293724060059e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.408334255218506e-01, 8.3732670545578e-01, 8.297920823097229e-01, 8.17452073097229e-01, 7.993951439857483e-01, 7.754999399185181e-01, 7.455353140830994e-01, 7.078812718391418e-01, 6.64021909236908e-01, 6.182937026023865e-01, 5.713770389556885e-01, 5.246138572692871e-01, 4.786072969436646e-01, 4.338996708393097e-01, 3.901449739933014e-01, 3.467237949371338e-01, 3.037601411342621e-01, 2.614542543888092e-01, 2.202586382627487e-01, 1.810389459133148e-01, 1.449964493513107e-01, 1.133321449160576e-01, 8.679625391960144e-02, 6.546119600534439e-02, 4.884283617138863e-02, 3.618106245994568e-02, 1.825868152081966e-02, 4.220956936478615e-03, 4.455823800526559e-04, 1.221645561599871e-05, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07, 2.424158651592734e-07]
-mov2.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
+mov1.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.041076570749283e-02, 6.882398128509521e-01, 5.736671090126038e-01, 5.619474053382874e-01, 5.589380860328674e-01, 5.572830438613892e-01, 5.569245219230652e-01, 5.569553375244141e-01, 5.569980144500732e-01, 5.570321083068848e-01, 5.570600628852844e-01, 5.570833086967468e-01, 5.571030378341675e-01, 5.571199059486389e-01, 5.571345090866089e-01, 5.571473240852356e-01, 5.571586489677429e-01, 5.571686625480652e-01, 5.571776628494263e-01, 5.571857690811157e-01, 5.571930408477783e-01, 5.571997165679932e-01, 5.572057962417603e-01, 5.572113394737244e-01, 5.57216465473175e-01, 5.572212338447571e-01, 5.572255849838257e-01, 5.572296380996704e-01, 5.57233452796936e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.572369694709778e-01, 5.644930005073547e-01, 5.720443725585938e-01, 5.79613983631134e-01, 5.858900547027588e-01, 5.886896252632141e-01, 5.86091935634613e-01, 5.772760510444641e-01, 5.603440999984741e-01, 5.360413789749146e-01, 5.020183920860291e-01, 4.636528789997101e-01, 4.233047962188721e-01, 3.817293345928192e-01, 3.405714929103851e-01, 3.01491916179657e-01, 2.645227611064911e-01, 2.294181883335114e-01, 1.960816085338593e-01, 1.645841896533966e-01, 1.352111846208572e-01, 1.084682196378708e-01, 8.496328443288803e-02, 6.51581808924675e-02, 4.914791509509087e-02, 3.663987293839455e-02, 1.859080232679844e-02, 4.301606211811304e-03, 4.539649235084653e-04, 1.361890645057429e-05, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07, 2.475599387707916e-07]
+mov1.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.005868092179298e-01, 9.831997156143188e-01, 8.195244669914246e-01, 8.027819991111755e-01, 7.984829545021057e-01, 7.961186170578003e-01, 7.956064939498901e-01, 7.956504821777344e-01, 7.957113981246948e-01, 7.957601547241211e-01, 7.958000898361206e-01, 7.958333492279053e-01, 7.958614826202393e-01, 7.958855628967285e-01, 7.959064841270447e-01, 7.959247827529907e-01, 7.959408760070801e-01, 7.959552407264709e-01, 7.959681153297424e-01, 7.959796190261841e-01, 7.959901094436646e-01, 7.959995865821838e-01, 7.96008288860321e-01, 7.960162162780762e-01, 7.960235476493835e-01, 7.960302829742432e-01, 7.960365414619446e-01, 7.960423827171326e-01, 7.960477471351624e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 7.960528135299683e-01, 8.064185380935669e-01, 8.172062635421753e-01, 8.28019917011261e-01, 8.369858264923096e-01, 8.409851789474487e-01, 8.372741937637329e-01, 8.246800899505615e-01, 8.004915714263916e-01, 7.657734155654907e-01, 7.171691060066223e-01, 6.623612642288208e-01, 6.047211289405823e-01, 5.453276038169861e-01, 4.865307211875916e-01, 4.307027459144592e-01, 3.778896629810333e-01, 3.277402520179749e-01, 2.801165878772736e-01, 2.351202815771103e-01, 1.931588351726532e-01, 1.549545973539352e-01, 1.213761195540428e-01, 9.308312088251114e-02, 7.021130621433258e-02, 5.234267190098763e-02, 2.655828930437565e-02, 6.145151797682047e-03, 6.485212943516672e-04, 1.945558142324444e-05, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07, 3.53657071627822e-07]
+mov1.etaMot=[6.99999988079071e-01, 6.99999988079071e-01]
+mov2.eta=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.041076570749283e-02, 6.664252877235413e-01, 5.789725780487061e-01, 5.63447117805481e-01, 5.60070276260376e-01, 5.571137070655823e-01, 5.564124584197998e-01, 5.564177632331848e-01, 5.564551949501038e-01, 5.56485116481781e-01, 5.565096139907837e-01, 5.565300583839417e-01, 5.565473437309265e-01, 5.565621256828308e-01, 5.565749406814575e-01, 5.565862059593201e-01, 5.565961003303528e-01, 5.566049218177795e-01, 5.566127896308899e-01, 5.566198825836182e-01, 5.566263198852539e-01, 5.566321611404419e-01, 5.566374659538269e-01, 5.566423535346985e-01, 5.566468238830566e-01, 5.566509962081909e-01, 5.566548109054565e-01, 5.566583871841431e-01, 5.566617250442505e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.566648244857788e-01, 5.685281157493591e-01, 5.775313973426819e-01, 5.838637948036194e-01, 5.881281495094299e-01, 5.882096290588379e-01, 5.812023878097534e-01, 5.670463442802429e-01, 5.45884907245636e-01, 5.189376473426819e-01, 4.849932789802551e-01, 4.480022490024567e-01, 4.107531309127808e-01, 3.748443424701691e-01, 3.411843776702881e-01, 3.089834451675415e-01, 2.774447500705719e-01, 2.460636496543884e-01, 2.149282246828079e-01, 1.84256911277771e-01, 1.544531434774399e-01, 1.262353360652924e-01, 1.005325391888618e-01, 7.819105684757233e-02, 5.965698137879372e-02, 4.487506300210953e-02, 2.306676097214222e-02, 5.392555613070726e-03, 5.706851370632648e-04, 1.71258670889074e-05, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07, 3.113131583631912e-07]
+mov2.etaHyd=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.005868092179298e-01, 9.520360827445984e-01, 8.271036744117737e-01, 8.04924488067627e-01, 8.001004457473755e-01, 7.958767414093018e-01, 7.948749661445618e-01, 7.948824763298035e-01, 7.94935941696167e-01, 7.949787378311157e-01, 7.950137257575989e-01, 7.950429320335388e-01, 7.950676083564758e-01, 7.950887680053711e-01, 7.951071262359619e-01, 7.951231598854065e-01, 7.951372861862183e-01, 7.951498627662659e-01, 7.951611280441284e-01, 7.951712608337402e-01, 7.951804399490356e-01, 7.951887845993042e-01, 7.951964139938354e-01, 7.952033877372742e-01, 7.952097654342651e-01, 7.952157258987427e-01, 7.95221209526062e-01, 7.952262759208679e-01, 7.9523104429245e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 7.952354550361633e-01, 8.121830821037292e-01, 8.250448703765869e-01, 8.340911269187927e-01, 8.401830792427063e-01, 8.402994871139526e-01, 8.302891850471497e-01, 8.100661635398865e-01, 7.798356413841248e-01, 7.413395047187805e-01, 6.928475499153137e-01, 6.400032043457031e-01, 5.867902040481567e-01, 5.35491943359375e-01, 4.874062836170197e-01, 4.414049386978149e-01, 3.963496387004852e-01, 3.515194952487946e-01, 3.070403039455414e-01, 2.632241547107697e-01, 2.206473499536514e-01, 1.80336207151413e-01, 1.436179131269455e-01, 1.117015108466148e-01, 8.522426337003708e-02, 6.410723179578781e-02, 3.295251727104187e-02, 7.703651208430529e-03, 8.152644149959087e-04, 2.44655238930136e-05, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07, 4.44733075255499e-07]
+mov2.etaMot=[6.99999988079071e-01, 6.99999988079071e-01]
mov3.eta=[5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01, 5.8836829662323e-01]
mov3.etaHyd=[8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01, 8.405261039733887e-01]
-mov3.etaMot=[6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01, 6.99999988079071e-01]
+mov3.etaMot=[6.99999988079071e-01, 6.99999988079071e-01]
ramSpe.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.333333507180214e-02, 6.666667014360428e-02, 1.000000014901161e-01, 1.333333402872086e-01, 1.666666716337204e-01, 2.000000029802322e-01, 2.333333343267441e-01, 2.666666805744171e-01, 3.00000011920929e-01, 3.333333432674408e-01, 3.666666746139526e-01, 4.000000059604645e-01, 4.333333373069763e-01, 4.666666686534882e-01, 5e-01, 5.333333611488342e-01, 5.666666626930237e-01, 6.00000023841858e-01, 6.333333253860473e-01, 6.666666865348816e-01, 6.99999988079071e-01, 7.333333492279053e-01, 7.666666507720947e-01, 8.00000011920929e-01, 8.333333134651184e-01, 8.666666746139526e-01, 8.999999761581421e-01, 9.333333373069763e-01, 9.666666388511658e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
ramDam.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.666666388511658e-01, 9.333333373069763e-01, 8.999999761581421e-01, 8.666666746139526e-01, 8.333333134651184e-01, 8.00000011920929e-01, 7.666666507720947e-01, 7.333333492279053e-01, 6.99999988079071e-01, 6.666666865348816e-01, 6.333333253860474e-01, 6.000000238418579e-01, 5.666666626930237e-01, 5.333333611488342e-01, 5e-01, 4.666666686534882e-01, 4.333333373069763e-01, 4.000000059604645e-01, 3.666666746139526e-01, 3.333333432674408e-01, 3.00000011920929e-01, 2.666666805744171e-01, 2.333333343267441e-01, 2.000000029802322e-01, 1.666666716337204e-01, 1.333333402872086e-01, 1.000000014901161e-01, 6.666667014360428e-02, 3.333333507180214e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-mov1.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.849041372537613e-03, 7.902026921510696e-02, 3.437995910644531e-01, 8.583009839057935e-01, 1.693686008453369e+00, 2.948226690292358e+00, 4.695231437683105e+00, 7.014782428741455e+00, 9.989002227783203e+00, 1.370242309570312e+01, 1.823802185058594e+01, 2.367801666259766e+01, 3.010462951660156e+01, 3.760007476806641e+01, 4.624657821655273e+01, 5.61263542175293e+01, 6.732162475585938e+01, 7.991460418701176e+01, 9.398751831054682e+01, 1.096225814819336e+02, 1.269020156860352e+02, 1.459080352783203e+02, 1.667228698730469e+02, 1.894287414550781e+02, 2.141078491210938e+02, 2.408424224853516e+02, 2.697146911621094e+02, 3.008068542480469e+02, 3.34201171875e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.699797973632812e+02, 3.643883056640625e+02, 3.573406982421875e+02, 3.48763671875e+02, 3.38936767578125e+02, 3.281545715332031e+02, 3.163817749023438e+02, 3.036598815917969e+02, 2.89926513671875e+02, 2.759512329101562e+02, 2.631422424316406e+02, 2.524350738525391e+02, 2.435967864990234e+02, 2.362706604003906e+02, 2.300823822021484e+02, 2.246943969726562e+02, 2.199074401855469e+02, 2.156072540283203e+02, 2.117416229248047e+02, 2.083073577880859e+02, 2.053318328857422e+02, 2.028424377441406e+02, 2.008367004394531e+02, 1.992728118896484e+02, 1.980828247070312e+02, 1.9719189453125e+02, 1.959530334472656e+02, 1.950016326904297e+02, 1.947491302490234e+02, 1.947208557128906e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02, 1.947194519042969e+02]
-mov2.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.876427680253983e-03, 8.141607046127319e-02, 3.501363396644592e-01, 8.627013564109814e-01, 1.698006272315979e+00, 2.950947761535645e+00, 4.69660758972168e+00, 7.015505790710449e+00, 9.989782333374023e+00, 1.37034740447998e+01, 1.823940086364746e+01, 2.367978477478027e+01, 3.010685157775879e+01, 3.760282516479492e+01, 4.624993133544922e+01, 5.613039398193359e+01, 6.732643890380859e+01, 7.992028808593754e+01, 9.399416351318354e+01, 1.096303024291992e+02, 1.269109191894531e+02, 1.459182281494141e+02, 1.667344818115234e+02, 1.894418792724609e+02, 2.141226654052734e+02, 2.408590393066406e+02, 2.697332458496094e+02, 3.008275146484375e+02, 3.342240600585938e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.700050964355469e+02, 3.656661682128906e+02, 3.604568481445312e+02, 3.540480346679688e+02, 3.462041931152344e+02, 3.371627502441406e+02, 3.266574096679688e+02, 3.142793579101562e+02, 3.001557922363281e+02, 2.852984008789062e+02, 2.705143432617188e+02, 2.560456237792969e+02, 2.421462707519531e+02, 2.296561737060547e+02, 2.186748962402344e+02, 2.090027618408203e+02, 2.003047332763672e+02, 1.924244995117188e+02, 1.853288879394531e+02, 1.790464019775391e+02, 1.736392822265625e+02, 1.691530151367188e+02, 1.655690765380859e+02, 1.627964172363281e+02, 1.607005767822266e+02, 1.591397705078125e+02, 1.569818878173828e+02, 1.553323516845703e+02, 1.548946533203125e+02, 1.548456573486328e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02, 1.548432159423828e+02]
-mov3.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.201681189239025e-03, 8.204033225774765e-02, 3.366678059101105e-01, 8.487000465393079e-01, 1.692800521850586e+00, 2.948253631591797e+00, 4.69542407989502e+00, 7.0152587890625e+00, 9.990180015563965e+00, 1.370465755462646e+01, 1.824166870117188e+01, 2.368348121643066e+01, 3.011236000061035e+01, 3.761057281494141e+01, 4.626038360595703e+01, 5.614405822753906e+01, 6.734386444091797e+01, 7.994207000732426e+01, 9.402093505859369e+01, 1.09662727355957e+02, 1.269497222900391e+02, 1.459641723632812e+02, 1.667883605957031e+02, 1.895045318603516e+02, 2.141949768066406e+02, 2.409419403076172e+02, 2.698276977539062e+02, 3.009345092773438e+02, 3.343446350097656e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.70140380859375e+02, 3.642742614746094e+02, 3.558535766601562e+02, 3.443287353515625e+02, 3.292627563476562e+02, 3.1107861328125e+02, 2.897406921386719e+02, 2.646824035644531e+02, 2.371253356933594e+02, 2.098664093017578e+02, 1.838915863037109e+02, 1.598107147216797e+02, 1.378814697265625e+02, 1.185540008544922e+02, 1.015017929077148e+02, 8.621531677246094e+01, 7.238870239257812e+01, 5.985561370849609e+01, 4.856516647338867e+01, 3.856438446044922e+01, 2.995395278930664e+01, 2.280770683288574e+01, 1.709735679626465e+01, 1.267878341674805e+01, 9.338284492492676e+00, 6.850287914276123e+00, 3.410104990005493e+00, 7.800485491752625e-01, 8.211324363946915e-02, 2.250572433695197e-03, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05, 4.465828169486485e-05]
+mov1.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.356559090316296e-03, 9.350918233394623e-02, 3.885238766670227e-01, 9.354566335678114e-01, 1.827541351318359e+00, 3.160484075546265e+00, 5.019618034362793e+00, 7.492936134338379e+00, 1.066868019104004e+01, 1.463470840454102e+01, 1.947883033752441e+01, 2.528885459899902e+01, 3.215259170532227e+01, 4.015785217285156e+01, 4.93924446105957e+01, 5.994418334960938e+01, 7.190087127685547e+01, 8.535031890869146e+01, 1.003803482055663e+02, 1.170787506103516e+02, 1.355333557128906e+02, 1.558319549560547e+02, 1.780623626708984e+02, 2.023123931884766e+02, 2.286698608398438e+02, 2.572225646972656e+02, 2.880583190917969e+02, 3.212649536132812e+02, 3.569302368164062e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.951419982910156e+02, 3.934892883300781e+02, 3.900531921386719e+02, 3.847924194335938e+02, 3.776508483886719e+02, 3.687086486816406e+02, 3.577398071289062e+02, 3.44408203125e+02, 3.300118103027344e+02, 3.148638000488281e+02, 2.989911499023438e+02, 2.82461669921875e+02, 2.671268005371094e+02, 2.547407989501953e+02, 2.451780853271484e+02, 2.374234924316406e+02, 2.309089660644531e+02, 2.2525927734375e+02, 2.202568511962891e+02, 2.157799987792969e+02, 2.117767944335938e+02, 2.082477874755859e+02, 2.052211303710938e+02, 2.027171478271484e+02, 2.007200317382812e+02, 1.991749572753906e+02, 1.969668273925781e+02, 1.952358245849609e+02, 1.947737884521484e+02, 1.947220611572266e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02, 1.94719482421875e+02]
+mov2.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.803082000464201e-03, 9.657008200883865e-02, 3.849636316299438e-01, 9.329667091369642e-01, 1.823846936225891e+00, 3.161444664001465e+00, 5.024237632751465e+00, 7.500174999237061e+00, 1.067908763885498e+01, 1.464909362792969e+01, 1.949809455871582e+01, 2.531399536132812e+01, 3.218469619750977e+01, 4.019809722900391e+01, 4.944210433959961e+01, 6.000461578369141e+01, 7.197354125976562e+01, 8.543676757812506e+01, 1.004822158813476e+02, 1.171977691650391e+02, 1.356713562011719e+02, 1.559908447265625e+02, 1.782441558837891e+02, 2.025191955566406e+02, 2.289038696289062e+02, 2.574860534667969e+02, 2.883536682128906e+02, 3.215946350097656e+02, 3.572968139648438e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.955481262207031e+02, 3.906964416503906e+02, 3.863473510742188e+02, 3.819915771484375e+02, 3.762137451171875e+02, 3.690095520019531e+02, 3.607494201660156e+02, 3.506214294433594e+02, 3.387530212402344e+02, 3.25241455078125e+02, 3.094868774414062e+02, 2.923292541503906e+02, 2.752895812988281e+02, 2.594197692871094e+02, 2.447376556396484e+02, 2.316669769287109e+02, 2.201543884277344e+02, 2.100211639404297e+02, 2.009429779052734e+02, 1.927416381835938e+02, 1.853933868408203e+02, 1.789377288818359e+02, 1.734389953613281e+02, 1.689282836914062e+02, 1.653615417480469e+02, 1.626236114501953e+02, 1.587466583251953e+02, 1.557383422851562e+02, 1.549373931884766e+02, 1.548477325439453e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02, 1.5484326171875e+02]
+mov3.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.455383729189634e-03, 1.09381727874279e-01, 3.788160979747772e-01, 8.934495449066174e-01, 1.736127734184265e+00, 2.99350643157959e+00, 4.751358032226562e+00, 7.092888355255127e+00, 1.0099853515625e+01, 1.385527229309082e+01, 1.844232368469238e+01, 2.394418525695801e+01, 3.044403648376465e+01, 3.802505874633789e+01, 4.677042770385742e+01, 5.676332855224609e+01, 6.808692932128906e+01, 8.082441711425786e+01, 9.505897521972651e+01, 1.108737716674805e+02, 1.283519897460938e+02, 1.475768127441406e+02, 1.686314239501953e+02, 1.915989837646484e+02, 2.165626831054688e+02, 2.436056976318359e+02, 2.728112182617188e+02, 3.042624206542969e+02, 3.380424499511719e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.742345275878906e+02, 3.775219421386719e+02, 3.792314147949219e+02, 3.790670776367188e+02, 3.760601806640625e+02, 3.689100341796875e+02, 3.563557739257812e+02, 3.379152221679688e+02, 3.14293212890625e+02, 2.868612060546875e+02, 2.551107177734375e+02, 2.225887451171875e+02, 1.921858367919922e+02, 1.652740936279297e+02, 1.419190521240234e+02, 1.2166064453125e+02, 1.038136825561523e+02, 8.783371734619141e+01, 7.340354156494141e+01, 6.036011505126953e+01, 4.866780090332031e+01, 3.839137268066406e+01, 2.963494491577148e+01, 2.244968223571777e+01, 1.676665878295898e+01, 1.240336227416992e+01, 6.223604202270508e+00, 1.427384376525879e+00, 1.502808183431625e-01, 4.507213365286589e-03, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05, 8.192953828256577e-05]
From 66ceb836705a1a8cac373abefc7535c2e018759b Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Tue, 20 Aug 2024 15:30:40 -0700
Subject: [PATCH 05/47] added link in documentation for preconfigured curves
---
IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo b/IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo
index 293e98b913..d08eb8a9e6 100644
--- a/IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo
+++ b/IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo
@@ -23,9 +23,7 @@ IBPSA.Fluid.Movers.Data.Pumps
for pumps and
IBPSA.Fluid.Movers.Data.Fans
-for fans.
-(See also
-#1884.)
+for fans. See link in References for more details.
The model identifies itself as a fan or pump based on the default density of
the medium.
@@ -42,6 +40,9 @@ IBPSA.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve
for details.
+References
+
+https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HydronicConfigurations_UsersGuide.html#Buildings.Fluid.HydronicConfigurations.UsersGuide.ModelParameters
"));
end UsersGuide;
From 08dad865edb7ada7d3cc39fc00fcdb9c75188e4d Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Wed, 21 Aug 2024 09:39:15 -0700
Subject: [PATCH 06/47] removed a hardcoded eta=0.7
---
IBPSA/Fluid/Movers/Data/Generic.mo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IBPSA/Fluid/Movers/Data/Generic.mo b/IBPSA/Fluid/Movers/Data/Generic.mo
index 47094f6ce5..a0ef65597a 100644
--- a/IBPSA/Fluid/Movers/Data/Generic.mo
+++ b/IBPSA/Fluid/Movers/Data/Generic.mo
@@ -95,7 +95,7 @@ record Generic "Generic data record for movers"
then IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak(pressure=pressure,power=power)
else IBPSA.Fluid.Movers.BaseClasses.Euler.peak(V_flow=V_flow_max/2,
dp=dpMax/2,
- eta=0.7)
+ eta=max(efficiency.eta))
"Internal peak variable";
// The getPeak() function automatically handles the estimation of peak point
// when insufficient information is provided from the pressure curve.
From 238db51862df453d3c1faa2f0ab8f2d930c2f2cc Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Wed, 21 Aug 2024 09:45:31 -0700
Subject: [PATCH 07/47] removed an implicit etaMot_max=0.7
---
IBPSA/Fluid/Movers/Data/Generic.mo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IBPSA/Fluid/Movers/Data/Generic.mo b/IBPSA/Fluid/Movers/Data/Generic.mo
index a0ef65597a..fa72bd7f84 100644
--- a/IBPSA/Fluid/Movers/Data/Generic.mo
+++ b/IBPSA/Fluid/Movers/Data/Generic.mo
@@ -112,7 +112,7 @@ record Generic "Generic data record for movers"
else max(power.P)
else
if havePressureCurve
- then V_flow_max/2 * dpMax/2 /0.7*1.2
+ then V_flow_max/2 * dpMax/2 /etaMot_max*1.2
else 0
"Rated motor power"
annotation(Dialog(group="Power computation",
From a79ade02b12615fd09834fd77af051cf2c85debf Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Wed, 21 Aug 2024 10:15:33 -0700
Subject: [PATCH 08/47] further improved default guess and updated usersguide
---
IBPSA/Fluid/Movers/Data/Generic.mo | 8 +++++---
IBPSA/Fluid/Movers/UsersGuide.mo | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/IBPSA/Fluid/Movers/Data/Generic.mo b/IBPSA/Fluid/Movers/Data/Generic.mo
index fa72bd7f84..e939fc5bab 100644
--- a/IBPSA/Fluid/Movers/Data/Generic.mo
+++ b/IBPSA/Fluid/Movers/Data/Generic.mo
@@ -109,11 +109,13 @@ record Generic "Generic data record for movers"
then
if powerOrEfficiencyIsHydraulic
then max(power.P)*1.2
- else max(power.P)
+ else max(power.P)
else
if havePressureCurve
- then V_flow_max/2 * dpMax/2 /etaMot_max*1.2
- else 0
+ then if powerOrEfficiencyIsHydraulic
+ then V_flow_max/2 * dpMax/2 /peak.eta*1.2
+ else V_flow_max/2 * dpMax/2 /0.7*1.2
+ else 0
"Rated motor power"
annotation(Dialog(group="Power computation",
enable= etaMotMet==
diff --git a/IBPSA/Fluid/Movers/UsersGuide.mo b/IBPSA/Fluid/Movers/UsersGuide.mo
index 48b424c44f..20d17b5914 100644
--- a/IBPSA/Fluid/Movers/UsersGuide.mo
+++ b/IBPSA/Fluid/Movers/UsersGuide.mo
@@ -656,7 +656,8 @@ Pmot,nominal=
⁄ ηhyd,p,
where the factor 1.2 also assumes a 20% oversize
-and the assumed peak hydraulic efficiency ηhyd,p=0.7.
+and the assumed peak hydraulic efficiency ηhyd,p=0.7
+unless a hydraulic peak value is available in the record.
The model then computes the efficiency the same way as in the option of
From c696bcb3e914159c8c0c4d49e76cac289cf252e1 Mon Sep 17 00:00:00 2001
From: JayHuLBL
Date: Tue, 27 Aug 2024 12:24:01 -0700
Subject: [PATCH 09/47] corrected media dropdown choices
---
IBPSA/Fluid/Interfaces/PartialFourPort.mo | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/IBPSA/Fluid/Interfaces/PartialFourPort.mo b/IBPSA/Fluid/Interfaces/PartialFourPort.mo
index 1d5cb458ca..c8e17e6c70 100644
--- a/IBPSA/Fluid/Interfaces/PartialFourPort.mo
+++ b/IBPSA/Fluid/Interfaces/PartialFourPort.mo
@@ -4,9 +4,9 @@ partial model PartialFourPort "Partial model with four ports"
replaceable package Medium1 =
Modelica.Media.Interfaces.PartialMedium "Medium 1 in the component"
annotation (choices(
- choice(redeclare package Medium = IBPSA.Media.Air "Moist air"),
- choice(redeclare package Medium = IBPSA.Media.Water "Water"),
- choice(redeclare package Medium =
+ choice(redeclare package Medium1 = IBPSA.Media.Air "Moist air"),
+ choice(redeclare package Medium1 = IBPSA.Media.Water "Water"),
+ choice(redeclare package Medium1 =
IBPSA.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
@@ -14,9 +14,9 @@ partial model PartialFourPort "Partial model with four ports"
replaceable package Medium2 =
Modelica.Media.Interfaces.PartialMedium "Medium 2 in the component"
annotation (choices(
- choice(redeclare package Medium = IBPSA.Media.Air "Moist air"),
- choice(redeclare package Medium = IBPSA.Media.Water "Water"),
- choice(redeclare package Medium =
+ choice(redeclare package Medium2 = IBPSA.Media.Air "Moist air"),
+ choice(redeclare package Medium2 = IBPSA.Media.Water "Water"),
+ choice(redeclare package Medium2 =
IBPSA.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
@@ -83,6 +83,11 @@ are not implemented.
", revisions="
-
+August 27, 2024, by Jianjun Hu:
+Corrected dropdown media choice.
+See #1924.
+
+-
April 6, 2020, by Filip Jorissen:
Added arrows to the icon indicating the intended flow direction
when allowFlowReversal=false
.
From 9bbda8c3e99cd4d21f7649977fe902b2441bb181 Mon Sep 17 00:00:00 2001
From: JayHuLBL
Date: Tue, 27 Aug 2024 12:43:22 -0700
Subject: [PATCH 10/47] added the change to the eight port interface
---
IBPSA/Fluid/Interfaces/EightPort.mo | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/IBPSA/Fluid/Interfaces/EightPort.mo b/IBPSA/Fluid/Interfaces/EightPort.mo
index dd3a0a0c7a..feb2cbe4fa 100644
--- a/IBPSA/Fluid/Interfaces/EightPort.mo
+++ b/IBPSA/Fluid/Interfaces/EightPort.mo
@@ -4,9 +4,9 @@ partial model EightPort "Partial model with eight ports"
replaceable package Medium1 =
Modelica.Media.Interfaces.PartialMedium "Medium 1 in the component"
annotation (choices(
- choice(redeclare package Medium = IBPSA.Media.Air "Moist air"),
- choice(redeclare package Medium = IBPSA.Media.Water "Water"),
- choice(redeclare package Medium =
+ choice(redeclare package Medium1 = IBPSA.Media.Air "Moist air"),
+ choice(redeclare package Medium1 = IBPSA.Media.Water "Water"),
+ choice(redeclare package Medium1 =
IBPSA.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
@@ -14,9 +14,9 @@ partial model EightPort "Partial model with eight ports"
replaceable package Medium2 =
Modelica.Media.Interfaces.PartialMedium "Medium 2 in the component"
annotation (choices(
- choice(redeclare package Medium = IBPSA.Media.Air "Moist air"),
- choice(redeclare package Medium = IBPSA.Media.Water "Water"),
- choice(redeclare package Medium =
+ choice(redeclare package Medium2 = IBPSA.Media.Air "Moist air"),
+ choice(redeclare package Medium2 = IBPSA.Media.Water "Water"),
+ choice(redeclare package Medium2 =
IBPSA.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
@@ -24,9 +24,9 @@ partial model EightPort "Partial model with eight ports"
replaceable package Medium3 =
Modelica.Media.Interfaces.PartialMedium "Medium 3 in the component"
annotation (choices(
- choice(redeclare package Medium = IBPSA.Media.Air "Moist air"),
- choice(redeclare package Medium = IBPSA.Media.Water "Water"),
- choice(redeclare package Medium =
+ choice(redeclare package Medium3 = IBPSA.Media.Air "Moist air"),
+ choice(redeclare package Medium3 = IBPSA.Media.Water "Water"),
+ choice(redeclare package Medium3 =
IBPSA.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
@@ -34,9 +34,9 @@ partial model EightPort "Partial model with eight ports"
replaceable package Medium4 =
Modelica.Media.Interfaces.PartialMedium "Medium 4 in the component"
annotation (choices(
- choice(redeclare package Medium = IBPSA.Media.Air "Moist air"),
- choice(redeclare package Medium = IBPSA.Media.Water "Water"),
- choice(redeclare package Medium =
+ choice(redeclare package Medium4 = IBPSA.Media.Air "Moist air"),
+ choice(redeclare package Medium4 = IBPSA.Media.Water "Water"),
+ choice(redeclare package Medium4 =
IBPSA.Media.Antifreeze.PropyleneGlycolWater (
property_T=293.15,
X_a=0.40)
@@ -151,6 +151,11 @@ may be used by models that extend this model to treat flow reversal.
", revisions="
-
+August 27, 2024, by Jianjun Hu:
+Corrected dropdown media choice.
+See #1924.
+
+-
January 18, 2019, by Jianjun Hu:
Limited the media choice.
See #1050.
From 9e1ab62a276d0ad914ca1447eba52816ccea2e00 Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Tue, 27 Aug 2024 16:44:09 -0700
Subject: [PATCH 11/47] Added library in revision notes
---
IBPSA/Fluid/Interfaces/EightPort.mo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/IBPSA/Fluid/Interfaces/EightPort.mo b/IBPSA/Fluid/Interfaces/EightPort.mo
index feb2cbe4fa..41b1b1c658 100644
--- a/IBPSA/Fluid/Interfaces/EightPort.mo
+++ b/IBPSA/Fluid/Interfaces/EightPort.mo
@@ -153,12 +153,12 @@ may be used by models that extend this model to treat flow reversal.
-
August 27, 2024, by Jianjun Hu:
Corrected dropdown media choice.
-See #1924.
+See IBPSA #1924.
-
January 18, 2019, by Jianjun Hu:
Limited the media choice.
-See #1050.
+See IBPSA #1050.
- July 2014, by Damien Picard:
First implementation.
From 59e693081575084f957bb0bc81c1ba9455e80d35 Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Tue, 27 Aug 2024 16:45:58 -0700
Subject: [PATCH 12/47] Added library in revision notes
---
IBPSA/Fluid/Interfaces/PartialFourPort.mo | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/IBPSA/Fluid/Interfaces/PartialFourPort.mo b/IBPSA/Fluid/Interfaces/PartialFourPort.mo
index c8e17e6c70..f9bd0497dd 100644
--- a/IBPSA/Fluid/Interfaces/PartialFourPort.mo
+++ b/IBPSA/Fluid/Interfaces/PartialFourPort.mo
@@ -85,23 +85,23 @@ are not implemented.
-
August 27, 2024, by Jianjun Hu:
Corrected dropdown media choice.
-See #1924.
+See IBPSA #1924.
-
April 6, 2020, by Filip Jorissen:
Added arrows to the icon indicating the intended flow direction
when allowFlowReversal=false
.
-See #1336.
+See IBPSA #1336.
-
January 18, 2019, by Jianjun Hu:
Limited the media choice.
-See #1050.
+See IBPSA #1050.
-
July 8, 2018, by Filip Jorissen:
Added nominal value of h_outflow
in FluidPorts
.
-See #977.
+See IBPSA #977.
-
November 12, 2015, by Michael Wetter:
@@ -113,7 +113,7 @@ Removed parameters
h_outflow_a2_start
and
h_outflow_b2_start
.
This is for issue
-#299.
+IBPSA #299.
-
October 30, 2015, by Matthis Thorade:
From 0cf9ba3379c0238703c805a98805a8f6dda98bf5 Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Tue, 27 Aug 2024 17:45:03 -0700
Subject: [PATCH 13/47] Moved changed from Buildings
This refactors the actuator models for #1926
---
.../Actuators/BaseClasses/ActuatorSignal.mo | 42 +++++++++++++++----
.../Movers/BaseClasses/PartialFlowMachine.mo | 28 +++++++++++--
IBPSA/Fluid/Movers/FlowControlled_dp.mo | 15 +++++++
IBPSA/Fluid/Movers/FlowControlled_m_flow.mo | 18 ++++++++
IBPSA/Fluid/Movers/SpeedControlled_y.mo | 12 ++++++
...d_Actuators_Dampers_Examples_MixingBox.txt | 10 ++---
...ors_Dampers_Examples_VAVBoxExponential.txt | 12 +++---
...PSA_Fluid_Movers_Examples_ClosedLoop_y.txt | 10 ++---
...SA_Fluid_Movers_Examples_PumpsParallel.txt | 14 +++----
...BPSA_Fluid_Movers_Examples_PumpsSeries.txt | 12 +++---
...BPSA_Fluid_Movers_Examples_StaticReset.txt | 16 +++----
...ion_ControlledFlowMachinePreconfigured.txt | 16 +++----
...overs_Validation_ControlledFlowMachine.txt | 16 +++----
...alidation_ControlledFlowMachineDynamic.txt | 16 +++----
..._Fluid_Movers_Validation_PressureCurve.txt | 4 +-
...Fluid_Movers_Validation_Pump_y_stratos.txt | 34 +++++++--------
16 files changed, 185 insertions(+), 90 deletions(-)
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
index 3106701fb4..73d94de02d 100644
--- a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
+++ b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
@@ -7,6 +7,11 @@ model ActuatorSignal
parameter Boolean use_inputFilter=true
"= true, if opening is filtered with a 2nd order CriticalDamping filter"
annotation(Dialog(tab="Dynamics", group="Filtered opening"));
+
+ parameter Boolean use_linearDynamics = true
+ "Set to true to use an actuator dynamics that models the change in actuator position linear in time"
+ annotation(Dialog(tab="Dynamics", group="Filtered opening"));
+
parameter Modelica.Units.SI.Time riseTime=120
"Rise time of the filter (time to reach 99.6 % of an opening step)"
annotation (Dialog(
@@ -52,18 +57,35 @@ protected
final f=fCut,
final normalized=true,
final initType=init,
- final y_start=y_start) if use_inputFilter
+ final y_start=y_start) if use_inputFilter and not use_linearDynamics
"Second order filter to approximate actuator opening time, and to improve numerics"
- annotation (Placement(transformation(extent={{6,81},{20,95}})));
+ annotation (Placement(transformation(extent={{16,89},{24,96}})));
+ Modelica.Blocks.Nonlinear.SlewRateLimiter actPos(
+ Rising=1/riseTime,
+ Falling=-1/riseTime,
+ Td=10/riseTime,
+ initType=init,
+ y_start=y_start,
+ strict=true)
+ if use_inputFilter and use_linearDynamics
+ "Actuator position"
+ annotation (Placement(transformation(extent={{16,76},{24,84}})));
equation
connect(filter.y, y_filtered)
- annotation (Line(points={{20.7,88},{50,88}}, color={0,0,127}));
+ annotation (Line(points={{24.4,92.5},{34,92.5},{34,88},{50,88}},
+ color={0,0,127}));
+ connect(actPos.y, y_filtered)
+ annotation (Line(points={{24.4,80},{34,80},{34,88},
+ {50,88}}, color={0,0,127}));
+
if use_inputFilter then
- connect(y, filter.u) annotation (Line(points={{1.11022e-15,120},{1.11022e-15,
- 88},{4.6,88}}, color={0,0,127}));
- connect(filter.y, y_internal) annotation (Line(points={{20.7,88},{30,88},{30,
- 70},{50,70}}, color={0,0,127}));
+ connect(y, filter.u) annotation (Line(points={{0,120},{0,92.5},{15.2,92.5}},
+ color={0,0,127}));
+ connect(actPos.u, y)
+ annotation (Line(points={{15.2,80},{0,80},{0,120}}, color={0,0,127}));
+
+ connect(y_filtered, y_internal);
else
connect(y, y_internal) annotation (Line(
points={{1.11022e-15,120},{0,120},{0,70},{50,70}},
@@ -72,6 +94,7 @@ equation
if not casePreInd then
connect(y_internal, y_actual);
end if;
+
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-100},{100,100}}), graphics={
Line(
@@ -119,6 +142,11 @@ for a description of the filter.
", revisions="
-
+August 26, 2024, by Michael Wetter:
+Implemented linear actuator travel dynamics.
+This is for Buildings, #3965.
+
+-
June 10, 2021, by Michael Wetter:
Changed implementation of the filter and changed the parameter order
to a constant
as most users need not change this value.
diff --git a/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
index b318793e33..5203c5ee20 100644
--- a/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
+++ b/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
@@ -52,6 +52,11 @@ partial model PartialFlowMachine
parameter Boolean use_inputFilter=true
"= true, if speed is filtered with a 2nd order CriticalDamping filter"
annotation(Dialog(tab="Dynamics", group="Filtered speed"));
+
+ parameter Boolean use_linearDynamics = true
+ "Set to true to use an actuator dynamics that models the change in actuator position linear in time"
+ annotation(Dialog(tab="Dynamics", group="Filtered speed"));
+
parameter Modelica.Units.SI.Time riseTime=30
"Rise time of the filter (time to reach 99.6 % of the speed)" annotation (
Dialog(
@@ -238,9 +243,19 @@ protected
final n=2,
final f=fCut,
final normalized=true,
- final initType=init) if use_inputFilter
+ final initType=init) if use_inputFilter and not use_linearDynamics
"Second order filter to approximate dynamics of the fan or pump's speed, and to improve numerics"
- annotation (Placement(transformation(extent={{20,61},{40,80}})));
+ annotation (Placement(transformation(extent={{16,89},{24,96}})));
+
+ Modelica.Blocks.Nonlinear.SlewRateLimiter motSpe(
+ Rising=1/riseTime,
+ Falling=-1/riseTime,
+ Td=10/riseTime,
+ initType=init,
+ strict=true)
+ if use_inputFilter and use_linearDynamics
+ "Dynamics of engine speed"
+ annotation (Placement(transformation(extent={{16,76},{24,84}})));
IBPSA.Fluid.Movers.BaseClasses.IdealSource preSou(
redeclare final package Medium = Medium,
@@ -507,7 +522,8 @@ equation
-86},{48,-86}}, color={0,0,127}));
connect(inputSwitch.y, filter.u) annotation (Line(points={{1,50},{12,50},{12,70.5},
{18,70.5}}, color={0,0,127}));
-
+ connect(inputSwitch.y, motSpe.u) annotation (Line(points={{1,50},{12,50},{12,70.5},
+ {18,70.5}}, color={0,0,127}));
connect(senRelPre.p_rel, eff.dp_in) annotation (Line(points={{50.5,-26.35},{50.5,
-38},{-18,-38},{-18,-46}}, color={0,0,127}));
connect(eff.y_out, y_actual) annotation (Line(points={{-11,-48},{92,-48},{92,
@@ -640,6 +656,12 @@ See discussions in
",
revisions="
+-
+August 26, 2024, by Michael Wetter:
+Implemented linear dynamics for change in motor speed.
+This is for Buildings, #3965.
+
+
-
June 18, 2024, by Michael Wetter:
Added start
and nominal
attributes
diff --git a/IBPSA/Fluid/Movers/FlowControlled_dp.mo b/IBPSA/Fluid/Movers/FlowControlled_dp.mo
index a61cec66f5..5094680748 100644
--- a/IBPSA/Fluid/Movers/FlowControlled_dp.mo
+++ b/IBPSA/Fluid/Movers/FlowControlled_dp.mo
@@ -14,6 +14,12 @@ model FlowControlled_dp
y(final unit="Pa"),
x(each nominal=dp_nominal),
u_nominal=dp_nominal),
+ motSpe(
+ final y_start=dp_start,
+ u(final unit="Pa",
+ nominal=dp_nominal),
+ y(final unit="Pa",
+ nominal=dp_nominal)),
eff(
per(
final pressure=
@@ -115,6 +121,10 @@ equation
points={{41,70.5},{44,70.5},{44,42}},
color={0,0,127},
smooth=Smooth.None));
+ connect(motSpe.y, gain.u) annotation (Line(
+ points={{41,70.5},{44,70.5},{44,42}},
+ color={0,0,127},
+ smooth=Smooth.None));
else
connect(inputSwitch.y, gain.u) annotation (Line(
points={{1,50},{44,50},{44,42}},
@@ -180,6 +190,11 @@ IBPSA.Fluid.Movers.Validation.FlowControlled_dpSystem.
revisions="
-
+August 26, 2024, by Michael Wetter:
+Implemented linear dynamics for change in motor speed.
+This is for Buildings, #3965.
+
+-
March 1, 2023, by Hongxiang Fu:
Refactored the model with a new declaration for
m_flow_nominal
.
diff --git a/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo b/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo
index 821de47ed3..ede314d0c6 100644
--- a/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo
+++ b/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo
@@ -13,6 +13,12 @@ model FlowControlled_m_flow
y(final unit="kg/s"),
x(each nominal=m_flow_nominal),
u_nominal=m_flow_nominal),
+ motSpe(
+ final y_start=m_flow_start,
+ u(final unit="kg/s",
+ nominal=m_flow_nominal),
+ y(final unit="kg/s",
+ nominal=m_flow_nominal)),
eff(
per(
final pressure = if per.havePressureCurve then
@@ -104,6 +110,12 @@ equation
smooth=Smooth.None));
connect(filter.y, preSou.m_flow_in)
annotation (Line(points={{41,70.5},{44,70.5},{44,8}}, color={0,0,127}));
+ connect(motSpe.y, m_flow_actual) annotation (Line(
+ points={{41,70.5},{44,70.5},{44,50},{110,50}},
+ color={0,0,127},
+ smooth=Smooth.None));
+ connect(motSpe.y, preSou.m_flow_in)
+ annotation (Line(points={{41,70.5},{44,70.5},{44,8}}, color={0,0,127}));
else
connect(inputSwitch.y, m_flow_actual) annotation (Line(points={{1,50},{110,50}},
color={0,0,127}));
@@ -146,6 +158,12 @@ User's Guide for more information.
",
revisions="
+-
+August 26, 2024, by Michael Wetter:
+Implemented linear dynamics for change in motor speed.
+This is for Buildings, #3965.
+
+
-
March 1, 2023, by Hongxiang Fu:
Refactored the model with a new declaration for
diff --git a/IBPSA/Fluid/Movers/SpeedControlled_y.mo b/IBPSA/Fluid/Movers/SpeedControlled_y.mo
index 8c8f47003c..7b7e09027e 100644
--- a/IBPSA/Fluid/Movers/SpeedControlled_y.mo
+++ b/IBPSA/Fluid/Movers/SpeedControlled_y.mo
@@ -11,6 +11,10 @@ model SpeedControlled_y
final y_start=y_start,
u(final unit="1"),
y(final unit="1")),
+ motSpe(
+ final y_start=y_start,
+ u(final unit="1"),
+ y(final unit="1")),
eff(
per(final pressure = per.pressure,
final etaHydMet = per.etaHydMet,
@@ -54,6 +58,8 @@ equation
if use_inputFilter then
connect(filter.y, eff.y_in) annotation (Line(points={{41,70.5},{44,70.5},{44,
26},{-26,26},{-26,-46}}, color={0,0,127}));
+ connect(motSpe.y, eff.y_in) annotation (Line(points={{41,70.5},{44,70.5},{44,
+ 26},{-26,26},{-26,-46}}, color={0,0,127}));
else
connect(inputSwitch.y, eff.y_in) annotation (Line(points={{1,50},{44,50},{44,
26},{-26,26},{-26,-46}},
@@ -85,6 +91,12 @@ User's Guide for more information.
",
revisions="
+-
+August 26, 2024, by Michael Wetter:
+Implemented linear dynamics for change in motor speed.
+This is for Buildings, #3965.
+
+
-
March 29, 2023, by Hongxiang Fu:
Removed the modification that normalised the speed input
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_MixingBox.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_MixingBox.txt
index 4709ef1878..de76cb6586 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_MixingBox.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_MixingBox.txt
@@ -1,12 +1,12 @@
-last-generated=2021-06-17
+last-generated=2024-08-26
statistics-simulation=
{
"linear": " ",
"nonlinear": " ",
- "number of continuous time states": "2",
+ "number of continuous time states": "1",
"numerical Jacobians": "0"
}
time=[0e+00, 2.4e+02]
-mixBox.damOA.m_flow=[4.082483053207397e-01, 3.696834170139743e-01, 2.938377922707618e-01, 1.953646459062304e-01, 1.09041023765295e-01, 6.167414039373398e-02, 3.722175694656505e-02, 2.410912037127299e-02, 1.666897724455199e-02, 1.158944401249707e-02, 8.291748352348804e-03, 6.223875311835456e-03, 4.641559263420082e-03, 2.637361072073257e-03, 1.234091452458272e-03, 5.26286952663213e-04, 2.187833037761185e-04, 9.259343557175558e-05, 4.094635761945294e-05, 1.921394234569782e-05, 9.63495494943345e-06, 5.171852794499868e-06, 2.967318769641812e-06, 1.813348318288214e-06, 1.174917254889492e-06, 8.030286267057818e-07, 1.898798647302421e-06, 2.333787689786465e-05, 4.095623919024506e-04, 3.306325216842226e-03, 6.927305366843939e-03, 1.163727608212196e-02, 1.968681682638102e-02, 3.305764883300711e-02, 5.443867557601653e-02, 8.690176159143448e-02, 1.32635635434681e-01, 1.900493924774843e-01, 2.502414399256135e-01, 3.008954817603772e-01, 3.464572727680206e-01, 3.90022459447379e-01, 4.304826061385316e-01, 4.671707887191192e-01, 4.99818493266804e-01, 5.284626483917236e-01, 5.533405393283887e-01, 5.747996908068648e-01, 5.932310437047689e-01, 6.090249510606446e-01, 6.225466728210449e-01, 6.341242721101055e-01, 6.44044804643355e-01, 6.525557735897936e-01, 6.598678056339913e-01, 6.661596894264221e-01, 6.715819365707369e-01, 6.762617174340707e-01, 6.803066181565065e-01, 6.838071262308203e-01, 6.868403553962708e-01, 6.894713701625237e-01, 6.917557688932962e-01, 6.937407874407708e-01, 6.954668122773646e-01, 6.969685554504395e-01, 6.982756883677118e-01, 6.994139538432167e-01, 7.00405479637473e-01, 7.012693861207047e-01, 7.020221948623657e-01, 7.026782647229035e-01, 7.032500498569273e-01, 7.037484055625455e-01, 7.041825641678706e-01, 7.045609354972839e-01, 7.048906691629605e-01, 7.051778432254772e-01, 7.054282429759674e-01, 7.056462163456488e-01, 7.05836296081543e-01, 7.060017589627238e-01, 7.061458824333219e-01, 7.062714101350607e-01, 7.063806650392871e-01, 7.064757347106934e-01, 7.065584661509048e-01, 7.066304086774827e-01, 7.066929937136599e-01, 7.067473529465769e-01, 7.067946791648865e-01, 7.068358064660342e-01, 7.068715691138243e-01, 7.069026232129548e-01, 7.069296836201238e-01, 7.069531083106995e-01, 7.0697349314696e-01, 7.069911360532234e-01, 7.070064544855845e-01, 7.07019686667082e-01, 7.0703125e-01]
-mixBox.damExh.m_flow=[4.082483053207397e-01, 3.31985506871662e-01, 2.328850717785657e-01, 1.215030706163871e-01, 5.679997037782256e-02, 2.82274316996336e-02, 1.529461202529541e-02, 9.006084486153611e-03, 5.711705303975978e-03, 4.482403044711292e-03, 3.8699503056705e-03, 3.402593017416759e-03, 2.908796242514134e-03, 1.86374969193e-03, 9.708199546649307e-04, 4.561154346447438e-04, 2.071148447385069e-04, 9.259343557175558e-05, 4.094635761945294e-05, 1.921394234569782e-05, 9.63495494943345e-06, 5.171852794499868e-06, 2.967318769641812e-06, 1.813348318288214e-06, 1.174917254889492e-06, 8.030286267057818e-07, 1.898798647302421e-06, 2.333787689786465e-05, 4.095623919024506e-04, 3.306325216842226e-03, 6.927305366843939e-03, 1.163727608212196e-02, 1.968681682638102e-02, 3.305764883300711e-02, 5.443867557601653e-02, 8.690176159143448e-02, 1.32635635434681e-01, 1.900493924774843e-01, 2.502414399256135e-01, 3.008954817603772e-01, 3.464572727680206e-01, 3.90022459447379e-01, 4.304826061385316e-01, 4.671707887191192e-01, 4.99818493266804e-01, 5.284626483917236e-01, 5.533405393283887e-01, 5.747996908068648e-01, 5.932310437047689e-01, 6.090249510606446e-01, 6.225466728210449e-01, 6.341242721101055e-01, 6.44044804643355e-01, 6.525557735897936e-01, 6.598678056339913e-01, 6.661596894264221e-01, 6.715819365707369e-01, 6.762617174340707e-01, 6.803066181565065e-01, 6.838071262308203e-01, 6.868403553962708e-01, 6.894713701625237e-01, 6.917557688932962e-01, 6.937407874407708e-01, 6.954668122773646e-01, 6.969685554504395e-01, 6.982756883677118e-01, 6.994139538432167e-01, 7.00405479637473e-01, 7.012693861207047e-01, 7.020221948623657e-01, 7.026782647229035e-01, 7.032500498569273e-01, 7.037484055625455e-01, 7.041825641678706e-01, 7.045609354972839e-01, 7.048906691629605e-01, 7.051778432254772e-01, 7.054282429759674e-01, 7.056462163456488e-01, 7.05836296081543e-01, 7.060017589627238e-01, 7.061458824333219e-01, 7.062714101350607e-01, 7.063806650392871e-01, 7.064757347106934e-01, 7.065584661509048e-01, 7.066304086774827e-01, 7.066929937136599e-01, 7.067473529465769e-01, 7.067946791648865e-01, 7.068358064660342e-01, 7.068715691138243e-01, 7.069026232129548e-01, 7.069296836201238e-01, 7.069531083106995e-01, 7.0697349314696e-01, 7.069911360532234e-01, 7.070064544855845e-01, 7.07019686667082e-01, 7.0703125e-01]
-mixBox.damRec.m_flow=[4.687499810529516e-08, 2.734546447273023e-03, 1.15784583209468e-02, 3.409176984885041e-02, 8.465033474082763e-02, 1.739961206912994e-01, 2.772684533506339e-01, 3.623661965712153e-01, 4.457449950738265e-01, 5.241986988556731e-01, 5.957407355308533e-01, 6.598634814900867e-01, 7.169646789922562e-01, 7.678287470875388e-01, 8.133456978416685e-01, 8.543623685836792e-01, 8.916171560878264e-01, 9.196159884379204e-01, 9.326601586164014e-01, 9.434248270013038e-01, 9.523463249206543e-01, 9.597715691590568e-01, 9.659740942540052e-01, 9.711723908292796e-01, 9.755413557283168e-01, 9.792221784591675e-01, 9.706975332843493e-01, 9.407647140789871e-01, 8.903066312884957e-01, 8.194043707696016e-01, 7.302325367927551e-01, 6.287198730582965e-01, 5.238320956836111e-01, 4.246803537107068e-01, 3.380604497868919e-01, 2.670271992683411e-01, 1.958259188825242e-01, 1.359322145688537e-01, 9.358972570356705e-02, 6.533053616218858e-02, 4.664341732859612e-02, 3.416386175278092e-02, 2.568431562958946e-02, 1.980650567551547e-02, 1.564792514080053e-02, 1.264639478176832e-02, 1.037198543503879e-02, 7.358728801532737e-03, 4.439111054030983e-03, 2.410544308140341e-03, 1.231509493663907e-03, 6.120880746241475e-04, 3.034120871316695e-04, 1.527122893474363e-04, 7.902283709514948e-05, 4.238670953782275e-05, 2.368513482148216e-05, 1.382251012681051e-05, 8.430711871214007e-06, 5.37094620578205e-06, 3.568425654520979e-06, 2.467266033425282e-06, 1.770829441021609e-06, 1.315773377868861e-06, 1.00930445354638e-06, 7.970735964590858e-07, 6.463168615233643e-07, 5.367283598207263e-07, 4.553858997415889e-07, 3.938709178622601e-07, 3.465648319433967e-07, 3.096402605792577e-07, 2.804381492345346e-07, 2.570671450388978e-07, 2.381765413422629e-07, 2.227606188398568e-07, 2.100799602365542e-07, 1.995773554876465e-07, 1.908178617318188e-07, 1.834787784667319e-07, 1.772944386857489e-07, 1.720656421367116e-07, 1.676270126710793e-07, 1.638478251631363e-07, 1.606225416363272e-07, 1.578627291110024e-07, 1.554981084588849e-07, 1.534669020628838e-07, 1.517211935800901e-07, 1.502177618329823e-07, 1.489213588001803e-07, 1.478030329856191e-07, 1.468366702036012e-07, 1.460018372027485e-07, 1.452796869030167e-07, 1.446551891604031e-07, 1.441147917285147e-07, 1.43647569066275e-07, 1.432443208241401e-07, 1.428957582850501e-07, 1.42593208352082e-07]
+mixBox.damOA.m_flow=[4.082483053207397e-01, 4.454278336281534e-01, 4.756961740834717e-01, 5.000264661357031e-01, 5.190282437039598e-01, 5.331141352653503e-01, 5.425906192184005e-01, 5.477123864853083e-01, 5.4871743936034e-01, 5.318516532111573e-01, 5.066548585891724e-01, 4.807801205013039e-01, 4.544356381004651e-01, 4.278430129328996e-01, 4.01229185881831e-01, 3.748179376125336e-01, 3.488219544292207e-01, 3.23436162887657e-01, 2.988324540470423e-01, 2.741837336838382e-01, 2.473476380109787e-01, 2.191182108574089e-01, 1.910427572774497e-01, 1.644436500936291e-01, 1.401583706104329e-01, 1.185758486390114e-01, 1.401583706104329e-01, 1.644436097285294e-01, 1.910428011509759e-01, 2.191182108574088e-01, 2.473476380109787e-01, 2.741837336838384e-01, 2.988324156278723e-01, 3.234362027307464e-01, 3.488219544292208e-01, 3.748179376125336e-01, 4.01229185881831e-01, 4.278429705887467e-01, 4.544356802045508e-01, 4.80780141256311e-01, 5.066548585891724e-01, 5.318516334668446e-01, 5.561833077178873e-01, 5.794898559330359e-01, 6.016417877922128e-01, 6.225432157516479e-01, 6.421308992371919e-01, 6.60373128794017e-01, 6.77266260580011e-01, 6.928306912000253e-01, 7.069335579872131e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01]
+mixBox.damExh.m_flow=[4.082483053207397e-01, 4.000059965664241e-01, 3.910198517076158e-01, 3.812665931209078e-01, 3.707344549249504e-01, 3.594254851341248e-01, 3.473580459740685e-01, 3.345685857296449e-01, 3.211126073061774e-01, 3.307187824197673e-01, 3.461111485958099e-01, 3.554739663881283e-01, 3.597416286626076e-01, 3.596596723120421e-01, 3.558671437820513e-01, 3.489364981651306e-01, 3.393925792980694e-01, 3.23436162887657e-01, 2.988324540470423e-01, 2.741837336838382e-01, 2.473476380109787e-01, 2.191182108574089e-01, 1.910427572774497e-01, 1.644436500936291e-01, 1.401583706104329e-01, 1.185758486390114e-01, 1.401583706104329e-01, 1.644436097285294e-01, 1.910428011509759e-01, 2.191182108574088e-01, 2.473476380109787e-01, 2.741837336838384e-01, 2.988324156278723e-01, 3.234362027307464e-01, 3.488219544292208e-01, 3.748179376125336e-01, 4.01229185881831e-01, 4.278429705887467e-01, 4.544356802045508e-01, 4.80780141256311e-01, 5.066548585891724e-01, 5.318516334668446e-01, 5.561833077178873e-01, 5.794898559330359e-01, 6.016417877922128e-01, 6.225432157516479e-01, 6.421308992371919e-01, 6.60373128794017e-01, 6.77266260580011e-01, 6.928306912000253e-01, 7.069335579872131e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01]
+mixBox.damRec.m_flow=[4.687499810529516e-08, 5.634683052747534e-07, 5.066187665337511e-06, 3.414302608787851e-05, 1.727481364672174e-04, 6.569329998455942e-04, 1.879329033053117e-03, 4.047394149208643e-03, 6.567098850952482e-03, 8.547129713904868e-03, 1.091585773974657e-02, 1.389764676103522e-02, 1.764323698506353e-02, 2.233815589023022e-02, 2.820954338620854e-02, 3.553326055407524e-02, 4.464048634731105e-02, 5.519597190103515e-02, 6.636046237930879e-02, 7.964365373217776e-02, 9.535260498523712e-02, 1.137716794818306e-01, 1.351056172431625e-01, 1.593863585243695e-01, 1.863368780356393e-01, 2.152060866355896e-01, 1.863368780356393e-01, 1.593863996197116e-01, 1.351055812522109e-01, 1.137716794818306e-01, 9.535260498523712e-02, 7.964365373217772e-02, 6.636048193239101e-02, 5.519595584906663e-02, 4.585202623440833e-02, 3.805530071258545e-02, 3.156351680991942e-02, 2.616655904092419e-02, 2.168472533678317e-02, 1.796584551592471e-02, 1.488183345645666e-02, 1.232540571743726e-02, 1.005037833865237e-02, 6.598603447664888e-03, 3.27784425449561e-03, 1.231746398843825e-03, 3.501655024512492e-04, 7.531566878993883e-05, 1.225688169980255e-05, 1.5092885682611e-06, 1.451763154136643e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406253460348107e-07, 1.406250333975429e-07, 1.406252891911208e-07, 1.406252465578339e-07, 1.406250333956456e-07, 1.406250902392452e-07, 1.406251044500095e-07, 1.406250760283001e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt
index e34c9369e7..f0bee09571 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt
@@ -1,4 +1,4 @@
-last-generated=2021-06-17
+last-generated=2024-08-26
statistics-initialization=
{
"nonlinear": "1",
@@ -8,12 +8,12 @@ statistics-simulation=
{
"linear": " ",
"nonlinear": "1, 0",
- "number of continuous time states": "4",
+ "number of continuous time states": "2",
"numerical Jacobians": "0"
}
time=[0e+00, 2.4e+02]
-dam.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.737259431473062e-01, -3.737259431473062e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.967951452690591e+00, -1.879301210315676e+00, -1.741086750071444e+00, -1.560992232939402e+00, -1.352083683013916e+00, -1.132674237158968e+00, -9.217709507203622e-01, -7.336880183134643e-01, -5.759789668563472e-01, -4.507051706314087e-01, -3.501051357126311e-01, -2.685334441965567e-01, -2.029281281226012e-01, -1.515931657944556e-01, -1.129078343510628e-01, -8.469105587398409e-02, -6.44747912941786e-02, -5.003519721276513e-02, -3.964932465437468e-02, -3.208564221858978e-02, -2.63832265185107e-02, -1.888687819861831e-02, -1.145439737800964e-02, -6.235633881712747e-03, -3.187894588336349e-03, -1.583801529179733e-03, -7.842448458710465e-04, -3.941492222769715e-04, -2.036216695984447e-04, -1.090337391360663e-04, -6.082295497557724e-05, -3.543746360225672e-05, -2.158061076995955e-05, -1.372834181335048e-05, -9.108892299991567e-06, -6.290471991311104e-06, -4.510040592178743e-06, -3.347932972948661e-06, -2.566017081802397e-06, -2.02498472390289e-06, -1.640948990076237e-06, -1.36195464511856e-06, -1.15499574968678e-06, -9.985552802635825e-07, -8.783056841821235e-07, -7.844776842655621e-07, -7.102904937829821e-07, -6.509369447523564e-07, -6.029545132231364e-07, -5.638096922666591e-07, -5.316128247586956e-07, -5.049456350080632e-07, -4.827181529522442e-07, -4.640926236121292e-07, -4.484101339130575e-07, -4.351517170202344e-07, -4.239028746473909e-07, -4.143284857914339e-07, -4.061583833235476e-07, -3.9916915284266e-07, -3.931789226328227e-07, -3.880353806487708e-07, -3.836126671585641e-07, -3.798060197518953e-07, -3.765266853861249e-07, -3.736966439407281e-07, -3.712584402464297e-07, -3.69152727264254e-07, -3.673300498504466e-07, -3.65758239695424e-07, -3.643966092586944e-07, -3.632155212967545e-07, -3.621942698283209e-07, -3.613076863461255e-07, -3.605385643368209e-07]
-vav.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.469959246805281e-01, -3.469959246805281e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.967951452690591e+00, -1.879301210315676e+00, -1.741086750071444e+00, -1.560992232939402e+00, -1.352083683013916e+00, -1.132674237158968e+00, -9.217709507203622e-01, -7.336880183134643e-01, -5.757455495883079e-01, -4.24614280462265e-01, -2.891636361350493e-01, -1.930794851346795e-01, -1.302965718998985e-01, -8.99325264254093e-02, -6.375726312398911e-02, -4.647427236782556e-02, -3.481578602942794e-02, -2.677487504892722e-02, -2.110695172786041e-02, -1.702781952917576e-02, -1.397454367154608e-02, -9.983797434503965e-03, -6.046428367772958e-03, -3.289529938860811e-03, -1.681343652307987e-03, -8.35252512541094e-04, -4.135761574238545e-04, -2.078543702676739e-04, -1.073791858786195e-04, -5.749842239310965e-05, -3.207465548338754e-05, -1.868774269587203e-05, -1.138040703902593e-05, -7.239558002944322e-06, -4.803518550033914e-06, -3.317241760628682e-06, -2.378342144857107e-06, -1.765511757852976e-06, -1.353173147753041e-06, -1.067863081516407e-06, -8.653442237396849e-07, -7.182182969760326e-07, -6.090798449406845e-07, -5.265818745303372e-07, -4.631690160294966e-07, -4.136894111394996e-07, -3.745672528028576e-07, -3.43267537674987e-07, -3.179642954146285e-07, -2.973215202928259e-07, -2.803427220947124e-07, -2.662799426967354e-07, -2.545584018589812e-07, -2.447363504780445e-07, -2.364662776699333e-07, -2.294745352749692e-07, -2.235425355491069e-07, -2.18493533876384e-07, -2.141850888415957e-07, -2.104993512830333e-07, -2.073404414870245e-07, -2.046280404245229e-07, -2.022957489971542e-07, -2.002883311725261e-07, -1.985589932473886e-07, -1.970665942409732e-07, -1.957808295339276e-07, -1.946703905126231e-07, -1.937092003137687e-07, -1.928803214923391e-07, -1.921622737477056e-07, -1.915394428303175e-07, -1.910008926953888e-07, -1.905333573269478e-07, -1.901277641991328e-07]
-dam.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 1.813970218697891e-01, -1.813970218697891e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -5.158958735649039e+00, -5.585283575533193e+00, -6.210771511398931e+00, -6.954129232157869e+00, -7.714837074279785e+00, -8.396311358321713e+00, -8.937922821724007e+00, -9.32712689170604e+00, -9.58495628430299e+00, -9.721491813659668e+00, -9.797881085646605e+00, -9.85036748752262e+00, -9.889124911585e+00, -9.918073669469367e+00, -9.939343452453613e+00, -9.954648009425059e+00, -9.965532290845136e+00, -9.973277099995604e+00, -9.978835108797265e+00, -9.982877731323242e+00, -9.985923765216297e+00, -9.989925379028175e+00, -9.993890766530937e+00, -9.996674538950165e+00, -9.998299598693848e+00, -9.999155044149425e+00, -9.999581336580986e+00, -9.999790191814098e+00, -9.999891280933909e+00, -9.999941825866699e+00, -9.999967575121747e+00, -9.999980926501545e+00, -9.999988555914266e+00, -9.999992370605469e+00, -9.999995231628418e+00, -9.999996185314862e+00, -9.999997138977051e+00, -9.999998092651367e+00, -9.999999046313556e+00, -9.999999046325684e+00, -9.999999046325684e+00, -9.999999046325684e+00, -9.999999046325684e+00, -9.999999046325684e+00, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01]
+dam.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.737259431473062e-01, -3.737259431473062e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.940327802385007e+00, -1.877216301851485e+00, -1.810849937488456e+00, -1.741487696316894e+00, -1.669460654258728e+00, -1.59516899591484e+00, -1.519072868599096e+00, -1.441680570688212e+00, -1.363534996762882e+00, -1.285195112228394e+00, -1.20721965007635e+00, -1.13015017710609e+00, -1.054495478188737e+00, -9.807194010648457e-01, -9.092302918434143e-01, -8.403752876781353e-01, -7.74436794554004e-01, -7.116323531794735e-01, -6.521177522387518e-01, -5.961551666259766e-01, -5.442848525899567e-01, -4.959328176771942e-01, -4.507053537392651e-01, -4.082805850557367e-01, -3.68388831615448e-01, -3.308238620263711e-01, -2.954461417514227e-01, -2.62182850674568e-01, -2.310259814885074e-01, -2.020234912633896e-01, -1.752643983177587e-01, -1.508514136262613e-01, -1.288671530789572e-01, -1.093432033775919e-01, -9.223896265029907e-02, -7.744024244070019e-02, -6.477236766348606e-02, -5.402203533415594e-02, -4.496047184770324e-02, -3.73610258102417e-02, -3.101159117633216e-02, -2.532884379115844e-02, -1.666065250499786e-02, -8.284950544406948e-03, -3.114212537184358e-03, -8.853516794102495e-04, -1.904278395313183e-04, -3.099024349954586e-05, -3.816108880567362e-06, -3.671110846426018e-07, -3.555555565526447e-07, -3.555555849754383e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07]
+vav.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.469959246805281e-01, -3.469959246805281e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.940327802385007e+00, -1.877216301851485e+00, -1.810849937488456e+00, -1.741487696316894e+00, -1.669460654258728e+00, -1.59516899591484e+00, -1.519072868599096e+00, -1.441680570688212e+00, -1.363534996762882e+00, -1.285195112228394e+00, -1.20721965007635e+00, -1.13015017710609e+00, -1.054495478188737e+00, -9.807194010648457e-01, -9.092302918434143e-01, -8.403752876781353e-01, -7.74436794554004e-01, -7.116323531794735e-01, -6.521177522387518e-01, -5.961540937423706e-01, -5.418579334863312e-01, -4.84133795393221e-01, -4.246145331970435e-01, -3.667049947901371e-01, -3.129824101924896e-01, -2.648274295442596e-01, -2.226868628118333e-01, -1.864185063530396e-01, -1.555629509701821e-01, -1.295222043991089e-01, -1.076680221128231e-01, -8.939932209460046e-02, -7.416978981282542e-02, -6.149871283217863e-02, -5.097073316574097e-02, -4.223206518069301e-02, -3.498377014802656e-02, -2.897466223695344e-02, -2.399480025745184e-02, -1.986896432936192e-02, -1.64514031983811e-02, -1.34117806031774e-02, -8.802746728693326e-03, -4.371548553613623e-03, -1.642475486733019e-03, -4.668970769411342e-04, -1.004214301479531e-04, -1.634252348439065e-05, -2.012401503218905e-06, -1.935937348207517e-07, -1.874999924211807e-07, -1.875000208434322e-07, -1.875000066320354e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07]
+dam.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 1.813970218697891e-01, -1.813970218697891e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -5.29390983761167e+00, -5.595073790874238e+00, -5.90102807062339e+00, -6.209026055615286e+00, -6.516126155853271e+00, -6.819294738220807e+00, -7.115522012399071e+00, -7.401946423041047e+00, -7.675965477977451e+00, -7.935341835021973e+00, -8.178275911964331e+00, -8.403450688887578e+00, -8.610049496032017e+00, -8.797737233703755e+00, -8.966625213623047e+00, -9.117212204334798e+00, -9.250309783500811e+00, -9.366974013430946e+00, -9.468427717149291e+00, -9.555747032165527e+00, -9.626473386822582e+00, -9.679752289105757e+00, -9.721491860504381e+00, -9.755854626382504e+00, -9.785184860229492e+00, -9.810849174227272e+00, -9.833686800825381e+00, -9.854228997963046e+00, -9.872812225705102e+00, -9.889643669128418e+00, -9.9048452739775e+00, -9.918485624914414e+00, -9.930615439407248e+00, -9.941286061340463e+00, -9.950568199157715e+00, -9.958558101061076e+00, -9.965373031138904e+00, -9.971140868120283e+00, -9.975994098611672e+00, -9.980058670043945e+00, -9.983451850986183e+00, -9.986486430492086e+00, -9.991112715302789e+00, -9.995581616997013e+00, -9.99833869934082e+00, -9.999527932704916e+00, -9.999898910267801e+00, -9.999983787566938e+00, -9.99999809263924e+00, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01]
vav.dp=[1e+01, 9.199999841054241e+00, 8.399999682108877e+00, 7.599999841054344e+00, 6.800000317891186e+00, 6e+00, 5.199999682108814e+00, 4.399999841054533e+00, 3.600000158945088e+00, 2.80000007947305e+00, 2e+00, 1.199999920526951e+00, 3.999997516480644e-01, -3.999997516480644e-01, -1.200000556306355e+00, -2e+00, -2.799999443694024e+00, -3.6000001589461e+00, -4.399999841053521e+00, -5.200000317888913e+00, -6e+00, -6.799999682111087e+00, -7.600000158946476e+00, -8.399999364217123e+00, -9.200000317887394e+00, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01]
-res.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 2.18602729778299e-01, -2.18602729778299e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -4.841041264350961e+00, -4.414716424466807e+00, -3.789228727018132e+00, -3.045870767842131e+00, -2.285162925720215e+00, -1.603688641677151e+00, -1.062077178274478e+00, -6.728726314579386e-01, -4.150439243127925e-01, -2.785082757472992e-01, -2.021187802441293e-01, -1.49632363466431e-01, -1.108753342801329e-01, -8.192585369378265e-02, -6.06561042368412e-02, -4.535230349972855e-02, -3.446730682526448e-02, -2.672309744079058e-02, -2.116502345100947e-02, -1.712225563824177e-02, -1.407656167676241e-02, -1.007502143774344e-02, -6.109462570051787e-03, -3.325743938012489e-03, -1.700220163911581e-03, -8.446953712585376e-04, -4.182640613773681e-04, -2.102129428007991e-04, -1.085982237859112e-04, -5.815132681163959e-05, -3.243890762259059e-05, -1.889998070913236e-05, -1.150965980489981e-05, -7.32178233076661e-06, -4.858075953961816e-06, -3.354918455997746e-06, -2.405355058286169e-06, -1.78556429013485e-06, -1.368542481522883e-06, -1.079991761798738e-06, -8.75172787128445e-07, -7.263757842030661e-07, -6.159977445349182e-07, -5.325627706662759e-07, -4.684296754930983e-07, -4.183880869062104e-07, -3.788216137371864e-07, -3.471663705345901e-07, -3.215757290169408e-07, -3.006985025422182e-07, -2.83526862608696e-07, -2.693043538291157e-07, -2.57449685363947e-07, -2.475160507682962e-07, -2.391520581568329e-07, -2.320809053230364e-07, -2.260815321978848e-07, -2.209751895799271e-07, -2.166178025444568e-07, -2.128902139020283e-07, -2.096954216145627e-07, -2.069522115391123e-07, -2.045934168002076e-07, -2.025632048499059e-07, -2.008142274689817e-07, -1.9930487487368e-07, -1.980045014647264e-07, -1.968814573831245e-07, -1.95909353288506e-07, -1.9507105264438e-07, -1.943448478501668e-07, -1.937149399545966e-07, -1.931702791365096e-07, -1.926974289285531e-07, -1.922872314708002e-07]
+res.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 2.18602729778299e-01, -2.18602729778299e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -4.70609016238833e+00, -4.404926209125762e+00, -4.09897192937661e+00, -3.790974182802535e+00, -3.483873605728149e+00, -3.180705023362129e+00, -2.884477749183866e+00, -2.598053576957438e+00, -2.324034760441128e+00, -2.064658164978027e+00, -1.821724207244579e+00, -1.596549430322469e+00, -1.389950742387321e+00, -1.202263123923356e+00, -1.033374667167664e+00, -8.827882725017914e-01, -7.496903953116072e-01, -6.330258077547412e-01, -5.315719848290014e-01, -4.442529380321503e-01, -3.735267621895034e-01, -3.20247591687037e-01, -2.785084077159524e-01, -2.441454183193684e-01, -2.148154079914093e-01, -1.891511833993655e-01, -1.663134226891949e-01, -1.457710616418821e-01, -1.271878338976485e-01, -1.103562787175179e-01, -9.515509854158292e-02, -8.15142186257141e-02, -6.93846127461538e-02, -5.871430373249057e-02, -4.943190515041351e-02, -4.14417201306741e-02, -3.462714394912432e-02, -2.885917658241787e-02, -2.400622548240244e-02, -1.99415348470211e-02, -1.654846380179396e-02, -1.351358999426865e-02, -8.887067700163872e-03, -4.41881047538792e-03, -1.660922425799072e-03, -4.721877874199789e-04, -1.015615173270306e-04, -1.652812913883487e-05, -2.035258175741521e-06, -1.957925803708349e-07, -1.896296311088008e-07, -1.89629645320288e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_ClosedLoop_y.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_ClosedLoop_y.txt
index 8bef6af74a..f677491996 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_ClosedLoop_y.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_ClosedLoop_y.txt
@@ -1,17 +1,17 @@
-last-generated=2024-06-05
+last-generated=2024-08-26
statistics-initialization=
{
- "nonlinear": "0, 1, 0",
+ "nonlinear": "1, 0",
"numerical Jacobians": "0"
}
statistics-simulation=
{
"linear": " ",
"nonlinear": "0, 1",
- "number of continuous time states": "6",
+ "number of continuous time states": "5",
"numerical Jacobians": "0"
}
time=[0e+00, 3.6e+03]
conPID.u_s=[7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01]
-conPID.u_m=[0e+00, 5.224461555480957e-01, 6.58552348613739e-01, 7.132970690727234e-01, 7.352567911148071e-01, 7.441821098327637e-01, 7.477735280990601e-01, 7.490531206130981e-01, 7.496210336685181e-01, 7.498462796211243e-01, 7.499350309371948e-01, 7.499726414680481e-01, 7.499886155128479e-01, 4.751942157745361e-01, 3.413117229938506e-01, 2.861240208148956e-01, 2.642611563205719e-01, 2.554755806922913e-01, 2.52094954252243e-01, 2.50797837972641e-01, 2.502994537353516e-01, 2.501098811626434e-01, 2.500710189342499e-01, 2.499862015247345e-01, 2.499829232692719e-01, 2.5007164478302e-01, 6.077881455421448e-01, 6.925642490386964e-01, 7.269526720046998e-01, 7.407311201095581e-01, 7.463434338569641e-01, 7.483694553375244e-01, 7.495084404945374e-01, 7.497617602348328e-01, 7.499039769172668e-01, 7.499611377716064e-01, 7.499840259552002e-01, 7.499933838844299e-01, 4.751960933208466e-01, 3.413124978542328e-01, 2.861243188381195e-01, 2.642637193202972e-01, 2.554847896099091e-01, 2.520952522754669e-01, 2.507985830307007e-01, 2.503036260604858e-01, 2.501157820224762e-01, 2.500442266464233e-01, 2.500172555446625e-01, 2.500069439411163e-01, 2.500025629997253e-01, 6.072956323623657e-01, 6.925587058067322e-01, 7.269401550292969e-01, 7.407395839691162e-01, 7.460852265357971e-01, 7.485127449035645e-01, 7.494041323661804e-01, 7.497589588165283e-01, 7.499040365219116e-01, 7.499610781669617e-01, 7.499846816062927e-01, 7.499934434890747e-01, 4.751962721347809e-01, 3.413125574588776e-01, 2.861245274543762e-01, 2.642569541931152e-01, 2.554798126220703e-01, 2.520926594734192e-01, 2.507974207401276e-01, 2.5030317902565e-01, 2.501168549060822e-01, 2.500477433204651e-01, 2.500150203704834e-01, 2.499830424785614e-01, 2.500042319297791e-01, 6.072967052459717e-01, 6.925588250160217e-01, 7.269401550292969e-01, 7.407400012016296e-01, 7.4608314037323e-01, 7.485110759735107e-01, 7.494041919708252e-01, 7.497588992118835e-01, 7.499040365219116e-01, 7.499610781669617e-01, 7.499846816062927e-01, 7.499934434890747e-01, 4.751962721347809e-01, 3.413125574588776e-01, 2.861245572566986e-01, 2.642560601234436e-01, 2.554692029953003e-01, 2.520784139633179e-01, 2.507986426353455e-01, 2.503048777580261e-01, 2.501155436038971e-01, 2.500432431697845e-01, 2.500163614749908e-01, 2.500057816505432e-01, 2.500005960464478e-01]
-conPID.y=[3.75e-01, 5.646343231201172e-01, 6.758749485015869e-01, 7.204659581184387e-01, 7.383713126182556e-01, 7.455018758773804e-01, 7.483592629432678e-01, 7.495948672294617e-01, 7.500596046447754e-01, 7.50243067741394e-01, 7.503153085708618e-01, 7.503460049629211e-01, 7.50359058380127e-01, 4.350666701793671e-01, 3.239242136478423e-01, 2.799611389636993e-01, 2.624926269054413e-01, 2.558540999889374e-01, 2.533157467842102e-01, 2.523505985736847e-01, 2.519841194152832e-01, 2.518446743488312e-01, 2.517758905887604e-01, 2.517839372158051e-01, 2.517736852169037e-01, 2.517236173152924e-01, 6.33356511592865e-01, 7.035771012306214e-01, 7.315863370895386e-01, 7.428390979766846e-01, 7.473146319389343e-01, 7.492234110832214e-01, 7.498319149017334e-01, 7.501740455627441e-01, 7.502902150154114e-01, 7.503366470336914e-01, 7.503553032875061e-01, 7.503629326820374e-01, 4.350682497024536e-01, 3.239248394966125e-01, 2.799614071846008e-01, 2.624927759170532e-01, 2.558517754077911e-01, 2.533163130283356e-01, 2.523503601551056e-01, 2.519822120666504e-01, 2.518426179885864e-01, 2.517892420291901e-01, 2.517691552639008e-01, 2.517615556716919e-01, 2.517585158348083e-01, 6.336069107055664e-01, 7.035755515098572e-01, 7.315836548805237e-01, 7.428315281867981e-01, 7.474407553672791e-01, 7.491526007652283e-01, 7.498800754547119e-01, 7.501731514930725e-01, 7.502896189689636e-01, 7.503368854522705e-01, 7.5035560131073e-01, 7.503634095191956e-01, 4.350684881210327e-01, 3.239249587059021e-01, 2.799613773822784e-01, 2.624876499176025e-01, 2.558490037918091e-01, 2.533146142959595e-01, 2.523495256900787e-01, 2.519822418689728e-01, 2.518410086631775e-01, 2.517874240875244e-01, 2.517698407173157e-01, 2.517729103565216e-01, 2.517587542533875e-01, 6.336067318916321e-01, 7.035756707191467e-01, 7.315837144851685e-01, 7.428313493728638e-01, 7.47441828250885e-01, 7.491534352302551e-01, 7.498800754547119e-01, 7.501731514930725e-01, 7.502896189689636e-01, 7.503368854522705e-01, 7.5035560131073e-01, 7.503634095191956e-01, 4.350684881210327e-01, 3.239249587059021e-01, 2.799613773822784e-01, 2.624880373477936e-01, 2.558552920818329e-01, 2.533215582370758e-01, 2.523504197597504e-01, 2.519831359386444e-01, 2.518423795700073e-01, 2.517887055873871e-01, 2.517687082290649e-01, 2.51760870218277e-01, 2.517570555210114e-01]
+conPID.u_m=[0e+00, 5.438299775123596e-01, 6.573857665061951e-01, 7.084161639213562e-01, 7.314903736114502e-01, 7.417096495628357e-01, 7.462905049324036e-01, 7.483401298522949e-01, 7.492573261260986e-01, 7.496677041053772e-01, 7.498518228530884e-01, 7.499334812164307e-01, 7.499703764915466e-01, 4.652140438556671e-01, 3.463896811008452e-01, 2.930191159248352e-01, 2.690401971340179e-01, 2.582347691059113e-01, 2.53561407327652e-01, 2.515311241149902e-01, 2.506555020809174e-01, 2.502800226211548e-01, 2.501197159290314e-01, 2.500512003898621e-01, 2.500218451023102e-01, 2.500091195106506e-01, 6.065045595169067e-01, 6.85715675354004e-01, 7.217010855674745e-01, 7.371494770050049e-01, 7.442302107810974e-01, 7.474167346954346e-01, 7.488451600074768e-01, 7.494834661483765e-01, 7.49769926071167e-01, 7.498971819877625e-01, 7.4995356798172e-01, 7.499793171882629e-01, 4.652180671691895e-01, 3.463805913925171e-01, 2.940079867839813e-01, 2.690222263336182e-01, 2.582431137561798e-01, 2.53576397895813e-01, 2.515588998794556e-01, 2.506585717201233e-01, 2.502817213535309e-01, 2.501205503940582e-01, 2.500521242618561e-01, 2.500226199626923e-01, 2.500098645687103e-01, 6.065430045127869e-01, 6.857402920722961e-01, 7.212550640106201e-01, 7.372729182243347e-01, 7.448393702507019e-01, 7.467672228813171e-01, 7.488458156585693e-01, 7.494825720787048e-01, 7.497644424438477e-01, 7.498927712440491e-01, 7.499513030052185e-01, 7.499778866767883e-01, 4.652172327041626e-01, 3.463802337646484e-01, 2.940094470977783e-01, 2.690222859382629e-01, 2.582438886165619e-01, 2.535763084888458e-01, 2.515601217746735e-01, 2.506586015224457e-01, 2.502817213535309e-01, 2.50120609998703e-01, 2.500521540641785e-01, 2.500226199626923e-01, 2.500098645687103e-01, 6.066364645957947e-01, 6.857480406761169e-01, 7.212258577346802e-01, 7.371153235435486e-01, 7.442318797111511e-01, 7.474233508110046e-01, 7.488382458686829e-01, 7.494744062423706e-01, 7.497606873512268e-01, 7.499001622200012e-01, 7.499301433563232e-01, 7.500026822090149e-01, 4.652171730995178e-01, 3.463321328163147e-01, 2.931202054023743e-01, 2.690333425998688e-01, 2.5826495885849e-01, 2.535656094551086e-01, 2.515194118022919e-01, 2.506466209888458e-01, 2.502793967723846e-01, 2.501213848590851e-01, 2.500523328781128e-01, 2.500226497650146e-01, 2.500098049640656e-01]
+conPID.y=[3.75e-01, 5.455456376075745e-01, 6.588048338890076e-01, 7.094231843948364e-01, 7.319757342338562e-01, 7.421299815177917e-01, 7.466824650764465e-01, 7.487190365791321e-01, 7.496304512023926e-01, 7.500381469726562e-01, 7.502210140228271e-01, 7.503027319908142e-01, 7.503385543823242e-01, 4.637234807014465e-01, 3.456630706787108e-01, 2.929189503192902e-01, 2.695042192935944e-01, 2.59403795003891e-01, 2.55033016204834e-01, 2.531629502773285e-01, 2.523582577705383e-01, 2.520135641098022e-01, 2.51866489648819e-01, 2.518035173416138e-01, 2.517765760421753e-01, 2.517648935317993e-01, 6.077945232391357e-01, 6.865410804748536e-01, 7.215428352355958e-01, 7.375522255897522e-01, 7.446346879005432e-01, 7.478012442588806e-01, 7.492207884788513e-01, 7.498550415039062e-01, 7.501397132873535e-01, 7.502661347389221e-01, 7.50322163105011e-01, 7.503477931022644e-01, 4.637276828289032e-01, 3.456704318523407e-01, 2.924253344535828e-01, 2.695144712924957e-01, 2.59401261806488e-01, 2.550278306007385e-01, 2.531499266624451e-01, 2.523593604564667e-01, 2.52015084028244e-01, 2.518671751022339e-01, 2.51804381608963e-01, 2.517772912979126e-01, 2.517655789852142e-01, 6.077757477760315e-01, 6.865296959877014e-01, 7.217661738395691e-01, 7.374874949455262e-01, 7.443312406539917e-01, 7.481269836425781e-01, 7.492213845252991e-01, 7.498540878295898e-01, 7.501342296600342e-01, 7.502617239952087e-01, 7.503198981285095e-01, 7.50346302986145e-01, 4.637268483638763e-01, 3.456700444221497e-01, 2.92424350976944e-01, 2.695143520832062e-01, 2.594008445739746e-01, 2.550278306007385e-01, 2.531493008136749e-01, 2.523593306541443e-01, 2.52015084028244e-01, 2.518672347068787e-01, 2.51804381608963e-01, 2.517772912979126e-01, 2.517655789852142e-01, 6.077291369438171e-01, 6.865248084068298e-01, 7.217749953269958e-01, 7.375646829605103e-01, 7.446343898773193e-01, 7.477967739105225e-01, 7.492163181304932e-01, 7.498535513877869e-01, 7.501377463340759e-01, 7.502564191818237e-01, 7.503315210342407e-01, 7.503344416618347e-01, 4.637269973754883e-01, 3.456986546516418e-01, 2.928726673126221e-01, 2.695099413394928e-01, 2.593912780284882e-01, 2.550356686115265e-01, 2.531710863113403e-01, 2.523663938045502e-01, 2.520173192024231e-01, 2.518679201602936e-01, 2.518045604228973e-01, 2.51777321100235e-01, 2.517655491828918e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsParallel.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsParallel.txt
index 4ed394cd3a..f5c0a5e6fe 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsParallel.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsParallel.txt
@@ -1,19 +1,19 @@
-last-generated=2021-06-17
+last-generated=2024-08-26
statistics-initialization=
{
- "nonlinear": "2",
+ "nonlinear": "2, 0, 0",
"numerical Jacobians": "0"
}
statistics-simulation=
{
"linear": " ",
"nonlinear": "2",
- "number of continuous time states": "6",
+ "number of continuous time states": "4",
"numerical Jacobians": "0"
}
time=[0e+00, 3e+02]
floMac1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floMac1.dp=[0e+00, -1.1634990234375e+03, -2.479821044921875e+03, -3.250246826171875e+03, -3.639493896484375e+03, -3.8258408203125e+03, -3.913047607421875e+03, -3.953544677734375e+03, -3.97224365234375e+03, -3.98091162109375e+03, -3.984892578125e+03, -3.98668798828125e+03, -3.98750927734375e+03, -3.98789306640625e+03, -3.98808203125e+03, -3.988166259765625e+03, -3.988186767578125e+03, -3.988185302734375e+03, -3.988188232421875e+03, -3.988196044921875e+03, -3.988198974609375e+03, -3.98819677734375e+03, -3.98818408203125e+03, -3.9881767578125e+03, -3.988173095703125e+03, -3.988184326171875e+03, -3.988195068359375e+03, -3.9882021484375e+03, -3.988205810546875e+03, -3.98820654296875e+03, -3.988204833984375e+03, -3.988203125e+03, -3.98820068359375e+03, -3.988198974609375e+03, -3.988197998046875e+03, -3.988197509765625e+03, -3.98819775390625e+03, -3.9881982421875e+03, -3.98819921875e+03, -3.98819921875e+03, -3.9882001953125e+03, -3.98820263671875e+03, -3.98820556640625e+03, -3.98820751953125e+03, -3.988208251953125e+03, -3.9882060546875e+03, -3.988205810546875e+03, -3.98820751953125e+03, -3.988208984375e+03, -3.988209228515625e+03, -3.988208251953125e+03, -2.81905810546875e+03, -1.458623046875e+03, -7.54064453125e+02, -4.1129638671875e+02, -2.041957244873047e+02, -9.961580657958922e+01, -4.310785675048871e+01, -1.419166088104248e+01, -4.206310272216797e+00, -1.386677622795105e+00, -6.490764617919922e-01, -4.623441398143768e-01, -4.158974587917328e-01, -4.045192897319794e-01, -4.017325043678284e-01, -4.010524153709412e-01, -4.008915722370148e-01, -4.008540511131287e-01, -4.00843620300293e-01, -4.00839775800705e-01, -4.008384943008423e-01, -4.008382558822632e-01, -4.008381962776184e-01, -4.008381962776184e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01]
-floMac2.dp=[0e+00, -1.1634990234375e+03, -2.479821044921875e+03, -3.250246826171875e+03, -3.639493896484375e+03, -3.8258408203125e+03, -3.913047607421875e+03, -3.953544677734375e+03, -3.97224365234375e+03, -3.98091162109375e+03, -3.984892578125e+03, -3.98668798828125e+03, -3.98750927734375e+03, -3.98789306640625e+03, -3.98808203125e+03, -3.988166259765625e+03, -3.988186767578125e+03, -3.988185302734375e+03, -3.988188232421875e+03, -3.988196044921875e+03, -3.988198974609375e+03, -3.98819677734375e+03, -3.98818408203125e+03, -3.9881767578125e+03, -3.988173095703125e+03, -3.988184326171875e+03, -3.988195068359375e+03, -3.9882021484375e+03, -3.988205810546875e+03, -3.98820654296875e+03, -3.988204833984375e+03, -3.988203125e+03, -3.98820068359375e+03, -3.988198974609375e+03, -3.988197998046875e+03, -3.988197509765625e+03, -3.98819775390625e+03, -3.9881982421875e+03, -3.98819921875e+03, -3.98819921875e+03, -3.9882001953125e+03, -3.98820263671875e+03, -3.98820556640625e+03, -3.98820751953125e+03, -3.988208251953125e+03, -3.9882060546875e+03, -3.988205810546875e+03, -3.98820751953125e+03, -3.988208984375e+03, -3.988209228515625e+03, -3.988208251953125e+03, -3.81204345703125e+03, -3.56787109375e+03, -3.381185546875e+03, -3.26497998046875e+03, -3.2207744140625e+03, -3.20295361328125e+03, -3.194193115234375e+03, -3.18991748046875e+03, -3.1884716796875e+03, -3.18806640625e+03, -3.18796044921875e+03, -3.18793359375e+03, -3.187927001953125e+03, -3.18792529296875e+03, -3.187925048828125e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03]
-floMac1.m_flow=[-0e+00, 2.696640193462372e-01, 3.936861753463745e-01, 4.507110118865967e-01, 4.769364297389984e-01, 4.88993912935257e-01, 4.945356249809265e-01, 4.970880746841431e-01, 4.982622265815735e-01, 4.988055527210236e-01, 4.990549087524414e-01, 4.991672933101654e-01, 4.992187321186066e-01, 4.99242752790451e-01, 4.992545545101166e-01, 4.992598295211792e-01, 4.992611408233643e-01, 4.992610216140747e-01, 4.992612302303314e-01, 4.992617070674896e-01, 4.99261885881424e-01, 4.99261736869812e-01, 4.992609620094299e-01, 4.992605149745941e-01, 4.99260276556015e-01, 4.992609620094299e-01, 4.992616474628448e-01, 4.992620944976807e-01, 4.992623031139374e-01, 4.992623627185822e-01, 4.992622435092926e-01, 4.992621541023254e-01, 4.992620050907135e-01, 4.99261885881424e-01, 4.992618262767792e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992618560791016e-01, 4.99261885881424e-01, 4.992619156837463e-01, 4.992619454860687e-01, 4.992621243000031e-01, 4.992623031139374e-01, 4.992624223232269e-01, 4.992624819278717e-01, 4.992623329162598e-01, 4.992623031139374e-01, 4.992624223232269e-01, 4.992625117301941e-01, 4.992625415325165e-01, 4.992624819278717e-01, 3.840707838535309e-01, 2.014315128326416e-01, 3.26470285654068e-02, -9.575036913156509e-02, -1.52726411819458e-01, -1.775592863559724e-01, -1.902441978454589e-01, -1.965608894824982e-01, -1.987163573503494e-01, -1.993226855993271e-01, -1.994811296463013e-01, -1.995212286710739e-01, -1.995311975479126e-01, -1.995336413383484e-01, -1.995342373847961e-01, -1.995343863964081e-01, -1.995344161987305e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01]
-floMac2.m_flow=[0e+00, 2.696640193462372e-01, 3.936861753463745e-01, 4.507110118865967e-01, 4.769364297389984e-01, 4.88993912935257e-01, 4.945356249809265e-01, 4.970880746841431e-01, 4.982622265815735e-01, 4.988055527210236e-01, 4.990549087524414e-01, 4.991672933101654e-01, 4.992187321186066e-01, 4.99242752790451e-01, 4.992545545101166e-01, 4.992598295211792e-01, 4.992611408233643e-01, 4.992610216140747e-01, 4.992612302303314e-01, 4.992617070674896e-01, 4.99261885881424e-01, 4.99261736869812e-01, 4.992609620094299e-01, 4.992605149745941e-01, 4.99260276556015e-01, 4.992609620094299e-01, 4.992616474628448e-01, 4.992620944976807e-01, 4.992623031139374e-01, 4.992623627185822e-01, 4.992622435092926e-01, 4.992621541023254e-01, 4.992620050907135e-01, 4.99261885881424e-01, 4.992618262767792e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992618560791016e-01, 4.99261885881424e-01, 4.992619156837463e-01, 4.992619454860687e-01, 4.992621243000031e-01, 4.992623031139374e-01, 4.992624223232269e-01, 4.992624819278717e-01, 4.992623329162598e-01, 4.992623031139374e-01, 4.992624223232269e-01, 4.992625117301941e-01, 4.992625415325165e-01, 4.992624819278717e-01, 5.211847424507141e-01, 5.515710711479187e-01, 5.748035907745361e-01, 5.892650485038757e-01, 5.947663187980652e-01, 5.969840288162231e-01, 5.980742573738098e-01, 5.986063480377197e-01, 5.987862944602966e-01, 5.988367199897766e-01, 5.98849892616272e-01, 5.988532304763794e-01, 5.988540649414062e-01, 5.988542437553406e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01]
+floMac1.dp=[0e+00, -4.522065734863281e+01, -1.608616180419922e+02, -3.587976684570312e+02, -6.379514770507812e+02, -9.96882568359375e+02, -1.435590942382812e+03, -1.954076660156251e+03, -2.552339599609375e+03, -3.2303798828125e+03, -3.955653076171875e+03, -3.988203857421875e+03, -3.98819775390625e+03, -3.988197265625e+03, -3.988197021484375e+03, -3.988197021484375e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.32249755859375e+03, -2.720909912109375e+03, -2.183637451171875e+03, -1.710973999023438e+03, -1.303464477539062e+03, -9.634875488281222e+02, -6.954458618164085e+02, -4.526117248535156e+02, -2.031973876953125e+02, -1.597689032554626e+00, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01]
+floMac2.dp=[0e+00, -4.522065734863281e+01, -1.608616180419922e+02, -3.587976684570312e+02, -6.379514770507812e+02, -9.96882568359375e+02, -1.435590942382812e+03, -1.954076660156251e+03, -2.552339599609375e+03, -3.2303798828125e+03, -3.955653076171875e+03, -3.988203857421875e+03, -3.98819775390625e+03, -3.988197265625e+03, -3.988197021484375e+03, -3.988197021484375e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.890245361328125e+03, -3.796267578125e+03, -3.705979248046875e+03, -3.61890478515625e+03, -3.53415380859375e+03, -3.449433105468749e+03, -3.359217285156251e+03, -3.275970703125e+03, -3.220593017578125e+03, -3.1880966796875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03]
+floMac1.m_flow=[-0e+00, 4.318511486053467e-02, 9.892354160547256e-02, 1.497493088245392e-01, 1.996796578168869e-01, 2.496100217103958e-01, 2.995403707027435e-01, 3.494707345962525e-01, 3.994010984897614e-01, 4.493314325809479e-01, 4.972205758094788e-01, 4.992622137069702e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617666721344e-01, 4.992617666721344e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.365941286087036e-01, 3.731798827648163e-01, 3.086630403995514e-01, 2.424316555261612e-01, 1.73321932554245e-01, 9.843663871288222e-02, 1.017980463802904e-02, -8.24340432882309e-02, -1.529728025197983e-01, -1.992773413658142e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01]
+floMac2.m_flow=[0e+00, 4.318511486053467e-02, 9.892354160547256e-02, 1.497493088245392e-01, 1.996796578168869e-01, 2.496100217103958e-01, 2.995403707027435e-01, 3.494707345962525e-01, 3.994010984897614e-01, 4.493314325809479e-01, 4.972205758094788e-01, 4.992622137069702e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617666721344e-01, 4.992617666721344e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 5.11451780796051e-01, 5.231471657752991e-01, 5.343833565711975e-01, 5.452196598052979e-01, 5.55766761302948e-01, 5.663100481033326e-01, 5.775372982025145e-01, 5.878971815109253e-01, 5.947888493537903e-01, 5.988329648971558e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsSeries.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsSeries.txt
index 160706733f..976aaeed4e 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsSeries.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsSeries.txt
@@ -1,4 +1,4 @@
-last-generated=2021-06-17
+last-generated=2024-08-26
statistics-initialization=
{
"nonlinear": "1",
@@ -8,12 +8,12 @@ statistics-simulation=
{
"linear": " ",
"nonlinear": "1",
- "number of continuous time states": "4",
+ "number of continuous time states": "2",
"numerical Jacobians": "0"
}
time=[0e+00, 3e+02]
floMac1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floMac1.dp=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -1.140467895507812e+03, -1.119023895263672e+02, 3.452047729492188e+02, 3.932883911132812e+02, 2.924685363769531e+02, 1.823004913330069e+02, 8.801720428466879e+01, 2.982197189331055e+01, 8.999917984008789e+00, 3.074394702911377e+00, 1.522541642189026e+00, 1.129523158073425e+00, 1.031545400619507e+00, 1.007470607757568e+00, 1.001608490943909e+00, 1.000197649002075e+00, 9.998603463172913e-01, 9.9977707862854e-01, 9.997564554214478e-01, 9.997519254684448e-01, 9.997510313987732e-01, 9.997530579566956e-01, 9.997526407241821e-01, 9.997508525848389e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997504949569702e-01, 9.997509121894836e-01, 9.997506141662598e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01]
-floMac2.dp=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2.8595322265625e+03, -3.88809765625e+03, -4.34520458984375e+03, -4.39328857421875e+03, -4.29246875e+03, -4.182300292968749e+03, -4.088017089843751e+03, -4.029822021484375e+03, -4.009e+03, -4.003074462890625e+03, -4.0015224609375e+03, -4.001129638671875e+03, -4.001031494140625e+03, -4.001007568359375e+03, -4.001001708984375e+03, -4.001000244140625e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03]
-floMac1.m_flow=[-9.955859985351562e+02, 7.698646187782288e-02, 4.694104492664337e-01, 6.230761408805847e-01, 6.905182600021362e-01, 7.209883332252502e-01, 7.348966598510742e-01, 7.412737011909485e-01, 7.441999316215515e-01, 7.455441355705261e-01, 7.461614012718201e-01, 7.464463710784912e-01, 7.465773820877075e-01, 7.466378808021545e-01, 7.466645836830139e-01, 7.466752529144287e-01, 7.466810345649719e-01, 7.46685802936554e-01, 7.466890811920166e-01, 7.466908097267151e-01, 7.466919422149658e-01, 7.466914057731628e-01, 7.46690571308136e-01, 7.466898560523987e-01, 7.466892600059509e-01, 7.466888427734375e-01, 7.466889023780823e-01, 7.466889023780823e-01, 7.466890811920166e-01, 7.466892600059509e-01, 7.466894388198853e-01, 7.466896176338196e-01, 7.466897964477539e-01, 7.466898560523987e-01, 7.466897964477539e-01, 7.466897964477539e-01, 7.466897964477539e-01, 7.466897368431091e-01, 7.466896772384644e-01, 7.466896176338196e-01, 7.466895580291748e-01, 7.466895580291748e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466893792152405e-01, 6.397221684455872e-01, 5.117190480232239e-01, 4.548328518867493e-01, 4.488489329814911e-01, 4.61395800113678e-01, 4.751060307025911e-01, 4.868394136428832e-01, 4.940817058086395e-01, 4.966729879379272e-01, 4.97410386800766e-01, 4.976035356521606e-01, 4.976524412631989e-01, 4.976646304130554e-01, 4.976676106452942e-01, 4.976683557033539e-01, 4.976685345172882e-01, 4.976685643196106e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01]
-floMac2.m_flow=[-9.955859985351562e+02, 7.698646187782288e-02, 4.694104492664337e-01, 6.230761408805847e-01, 6.905182600021362e-01, 7.209883332252502e-01, 7.348966598510742e-01, 7.412737011909485e-01, 7.441999316215515e-01, 7.455441355705261e-01, 7.461614012718201e-01, 7.464463710784912e-01, 7.465773820877075e-01, 7.466378808021545e-01, 7.466645836830139e-01, 7.466752529144287e-01, 7.466810345649719e-01, 7.46685802936554e-01, 7.466890811920166e-01, 7.466908097267151e-01, 7.466919422149658e-01, 7.466914057731628e-01, 7.46690571308136e-01, 7.466898560523987e-01, 7.466892600059509e-01, 7.466888427734375e-01, 7.466889023780823e-01, 7.466889023780823e-01, 7.466890811920166e-01, 7.466892600059509e-01, 7.466894388198853e-01, 7.466896176338196e-01, 7.466897964477539e-01, 7.466898560523987e-01, 7.466897964477539e-01, 7.466897964477539e-01, 7.466897964477539e-01, 7.466897368431091e-01, 7.466896772384644e-01, 7.466896176338196e-01, 7.466895580291748e-01, 7.466895580291748e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466893792152405e-01, 6.397221684455872e-01, 5.117190480232239e-01, 4.548328518867493e-01, 4.488489329814911e-01, 4.61395800113678e-01, 4.751060307025911e-01, 4.868394136428832e-01, 4.940817058086395e-01, 4.966729879379272e-01, 4.97410386800766e-01, 4.976035356521606e-01, 4.976524412631989e-01, 4.976646304130554e-01, 4.976676106452942e-01, 4.976683557033539e-01, 4.976685345172882e-01, 4.976685643196106e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01]
+floMac1.dp=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -1.515716918945312e+03, -1.06652587890625e+03, -6.586179809570312e+02, -2.997312622070312e+02, 3.332992494106293e-01, 2.289754638671892e+02, 3.697194519042959e+02, 4.005999145507812e+02, 2.916676330566406e+02, 3.507922887802124e+00, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01]
+floMac2.dp=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2.484283203125e+03, -2.93347412109375e+03, -3.341382080078125e+03, -3.700268798828125e+03, -4.000333251953125e+03, -4.228975585937502e+03, -4.369719238281249e+03, -4.40060009765625e+03, -4.29166748046875e+03, -4.0035078125e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03]
+floMac1.m_flow=[-9.955859985351562e+02, -2.384042263031006e+00, -1.044320940971375e+00, -5.30669629573822e-01, -2.239228785037994e-01, 4.669875597329565e-15, 1.824936866760254e-01, 3.413071930408479e-01, 4.853178560733795e-01, 6.194584965705872e-01, 7.416096925735474e-01, 7.466879487037659e-01, 7.466885447502136e-01, 7.466896176338196e-01, 7.466880083084106e-01, 7.466896176338196e-01, 7.466893792152405e-01, 7.466893196105957e-01, 7.466894388198853e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.466895580291748e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 6.864213347434998e-01, 6.305202841758728e-01, 5.797568559646606e-01, 5.350940227508545e-01, 4.977515339851379e-01, 4.69297409057617e-01, 4.517820477485658e-01, 4.479390382766724e-01, 4.614954888820648e-01, 4.973564445972443e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01]
+floMac2.m_flow=[-9.955859985351562e+02, -2.384042263031006e+00, -1.044320940971375e+00, -5.30669629573822e-01, -2.239228785037994e-01, 4.669875597329565e-15, 1.824936866760254e-01, 3.413071930408479e-01, 4.853178560733795e-01, 6.194584965705872e-01, 7.416096925735474e-01, 7.466879487037659e-01, 7.466885447502136e-01, 7.466896176338196e-01, 7.466880083084106e-01, 7.466896176338196e-01, 7.466893792152405e-01, 7.466893196105957e-01, 7.466894388198853e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.466895580291748e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 6.864213347434998e-01, 6.305202841758728e-01, 5.797568559646606e-01, 5.350940227508545e-01, 4.977515339851379e-01, 4.69297409057617e-01, 4.517820477485658e-01, 4.479390382766724e-01, 4.614954888820648e-01, 4.973564445972443e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_StaticReset.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_StaticReset.txt
index 5242279cde..bb60570d01 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_StaticReset.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_StaticReset.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-01
+last-generated=2024-08-26
statistics-initialization=
{
"nonlinear": "1, 0, 1, 0, 1, 0",
@@ -8,13 +8,13 @@ statistics-simulation=
{
"linear": " ",
"nonlinear": "1, 1, 1",
- "number of continuous time states": "21",
+ "number of continuous time states": "15",
"numerical Jacobians": "0"
}
time=[0e+00, 3.6e+03]
-fan1.P=[0e+00, 6.37822151184082e-02, 2.43301048874855e-01, 7.878413200378418e-01, 2.350958824157715e+00, 6.652777194976807e+00, 1.837021255493164e+01, 5.114969635009771e+01, 1.437913055419922e+02, 3.450308532714844e+02, 6.635015258789062e+02, 1.189980712890625e+03, 1.990408447265625e+03, 3.104797607421875e+03, 4.522754882812503e+03, 4.95498828125e+03, 4.9754697265625e+03, 4.9931611328125e+03, 5.0059072265625e+03, 5.01852783203125e+03, 5.0323427734375e+03, 5.04749462890625e+03, 5.06411181640625e+03, 5.0823291015625e+03, 5.1022900390625e+03, 5.12414794921875e+03, 5.14806494140625e+03, 5.17421142578125e+03, 5.20276513671875e+03, 5.23390966796875e+03, 5.26783203125e+03, 5.30472021484375e+03, 5.3447587890625e+03, 5.388126953125e+03, 5.43499169921875e+03, 5.4855078125e+03, 5.53981005859375e+03, 5.59801220703125e+03, 5.660205078125e+03, 5.72645751953125e+03, 5.79681494140625e+03, 5.87130615234375e+03, 5.9499462890625e+03, 6.03274365234375e+03, 6.11970654296875e+03, 6.2108505859375e+03, 6.30620556640625e+03, 6.40582080078125e+03, 6.50977294921875e+03, 6.6181669921875e+03, 6.7311435546875e+03, 6.84887939453125e+03, 6.97159130859375e+03, 7.0995390625e+03, 7.233026367187501e+03, 7.372406250000001e+03, 7.518080566406251e+03, 7.6705068359375e+03, 7.830203125e+03, 7.9977509765625e+03, 8.1738515625e+03, 8.3594384765625e+03, 8.555205078125e+03, 8.761091796875e+03, 8.9768056640625e+03, 9.202966796875e+03, 9.4400810546875e+03, 9.6884658203125e+03, 9.9484365234375e+03, 1.02202919921875e+04, 1.05043154296875e+04, 1.0800765625e+04, 1.11098876953125e+04, 1.1431935546875e+04, 1.17669736328125e+04, 1.21152421875e+04, 1.24769296875e+04, 1.28521796875e+04, 1.3241064453125e+04, 1.3643609375e+04, 1.4059736328125e+04, 1.44892724609375e+04, 1.4931984375e+04, 1.53875302734375e+04, 1.58554736328125e+04, 1.633527734375e+04, 1.6826318359375e+04, 1.73278828125e+04, 1.783914453125e+04, 1.835921484375e+04, 1.8887119140625e+04, 1.9421818359375e+04, 1.9962216796875e+04, 2.0507171875e+04, 2.1055505859375e+04, 2.16060234375e+04, 2.2157505859375e+04, 2.2708748046875e+04, 2.325856640625e+04, 2.38057890625e+04, 2.434926953125e+04]
-fan2.P=[0e+00, 6.37822151184082e-02, 2.43301048874855e-01, 7.878413200378418e-01, 2.350958824157715e+00, 6.652777194976807e+00, 1.837021255493164e+01, 5.114969635009771e+01, 1.437913055419922e+02, 3.450308532714844e+02, 6.635015258789062e+02, 1.189980712890625e+03, 1.990408447265625e+03, 3.104797607421875e+03, 4.516426269531253e+03, 6.1784755859375e+03, 6.43138720703125e+03, 6.44997265625e+03, 6.4633798828125e+03, 6.47662109375e+03, 6.4911064453125e+03, 6.50699267578125e+03, 6.52441552734375e+03, 6.5435166015625e+03, 6.5644462890625e+03, 6.58736572265625e+03, 6.61244580078125e+03, 6.639865234375e+03, 6.6698115234375e+03, 6.70247802734375e+03, 6.73806201171875e+03, 6.77676171875e+03, 6.8187734375e+03, 6.8642861328125e+03, 6.91347998046875e+03, 6.96651904296875e+03, 7.02354931640625e+03, 7.0846962890625e+03, 7.1500615234375e+03, 7.21972216796875e+03, 7.293736328125e+03, 7.37214208984375e+03, 7.4549658203125e+03, 7.5422265625e+03, 7.6339462890625e+03, 7.73015380859375e+03, 7.83089453125e+03, 7.93623583984375e+03, 8.04627392578125e+03, 8.16113720703125e+03, 8.2809912109375e+03, 8.40604296875e+03, 8.536541015625e+03, 8.6727802734375e+03, 8.815106445312502e+03, 8.964146484375002e+03, 9.121343750000002e+03, 9.2872177734375e+03, 9.4622021484375e+03, 9.6467626953125e+03, 9.8413681640625e+03, 1.00463857421875e+04, 1.02622880859375e+04, 1.0488763671875e+04, 1.07251884765625e+04, 1.09718974609375e+04, 1.122907421875e+04, 1.149666015625e+04, 1.17745576171875e+04, 1.2062615234375e+04, 1.236062890625e+04, 1.26683447265625e+04, 1.29858291015625e+04, 1.33134072265625e+04, 1.365124609375e+04, 1.39998330078125e+04, 1.43596328125e+04, 1.4731091796875e+04, 1.5114607421875e+04, 1.55105478515625e+04, 1.59191865234375e+04, 1.63407041015625e+04, 1.67752265625e+04, 1.72227578125e+04, 1.7683201171875e+04, 1.81563359375e+04, 1.86418359375e+04, 1.9138837890625e+04, 1.9644033203125e+04, 2.0156259765625e+04, 2.067476953125e+04, 2.11987265625e+04, 2.1727244140625e+04, 2.225936328125e+04, 2.279408984375e+04, 2.3330390625e+04, 2.3867201171875e+04, 2.440344921875e+04, 2.493808203125e+04, 2.5470037109375e+04, 2.5998263671875e+04]
-fan3.P=[0e+00, 1.301677897572517e-03, 4.965327680110931e-03, 1.60783939063549e-02, 4.797875136137009e-02, 1.357709616422653e-01, 3.749023079872131e-01, 1.04387128353119e+00, 2.934516429901123e+00, 7.041445732116699e+00, 1.354084777832031e+01, 2.428532028198242e+01, 4.062057876586914e+01, 6.336322021484375e+01, 9.217196655273443e+01, 1.250319595336914e+02, 1.581680603027344e+02, 1.866132202148438e+02, 2.069951171875e+02, 2.273897247314453e+02, 2.497643280029297e+02, 2.743042602539062e+02, 3.012080078125e+02, 3.306885681152344e+02, 3.629734497070312e+02, 3.98304443359375e+02, 4.369366455078125e+02, 4.791370239257814e+02, 5.251821289062501e+02, 5.7535498046875e+02, 6.29941162109375e+02, 6.892235717773438e+02, 7.534766235351562e+02, 8.229594116210938e+02, 8.97908447265625e+02, 9.785307006835938e+02, 1.064996948242188e+03, 1.157436645507812e+03, 1.25593505859375e+03, 1.36053271484375e+03, 1.471227905273438e+03, 1.587982788085938e+03, 1.71073095703125e+03, 1.839388305664062e+03, 1.973863525390625e+03, 2.114070068359375e+03, 2.25993701171875e+03, 2.411417724609375e+03, 2.568499267578125e+03, 2.731207763671875e+03, 2.8996142578125e+03, 3.073838623046875e+03, 3.25405126953125e+03, 3.440478271484375e+03, 3.633402099609376e+03, 3.833165039062501e+03, 4.040174072265626e+03, 4.2549033203125e+03, 4.47790185546875e+03, 4.7097998046875e+03, 4.951330078125e+03, 5.20335986328125e+03, 5.46676708984375e+03, 5.741263671875e+03, 6.0264677734375e+03, 6.32325537109375e+03, 6.63221728515625e+03, 6.95368896484375e+03, 7.28799951171875e+03, 7.6354619140625e+03, 7.99636669921875e+03, 8.3709814453125e+03, 8.759578125e+03, 9.1625419921875e+03, 9.5798994140625e+03, 1.00117607421875e+04, 1.045817578125e+04, 1.09191416015625e+04, 1.13945771484375e+04, 1.188434765625e+04, 1.23882138671875e+04, 1.2905837890625e+04, 1.3436822265625e+04, 1.398065625e+04, 1.453673828125e+04, 1.5104369140625e+04, 1.56827666015625e+04, 1.62710576171875e+04, 1.6868271484375e+04, 1.7473373046875e+04, 1.8085251953125e+04, 1.8702744140625e+04, 1.9324630859375e+04, 1.994966015625e+04, 2.057655859375e+04, 2.1204033203125e+04, 2.1830787109375e+04, 2.2455544921875e+04, 2.3077060546875e+04, 2.3694111328125e+04, 2.430551171875e+04]
-fan1.y_actual=[0e+00, 5.898704528808594e-01, 6.386487483978271e-01, 6.476296782493591e-01, 6.493147611618042e-01, 6.496323943138123e-01, 6.496935486793518e-01, 6.497072577476501e-01, 6.497147083282471e-01, 6.497257351875305e-01, 6.497452259063721e-01, 6.497777700424194e-01, 6.498280763626099e-01, 6.498994827270508e-01, 6.499918699264526e-01, 6.500999927520752e-01, 6.502125859260559e-01, 6.503137350082397e-01, 6.503891348838806e-01, 6.504585146903992e-01, 6.50533139705658e-01, 6.506147384643555e-01, 6.507042050361633e-01, 6.508023738861084e-01, 6.509100198745728e-01, 6.510279178619385e-01, 6.511571407318115e-01, 6.512986421585083e-01, 6.514533758163452e-01, 6.516225934028625e-01, 6.518073081970215e-01, 6.520088911056519e-01, 6.522285342216492e-01, 6.524675488471985e-01, 6.527272462844849e-01, 6.530089974403381e-01, 6.533141732215881e-01, 6.536440253257751e-01, 6.540000438690186e-01, 6.543834805488586e-01, 6.547958254814148e-01, 6.552384495735168e-01, 6.55712902545929e-01, 6.562207937240601e-01, 6.567638516426086e-01, 6.573439836502075e-01, 6.579633355140686e-01, 6.586242914199829e-01, 6.593294739723206e-01, 6.600818634033203e-01, 6.608846783638e-01, 6.617415547370911e-01, 6.626565456390381e-01, 6.636340618133545e-01, 6.646788716316223e-01, 6.657962203025818e-01, 6.669917702674866e-01, 6.682717204093933e-01, 6.696426868438721e-01, 6.711117029190063e-01, 6.726853847503662e-01, 6.743670701980591e-01, 6.761629581451416e-01, 6.780781745910645e-01, 6.801111102104187e-01, 6.822678446769714e-01, 6.845569014549255e-01, 6.86985194683075e-01, 6.895600557327271e-01, 6.922883987426758e-01, 6.951767802238464e-01, 6.982313990592957e-01, 7.014559507369995e-01, 7.048414945602417e-01, 7.083806991577148e-01, 7.120717763900757e-01, 7.15911865234375e-01, 7.198972105979919e-01, 7.240231037139893e-01, 7.282840609550476e-01, 7.326732277870178e-01, 7.371826171875e-01, 7.41803765296936e-01, 7.465271949768066e-01, 7.513425946235657e-01, 7.562389969825745e-01, 7.612049579620361e-01, 7.662285566329956e-01, 7.712973952293396e-01, 7.763990163803101e-01, 7.815207839012146e-01, 7.866501212120056e-01, 7.917746901512146e-01, 7.968824505805969e-01, 8.019615411758423e-01, 8.070008158683777e-01, 8.119895458221436e-01, 8.169176578521729e-01, 8.217758536338806e-01, 8.26555609703064e-01, 8.312487602233887e-01]
-fan2.y_actual=[0e+00, 5.898704528808594e-01, 6.386487483978271e-01, 6.476296782493591e-01, 6.493147611618042e-01, 6.496323943138123e-01, 6.496935486793518e-01, 6.497072577476501e-01, 6.497147083282471e-01, 6.497257351875305e-01, 6.497452259063721e-01, 6.497777700424194e-01, 6.498280763626099e-01, 6.498994827270508e-01, 6.499918699264526e-01, 6.500999927520752e-01, 6.502125859260559e-01, 6.503137350082397e-01, 6.503891348838806e-01, 6.504585146903992e-01, 6.50533139705658e-01, 6.506147384643555e-01, 6.507042050361633e-01, 6.508023738861084e-01, 6.509100198745728e-01, 6.510279178619385e-01, 6.511571407318115e-01, 6.512986421585083e-01, 6.514533758163452e-01, 6.516225934028625e-01, 6.518073081970215e-01, 6.520088911056519e-01, 6.522285342216492e-01, 6.524675488471985e-01, 6.527272462844849e-01, 6.530089974403381e-01, 6.533141732215881e-01, 6.536440253257751e-01, 6.540000438690186e-01, 6.543834805488586e-01, 6.547958254814148e-01, 6.552384495735168e-01, 6.55712902545929e-01, 6.562207937240601e-01, 6.567638516426086e-01, 6.573439836502075e-01, 6.579633355140686e-01, 6.586242914199829e-01, 6.593294739723206e-01, 6.600818634033203e-01, 6.608846783638e-01, 6.617415547370911e-01, 6.626565456390381e-01, 6.636340618133545e-01, 6.646788716316223e-01, 6.657962203025818e-01, 6.669917702674866e-01, 6.682717204093933e-01, 6.696426868438721e-01, 6.711117029190063e-01, 6.726853847503662e-01, 6.743670701980591e-01, 6.761629581451416e-01, 6.780781745910645e-01, 6.801111102104187e-01, 6.822678446769714e-01, 6.845569014549255e-01, 6.86985194683075e-01, 6.895600557327271e-01, 6.922883987426758e-01, 6.951767802238464e-01, 6.982313990592957e-01, 7.014559507369995e-01, 7.048414945602417e-01, 7.083806991577148e-01, 7.120717763900757e-01, 7.15911865234375e-01, 7.198972105979919e-01, 7.240231037139893e-01, 7.282840609550476e-01, 7.326732277870178e-01, 7.371826171875e-01, 7.41803765296936e-01, 7.465271949768066e-01, 7.513425946235657e-01, 7.562389969825745e-01, 7.612049579620361e-01, 7.662285566329956e-01, 7.712973952293396e-01, 7.763990163803101e-01, 7.815207839012146e-01, 7.866501212120056e-01, 7.917746901512146e-01, 7.968824505805969e-01, 8.019615411758423e-01, 8.070008158683777e-01, 8.119895458221436e-01, 8.169176578521729e-01, 8.217758536338806e-01, 8.26555609703064e-01, 8.312487602233887e-01]
-fan3.y_actual=[0e+00, 5.898704528808594e-01, 6.386487483978271e-01, 6.476296782493591e-01, 6.493147611618042e-01, 6.496323943138123e-01, 6.496935486793518e-01, 6.497072577476501e-01, 6.497147083282471e-01, 6.497257351875305e-01, 6.497452259063721e-01, 6.497777700424194e-01, 6.498280763626099e-01, 6.498994827270508e-01, 6.499918699264526e-01, 6.500999927520752e-01, 6.502125859260559e-01, 6.503137350082397e-01, 6.503891348838806e-01, 6.504585146903992e-01, 6.50533139705658e-01, 6.506147384643555e-01, 6.507042050361633e-01, 6.508023738861084e-01, 6.509100198745728e-01, 6.510279178619385e-01, 6.511571407318115e-01, 6.512986421585083e-01, 6.514533758163452e-01, 6.516225934028625e-01, 6.518073081970215e-01, 6.520088911056519e-01, 6.522285342216492e-01, 6.524675488471985e-01, 6.527272462844849e-01, 6.530089974403381e-01, 6.533141732215881e-01, 6.536440253257751e-01, 6.540000438690186e-01, 6.543834805488586e-01, 6.547958254814148e-01, 6.552384495735168e-01, 6.55712902545929e-01, 6.562207937240601e-01, 6.567638516426086e-01, 6.573439836502075e-01, 6.579633355140686e-01, 6.586242914199829e-01, 6.593294739723206e-01, 6.600818634033203e-01, 6.608846783638e-01, 6.617415547370911e-01, 6.626565456390381e-01, 6.636340618133545e-01, 6.646788716316223e-01, 6.657962203025818e-01, 6.669917702674866e-01, 6.682717204093933e-01, 6.696426868438721e-01, 6.711117029190063e-01, 6.726853847503662e-01, 6.743670701980591e-01, 6.761629581451416e-01, 6.780781745910645e-01, 6.801111102104187e-01, 6.822678446769714e-01, 6.845569014549255e-01, 6.86985194683075e-01, 6.895600557327271e-01, 6.922883987426758e-01, 6.951767802238464e-01, 6.982313990592957e-01, 7.014559507369995e-01, 7.048414945602417e-01, 7.083806991577148e-01, 7.120717763900757e-01, 7.15911865234375e-01, 7.198972105979919e-01, 7.240231037139893e-01, 7.282840609550476e-01, 7.326732277870178e-01, 7.371826171875e-01, 7.41803765296936e-01, 7.465271949768066e-01, 7.513425946235657e-01, 7.562389969825745e-01, 7.612049579620361e-01, 7.662285566329956e-01, 7.712973952293396e-01, 7.763990163803101e-01, 7.815207839012146e-01, 7.866501212120056e-01, 7.917746901512146e-01, 7.968824505805969e-01, 8.019615411758423e-01, 8.070008158683777e-01, 8.119895458221436e-01, 8.169176578521729e-01, 8.217758536338806e-01, 8.26555609703064e-01, 8.312487602233887e-01]
+fan1.P=[0e+00, 1.617962568998337e-01, 6.35887086391449e-01, 1.99204695224762e+00, 5.7226243019104e+00, 1.585937118530273e+01, 4.405842208862305e+01, 1.241589965820314e+02, 3.121333618164062e+02, 6.064060668945312e+02, 1.098576782226562e+03, 1.856105102539062e+03, 2.9245947265625e+03, 4.29735546875e+03, 4.9520078125e+03, 4.97261328125e+03, 4.990884765625e+03, 5.0041494140625e+03, 5.01663623046875e+03, 5.03027734375e+03, 5.0452314453125e+03, 5.061630859375e+03, 5.07960986328125e+03, 5.0993115234375e+03, 5.12088720703125e+03, 5.14449853515625e+03, 5.17031396484375e+03, 5.1985107421875e+03, 5.22927197265625e+03, 5.2627841796875e+03, 5.29923486328125e+03, 5.33881005859375e+03, 5.381689453125e+03, 5.42804248046875e+03, 5.47802587890625e+03, 5.53177685546875e+03, 5.58941259765625e+03, 5.65102783203125e+03, 5.7166943359375e+03, 5.78646044921875e+03, 5.86035693359375e+03, 5.9384013671875e+03, 6.02060205078125e+03, 6.10696728515625e+03, 6.19751123046875e+03, 6.2922607421875e+03, 6.39126318359375e+03, 6.49458984375e+03, 6.602341796875e+03, 6.71465478515625e+03, 6.83169970703125e+03, 6.9536884765625e+03, 7.08087353515625e+03, 7.213552734375e+03, 7.352071777343751e+03, 7.496825195312501e+03, 7.648262695312501e+03, 7.8068935546875e+03, 7.9732880859375e+03, 8.14811865234375e+03, 8.332294921875e+03, 8.52658984375e+03, 8.7310712890625e+03, 8.9453544921875e+03, 9.169984375e+03, 9.4055283203125e+03, 9.652291015625e+03, 9.91059765625e+03, 1.0180755859375e+04, 1.0463037109375e+04, 1.075770703125e+04, 1.1065001953125e+04, 1.1385169921875e+04, 1.17183046875e+04, 1.20646806640625e+04, 1.24244228515625e+04, 1.27977109375e+04, 1.31846376953125e+04, 1.35852119140625e+04, 1.399937109375e+04, 1.44269716796875e+04, 1.48677822265625e+04, 1.53214755859375e+04, 1.57876318359375e+04, 1.62657275390625e+04, 1.675515625e+04, 1.725519921875e+04, 1.776506640625e+04, 1.8283869140625e+04, 1.8810646484375e+04, 1.9344376953125e+04, 1.9883958984375e+04, 2.0428263671875e+04, 2.09761171875e+04, 2.1526322265625e+04, 2.2077671875e+04, 2.2628958984375e+04, 2.3178986328125e+04, 2.372658984375e+04, 2.427062890625e+04, 2.4810017578125e+04]
+fan2.P=[0e+00, 1.617962568998337e-01, 6.35887086391449e-01, 1.99204695224762e+00, 5.7226243019104e+00, 1.585937118530273e+01, 4.405842208862305e+01, 1.241589965820314e+02, 3.121333618164062e+02, 6.064060668945312e+02, 1.098576782226562e+03, 1.856105102539062e+03, 2.9245947265625e+03, 4.29735546875e+03, 5.900611328125003e+03, 6.428388671875e+03, 6.44757470703125e+03, 6.46152783203125e+03, 6.47463671875e+03, 6.4889423828125e+03, 6.5046220703125e+03, 6.52181689453125e+03, 6.54066796875e+03, 6.56132568359375e+03, 6.58394970703125e+03, 6.608708984375e+03, 6.63578173828125e+03, 6.66535400390625e+03, 6.6976181640625e+03, 6.732771484375e+03, 6.77101220703125e+03, 6.81253662109375e+03, 6.8575361328125e+03, 6.90619091796875e+03, 6.9586689453125e+03, 7.01511865234375e+03, 7.07566845703125e+03, 7.14042236328125e+03, 7.20946337890625e+03, 7.28285009765625e+03, 7.36062451171875e+03, 7.44281298828125e+03, 7.52943701171875e+03, 7.6205166015625e+03, 7.71607958984375e+03, 7.81616845703125e+03, 7.92084716796875e+03, 8.03020751953125e+03, 8.14437353515625e+03, 8.2635048828125e+03, 8.387802734375e+03, 8.5175087890625e+03, 8.652912109375e+03, 8.7943505859375e+03, 8.942343750000002e+03, 9.098338867187502e+03, 9.262955078125002e+03, 9.4366171875e+03, 9.619787109375e+03, 9.8129482421875e+03, 1.0016439453125e+04, 1.0230787109375e+04, 1.04558115234375e+04, 1.069080859375e+04, 1.09360302734375e+04, 1.11917333984375e+04, 1.14578515625e+04, 1.17342978515625e+04, 1.20209404296875e+04, 1.23175654296875e+04, 1.26239306640625e+04, 1.29399921875e+04, 1.32660947265625e+04, 1.36024052734375e+04, 1.39494443359375e+04, 1.4307595703125e+04, 1.46773447265625e+04, 1.50591083984375e+04, 1.54532314453125e+04, 1.586000390625e+04, 1.627963671875e+04, 1.6712255859375e+04, 1.7157884765625e+04, 1.761644140625e+04, 1.808772265625e+04, 1.8571423828125e+04, 1.9066896484375e+04, 1.9570962890625e+04, 2.0082162109375e+04, 2.059974609375e+04, 2.1122912109375e+04, 2.1650759765625e+04, 2.2182349609375e+04, 2.271669140625e+04, 2.3252751953125e+04, 2.3789482421875e+04, 2.4325810546875e+04, 2.4860669921875e+04, 2.5393005859375e+04, 2.592178125e+04, 2.6445998046875e+04]
+fan3.P=[0e+00, 3.301964607089758e-03, 1.297728717327118e-02, 4.06540185213089e-02, 1.167882531881332e-01, 3.236606419086456e-01, 8.991515040397644e-01, 2.533857107162478e+00, 6.370069026947021e+00, 1.237563419342041e+01, 2.24199333190918e+01, 3.787969589233398e+01, 5.968560791015625e+01, 8.770113372802734e+01, 1.201713180541993e+02, 1.535560455322266e+02, 1.829991302490234e+02, 2.042059783935547e+02, 2.243309936523438e+02, 2.464094390869141e+02, 2.706254577636719e+02, 2.9717578125e+02, 3.26271240234375e+02, 3.581373901367188e+02, 3.930139770507812e+02, 4.311542358398438e+02, 4.728235473632812e+02, 5.182973022460939e+02, 5.678577880859376e+02, 6.217905883789062e+02, 6.803792114257812e+02, 7.438997802734375e+02, 8.12614013671875e+02, 8.8676220703125e+02, 9.66555908203125e+02, 1.052171508789062e+03, 1.143744750976562e+03, 1.2413671875e+03, 1.3450859375e+03, 1.454904907226562e+03, 1.570791259765625e+03, 1.692681884765625e+03, 1.820494750976562e+03, 1.954138793945312e+03, 2.0935263671875e+03, 2.238583251953125e+03, 2.38925927734375e+03, 2.5455361328125e+03, 2.707433837890625e+03, 2.875017333984375e+03, 3.0483984375e+03, 3.227740966796875e+03, 3.413262451171875e+03, 3.6052373046875e+03, 3.803999267578126e+03, 4.009945556640626e+03, 4.223540527343752e+03, 4.44532177734375e+03, 4.675908203125e+03, 4.91601318359375e+03, 5.1664814453125e+03, 5.4282197265625e+03, 5.70121240234375e+03, 5.9848388671875e+03, 6.2799208984375e+03, 6.58713134765625e+03, 6.90680078125e+03, 7.239263671875e+03, 7.58484130859375e+03, 7.94381884765625e+03, 8.3164677734375e+03, 8.7030419921875e+03, 9.1039267578125e+03, 9.5191953125e+03, 9.9489892578125e+03, 1.03933095703125e+04, 1.0852185546875e+04, 1.1325556640625e+04, 1.18132744140625e+04, 1.2315115234375e+04, 1.28307705078125e+04, 1.335984375e+04, 1.39018388671875e+04, 1.4456171875e+04, 1.50221552734375e+04, 1.5599021484375e+04, 1.61858974609375e+04, 1.678183984375e+04, 1.73858203125e+04, 1.7996736328125e+04, 1.8613439453125e+04, 1.9234708984375e+04, 1.985930078125e+04, 2.048594140625e+04, 2.1113341796875e+04, 2.17402109375e+04, 2.2365271484375e+04, 2.298726171875e+04, 2.3604962890625e+04, 2.421719921875e+04, 2.482284375e+04]
+fan1.y_actual=[0e+00, 6.067391633987427e-01, 6.398100852966309e-01, 6.474164724349976e-01, 6.491760015487671e-01, 6.495843529701233e-01, 6.496810913085938e-01, 6.497079133987427e-01, 6.497227549552917e-01, 6.497418880462646e-01, 6.497728228569031e-01, 6.498205661773682e-01, 6.498889923095703e-01, 6.499785184860229e-01, 6.500845551490784e-01, 6.501966714859009e-01, 6.502996683120728e-01, 6.503782272338867e-01, 6.50448203086853e-01, 6.505222320556641e-01, 6.506028771400452e-01, 6.506912708282471e-01, 6.507881283760071e-01, 6.508944034576416e-01, 6.510108709335327e-01, 6.511384248733521e-01, 6.512781381607056e-01, 6.514309644699097e-01, 6.515980362892151e-01, 6.517805457115173e-01, 6.519797444343567e-01, 6.521967649459839e-01, 6.524329781532288e-01, 6.526896953582764e-01, 6.529682278633118e-01, 6.532700061798096e-01, 6.535962820053101e-01, 6.539484858512878e-01, 6.543279886245728e-01, 6.547361612319946e-01, 6.551744341850281e-01, 6.556442975997925e-01, 6.56147301197052e-01, 6.566852927207947e-01, 6.572600603103638e-01, 6.578737497329712e-01, 6.585286855697632e-01, 6.592274904251099e-01, 6.599730253219604e-01, 6.607685685157776e-01, 6.61617636680603e-01, 6.625242233276367e-01, 6.634926795959473e-01, 6.645277738571167e-01, 6.656346321105957e-01, 6.668188571929932e-01, 6.680866479873657e-01, 6.694444417953491e-01, 6.708992719650269e-01, 6.724581718444824e-01, 6.741238832473755e-01, 6.759037375450134e-01, 6.778016090393066e-01, 6.798176169395447e-01, 6.819561719894409e-01, 6.842262744903564e-01, 6.866344809532166e-01, 6.891881227493286e-01, 6.918944716453552e-01, 6.947598457336426e-01, 6.977905035018921e-01, 7.009909749031067e-01, 7.04353392124176e-01, 7.078700065612793e-01, 7.115397453308105e-01, 7.153582572937012e-01, 7.193227410316467e-01, 7.234286665916443e-01, 7.276702523231506e-01, 7.320408821105957e-01, 7.36532986164093e-01, 7.411381006240845e-01, 7.458468079566956e-01, 7.506489753723145e-01, 7.55533754825592e-01, 7.604897022247314e-01, 7.655048966407776e-01, 7.705671787261963e-01, 7.756639719009399e-01, 7.807827591896057e-01, 7.85910964012146e-01, 7.910361886024475e-01, 7.961462140083313e-01, 8.012292981147766e-01, 8.062741756439209e-01, 8.112700581550598e-01, 8.162067532539368e-01, 8.21074903011322e-01, 8.258657455444336e-01, 8.305714130401611e-01, 8.351847529411316e-01]
+fan2.y_actual=[0e+00, 6.067391633987427e-01, 6.398100852966309e-01, 6.474164724349976e-01, 6.491760015487671e-01, 6.495843529701233e-01, 6.496810913085938e-01, 6.497079133987427e-01, 6.497227549552917e-01, 6.497418880462646e-01, 6.497728228569031e-01, 6.498205661773682e-01, 6.498889923095703e-01, 6.499785184860229e-01, 6.500845551490784e-01, 6.501966714859009e-01, 6.502996683120728e-01, 6.503782272338867e-01, 6.50448203086853e-01, 6.505222320556641e-01, 6.506028771400452e-01, 6.506912708282471e-01, 6.507881283760071e-01, 6.508944034576416e-01, 6.510108709335327e-01, 6.511384248733521e-01, 6.512781381607056e-01, 6.514309644699097e-01, 6.515980362892151e-01, 6.517805457115173e-01, 6.519797444343567e-01, 6.521967649459839e-01, 6.524329781532288e-01, 6.526896953582764e-01, 6.529682278633118e-01, 6.532700061798096e-01, 6.535962820053101e-01, 6.539484858512878e-01, 6.543279886245728e-01, 6.547361612319946e-01, 6.551744341850281e-01, 6.556442975997925e-01, 6.56147301197052e-01, 6.566852927207947e-01, 6.572600603103638e-01, 6.578737497329712e-01, 6.585286855697632e-01, 6.592274904251099e-01, 6.599730253219604e-01, 6.607685685157776e-01, 6.61617636680603e-01, 6.625242233276367e-01, 6.634926795959473e-01, 6.645277738571167e-01, 6.656346321105957e-01, 6.668188571929932e-01, 6.680866479873657e-01, 6.694444417953491e-01, 6.708992719650269e-01, 6.724581718444824e-01, 6.741238832473755e-01, 6.759037375450134e-01, 6.778016090393066e-01, 6.798176169395447e-01, 6.819561719894409e-01, 6.842262744903564e-01, 6.866344809532166e-01, 6.891881227493286e-01, 6.918944716453552e-01, 6.947598457336426e-01, 6.977905035018921e-01, 7.009909749031067e-01, 7.04353392124176e-01, 7.078700065612793e-01, 7.115397453308105e-01, 7.153582572937012e-01, 7.193227410316467e-01, 7.234286665916443e-01, 7.276702523231506e-01, 7.320408821105957e-01, 7.36532986164093e-01, 7.411381006240845e-01, 7.458468079566956e-01, 7.506489753723145e-01, 7.55533754825592e-01, 7.604897022247314e-01, 7.655048966407776e-01, 7.705671787261963e-01, 7.756639719009399e-01, 7.807827591896057e-01, 7.85910964012146e-01, 7.910361886024475e-01, 7.961462140083313e-01, 8.012292981147766e-01, 8.062741756439209e-01, 8.112700581550598e-01, 8.162067532539368e-01, 8.21074903011322e-01, 8.258657455444336e-01, 8.305714130401611e-01, 8.351847529411316e-01]
+fan3.y_actual=[0e+00, 6.067391633987427e-01, 6.398100852966309e-01, 6.474164724349976e-01, 6.491760015487671e-01, 6.495843529701233e-01, 6.496810913085938e-01, 6.497079133987427e-01, 6.497227549552917e-01, 6.497418880462646e-01, 6.497728228569031e-01, 6.498205661773682e-01, 6.498889923095703e-01, 6.499785184860229e-01, 6.500845551490784e-01, 6.501966714859009e-01, 6.502996683120728e-01, 6.503782272338867e-01, 6.50448203086853e-01, 6.505222320556641e-01, 6.506028771400452e-01, 6.506912708282471e-01, 6.507881283760071e-01, 6.508944034576416e-01, 6.510108709335327e-01, 6.511384248733521e-01, 6.512781381607056e-01, 6.514309644699097e-01, 6.515980362892151e-01, 6.517805457115173e-01, 6.519797444343567e-01, 6.521967649459839e-01, 6.524329781532288e-01, 6.526896953582764e-01, 6.529682278633118e-01, 6.532700061798096e-01, 6.535962820053101e-01, 6.539484858512878e-01, 6.543279886245728e-01, 6.547361612319946e-01, 6.551744341850281e-01, 6.556442975997925e-01, 6.56147301197052e-01, 6.566852927207947e-01, 6.572600603103638e-01, 6.578737497329712e-01, 6.585286855697632e-01, 6.592274904251099e-01, 6.599730253219604e-01, 6.607685685157776e-01, 6.61617636680603e-01, 6.625242233276367e-01, 6.634926795959473e-01, 6.645277738571167e-01, 6.656346321105957e-01, 6.668188571929932e-01, 6.680866479873657e-01, 6.694444417953491e-01, 6.708992719650269e-01, 6.724581718444824e-01, 6.741238832473755e-01, 6.759037375450134e-01, 6.778016090393066e-01, 6.798176169395447e-01, 6.819561719894409e-01, 6.842262744903564e-01, 6.866344809532166e-01, 6.891881227493286e-01, 6.918944716453552e-01, 6.947598457336426e-01, 6.977905035018921e-01, 7.009909749031067e-01, 7.04353392124176e-01, 7.078700065612793e-01, 7.115397453308105e-01, 7.153582572937012e-01, 7.193227410316467e-01, 7.234286665916443e-01, 7.276702523231506e-01, 7.320408821105957e-01, 7.36532986164093e-01, 7.411381006240845e-01, 7.458468079566956e-01, 7.506489753723145e-01, 7.55533754825592e-01, 7.604897022247314e-01, 7.655048966407776e-01, 7.705671787261963e-01, 7.756639719009399e-01, 7.807827591896057e-01, 7.85910964012146e-01, 7.910361886024475e-01, 7.961462140083313e-01, 8.012292981147766e-01, 8.062741756439209e-01, 8.112700581550598e-01, 8.162067532539368e-01, 8.21074903011322e-01, 8.258657455444336e-01, 8.305714130401611e-01, 8.351847529411316e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
index 860d1f9cca..3980a46e7c 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-05
+last-generated=2024-08-26
statistics-initialization=
{
"nonlinear": "1, 1, 0, 1",
@@ -8,13 +8,13 @@ statistics-simulation=
{
"linear": " ",
"nonlinear": "1, 1, 0, 1",
- "number of continuous time states": "15",
+ "number of continuous time states": "12",
"numerical Jacobians": "0"
}
time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 1.278694748878479e+00, 1.549441695213318e+00, 1.606706619262695e+00, 1.618815779685974e+00, 1.621374130249023e+00, 1.621917724609375e+00, 1.622032523155212e+00, 1.622056365013123e+00, 1.622061491012573e+00, 1.622062206268311e+00, 8.752594590187073e-01, 2.08819180727005e-01, 1.861694268882275e-02, 1.363048562780016e-03, 9.01221064850688e-05, 5.623493507300736e-06, 3.133573045488431e-07, 1.13955138658639e-08, -1.244507075170986e-08, -3.359173206263222e-08, 7.495246529579163e-01, 1.323916673660278e+00, 1.535160422325134e+00, 1.598641872406006e+00, 1.616044402122498e+00, 1.620565056800842e+00, 1.621698260307312e+00, 1.621975421905518e+00, 1.622042298316956e+00, 1.622058272361755e+00, 8.75255823135376e-01, 2.087867259979248e-01, 1.861702091991901e-02, 1.363056944683181e-03, 9.015454998007044e-05, 5.652871095662704e-06, 1.145772330346517e-07, -1.114312908612192e-08, -7.113612809916958e-09, -1.83904376171995e-08, 7.470592856407123e-01, 1.323917269706726e+00, 1.535152196884155e+00, 1.598642110824585e+00, 1.616045117378235e+00, 1.620564699172974e+00, 1.621700644493103e+00, 1.621977686882019e+00, 1.622043132781982e+00, 1.622058391571045e+00, 8.752558827400208e-01, 2.087872922420502e-01, 1.861701719462872e-02, 1.363056595437229e-03, 9.021081496030092e-05, 5.571381279878438e-06, 3.292930159659688e-07, 2.395518094999716e-08, 1.249236447620206e-08, -2.810338628478348e-10, 7.457569241523743e-01, 1.323928117752075e+00, 1.535154342651367e+00, 1.598635673522949e+00, 1.616042494773865e+00, 1.620565295219421e+00, 1.62169873714447e+00, 1.621975660324097e+00, 1.622041940689087e+00, 1.622057914733887e+00, 8.752556443214417e-01, 2.087853103876114e-01, 1.861703023314476e-02, 1.363047049380839e-03, 9.02090105228126e-05, 5.116904503665864e-06, 2.555261744419113e-07, -9.187715477310121e-09, 1.041826180880889e-09, 5.638867150992155e-11, 7.461619377136304e-01, 1.323922753334042e+00, 1.535153746604919e+00, 1.598641633987427e+00, 1.616046190261841e+00, 1.620566248893738e+00, 1.621700048446655e+00, 1.621976375579834e+00, 1.622042417526245e+00, 1.622057914733887e+00, 8.752556443214417e-01, 2.087854295969009e-01, 1.861703023314476e-02, 1.363047049380839e-03, 9.020829747896641e-05, 5.109519861434819e-06, 2.547367330407724e-07, -9.473296813666821e-09, 1.042280928231776e-09, 5.547917680814862e-11]
-fan2.m_flow=[0e+00, 3.238261640071869e-01, 9.70430314540863e-01, 1.368154168128967e+00, 1.535677194595337e+00, 1.595240592956543e+00, 1.614236235618591e+00, 1.619882702827454e+00, 1.621473670005798e+00, 1.621907234191895e+00, 1.62201189994812e+00, 1.504447460174561e+00, 1.004021525382996e+00, 4.560884535312653e-01, 1.587975770235058e-01, 4.745125025510788e-02, 1.302728336304426e-02, 3.391751786693921e-03, 8.492695633322001e-04, 2.058757527265698e-04, 4.799016460310668e-05, 9.450884908437729e-02, 5.979772210121155e-01, 1.10500705242157e+00, 1.404872536659241e+00, 1.541112661361694e+00, 1.596185088157654e+00, 1.613284945487976e+00, 1.619389772415161e+00, 1.621281981468201e+00, 1.621844530105591e+00, 1.504400491714478e+00, 1.004008412361145e+00, 4.549911022186279e-01, 1.587940454483024e-01, 4.745637252926826e-02, 1.302649173885584e-02, 3.376992885023355e-03, 8.425785345025361e-04, 2.0449428120628e-04, 4.800949682248756e-05, 9.45129990577685e-02, 5.980075001716614e-01, 1.104984164237976e+00, 1.40273129940033e+00, 1.541390180587769e+00, 1.594590902328491e+00, 1.613296747207642e+00, 1.619409561157227e+00, 1.621291518211365e+00, 1.621846079826355e+00, 1.504401087760925e+00, 1.004008531570435e+00, 4.549952745437622e-01, 1.587949693202972e-01, 4.745873436331749e-02, 1.30231417715548e-02, 3.385087940841964e-03, 8.502733544446528e-04, 2.084502193611115e-04, 5.011197208659723e-05, 9.449911862611771e-02, 5.977904796600342e-01, 1.105067729949951e+00, 1.404888391494751e+00, 1.541261315345764e+00, 1.596131563186646e+00, 1.61348831653595e+00, 1.619404315948486e+00, 1.621275424957275e+00, 1.621837258338928e+00, 1.504398226737976e+00, 1.004007697105408e+00, 4.549853503704071e-01, 1.593954414129257e-01, 4.74562868475914e-02, 1.301787421107292e-02, 3.382992465049028e-03, 8.479519165121019e-04, 2.075021038763225e-04, 5.053983113612048e-05, 9.449891000986459e-02, 5.977013111114448e-01, 1.098235487937927e+00, 1.40488588809967e+00, 1.541378378868103e+00, 1.594725608825684e+00, 1.613313913345337e+00, 1.62067174911499e+00, 1.621283531188965e+00, 1.621837973594666e+00, 1.504398465156555e+00, 1.004007697105408e+00, 4.549855887889862e-01, 1.594632565975189e-01, 4.745626077055931e-02, 1.301778666675091e-02, 3.382936818525195e-03, 8.479245589114726e-04, 2.074916410492733e-04, 5.057702219346538e-05]
-fan3.m_flow=[0e+00, 5.383018851280212e-01, 1.124673366546631e+00, 1.428613781929016e+00, 1.554776668548584e+00, 1.600522994995117e+00, 1.615598440170288e+00, 1.620219945907593e+00, 1.621555685997009e+00, 1.62192690372467e+00, 1.62201988697052e+00, 1.516018867492676e+00, 1.106571674346924e+00, 6.801589727401733e-01, 3.209760189056388e-01, 9.570863097906113e-02, 2.553174272179604e-02, 6.504035554826241e-03, 1.6029680846259e-03, 3.840871795546263e-04, 8.832984894979745e-05, 1.144708171486855e-01, 7.588290572166443e-01, 1.195953845977783e+00, 1.440651178359985e+00, 1.552851438522339e+00, 1.597831010818481e+00, 1.614135384559631e+00, 1.619603157043457e+00, 1.621333599090576e+00, 1.621856451034546e+00, 1.51596999168396e+00, 1.106553554534912e+00, 6.801513433456421e-01, 3.14618974924086e-01, 9.578317403793335e-02, 2.552864514291286e-02, 6.472621113061905e-03, 1.58943550195545e-03, 3.812931827269495e-04, 8.870559395290911e-05, 1.144643723964675e-01, 7.588258385658264e-01, 1.195945739746094e+00, 1.440368175506592e+00, 1.552848935127258e+00, 1.597833037376404e+00, 1.614142894744873e+00, 1.61961829662323e+00, 1.621341705322266e+00, 1.62185800075531e+00, 1.515970468521118e+00, 1.106553792953491e+00, 6.801514029502869e-01, 3.20765495300293e-01, 9.572803974151611e-02, 2.552173845469923e-02, 6.489924155175785e-03, 1.700523658655584e-03, 5.356839974410832e-04, 2.685268700588495e-04, 1.144684702157974e-01, 7.588734030723572e-01, 1.195974469184875e+00, 1.440650939941406e+00, 1.552847623825073e+00, 1.597828030586243e+00, 1.614136695861816e+00, 1.619605660438538e+00, 1.621327996253967e+00, 1.62185001373291e+00, 1.515967726707458e+00, 1.106552720069885e+00, 6.801509261131287e-01, 3.120265305042267e-01, 9.571662545204163e-02, 2.549474872648716e-02, 7.638722658157349e-03, 5.418079090304673e-04, 3.871483786497265e-04, 9.350310574518517e-05, 1.144693046808299e-01, 7.588589191436717e-01, 1.195734977722168e+00, 1.440647125244141e+00, 1.552848219871521e+00, 1.597834587097168e+00, 1.614134788513184e+00, 1.619621396064758e+00, 1.621334433555603e+00, 1.621850609779358e+00, 1.515967965126038e+00, 1.106552720069885e+00, 6.801509261131287e-01, 3.123229742050171e-01, 9.571659564971924e-02, 2.549361065030098e-02, 7.585012353956699e-03, 5.871178000234067e-04, 3.871266380883753e-04, 9.357412636745721e-05]
-fan1.dp=[0e+00, -3.272271728515625e+02, -4.802207641601562e+02, -5.1631640625e+02, -5.241161499023438e+02, -5.25771484375e+02, -5.261235961914062e+02, -5.261979370117188e+02, -5.2621337890625e+02, -5.262166748046875e+02, -5.262171630859375e+02, -1.534480285644531e+02, -1.835040855407715e+01, -1.589661955833435e+00, -1.162726879119867e-01, -7.687701378017664e-03, -4.773136461153626e-04, -2.828497963491813e-05, -1.604013959877193e-06, -8.688948582857847e-08, -3.710738383233547e-09, -1.114098587036133e+02, -3.507066650390625e+02, -4.71408203125e+02, -5.111506958007812e+02, -5.223252563476562e+02, -5.2524755859375e+02, -5.259813232421875e+02, -5.261609497070312e+02, -5.262042846679688e+02, -5.26214599609375e+02, -1.534476623535156e+02, -1.835030364990234e+01, -1.589661121368408e+00, -1.162730380892742e-01, -7.690401282161474e-03, -4.771848907694221e-04, -2.788999699987471e-05, -1.57009344547987e-06, -8.553615771234035e-08, -4.045432433485985e-09, -1.113762588500966e+02, -3.507066345214844e+02, -4.71403076171875e+02, -5.111511535644531e+02, -5.2232568359375e+02, -5.252473754882812e+02, -5.259829711914062e+02, -5.261624145507812e+02, -5.26204833984375e+02, -5.262146606445312e+02, -1.534476623535156e+02, -1.835030555725098e+01, -1.589661121368408e+00, -1.162733733654022e-01, -7.692102808505297e-03, -4.767471691593431e-04, -2.812295861076666e-05, -1.610649633221328e-06, -9.017821867018938e-08, -4.889443516731262e-09, -1.113621520996094e+02, -3.50708740234375e+02, -4.714044494628906e+02, -5.111469116210938e+02, -5.22323974609375e+02, -5.252476806640625e+02, -5.25981689453125e+02, -5.261611328125e+02, -5.262040405273438e+02, -5.2621435546875e+02, -1.534476318359375e+02, -1.835029792785645e+01, -1.589661002159119e+00, -1.162727698683739e-01, -7.691064849495888e-03, -4.760295560117811e-04, -2.807614509947598e-05, -1.598047674633563e-06, -8.88976501300931e-08, -4.99130692332983e-09, -1.113675994873071e+02, -3.507057495117169e+02, -4.714040832519531e+02, -5.111508178710938e+02, -5.22326416015625e+02, -5.252483520507812e+02, -5.259826049804688e+02, -5.261615600585938e+02, -5.26204345703125e+02, -5.262144165039062e+02, -1.534476318359375e+02, -1.835029792785645e+01, -1.589661002159119e+00, -1.162727698683739e-01, -7.691043894737959e-03, -4.760134615935385e-04, -2.807452983688563e-05, -1.597902155481279e-06, -8.888309821486473e-08, -5.005858838558197e-09]
-fan2.dp=[0e+00, -2.52345142364502e+01, -1.883471069335938e+02, -3.741612548828125e+02, -4.716863403320312e+02, -5.089685974121094e+02, -5.211549072265625e+02, -5.248052978515625e+02, -5.25835693359375e+02, -5.2611669921875e+02, -5.261849365234375e+02, -4.525794982910156e+02, -2.015374603271484e+02, -4.337909698486328e+01, -1.023969364166257e+01, -2.871425867080688e+00, -7.835984826087952e-01, -2.039226293563837e-01, -5.105919390916824e-02, -1.237804908305407e-02, -2.88624782115221e-03, -5.830185413360596e+00, -7.148918914794922e+01, -2.442722473144531e+02, -3.947875671386719e+02, -4.751372680664062e+02, -5.089342346191406e+02, -5.205408935546875e+02, -5.244857177734375e+02, -5.257113647460938e+02, -5.260760498046875e+02, -4.525512390136719e+02, -2.015322265625e+02, -4.332138824462891e+01, -1.023952674865717e+01, -2.871739625930786e+00, -7.835502624511719e-01, -2.030390799045563e-01, -5.06574958562851e-02, -1.229462027549744e-02, -2.886939095333219e-03, -5.830454349517742e+00, -7.149927520751953e+01, -2.442765197753906e+02, -3.943334350585938e+02, -4.752013549804688e+02, -5.085535888671875e+02, -5.20548583984375e+02, -5.244984741210938e+02, -5.257176513671875e+02, -5.260770874023438e+02, -4.525515747070312e+02, -2.015322875976562e+02, -4.332161331176758e+01, -1.023955249786377e+01, -2.87188196182251e+00, -7.833504676818761e-01, -2.035215944051773e-01, -5.112040415406227e-02, -1.253239717334509e-02, -3.012860659509897e-03, -5.82955265045166e+00, -7.148043823242188e+01, -2.442918853759766e+02, -3.947911987304688e+02, -4.751701354980469e+02, -5.089208068847656e+02, -5.205912475585938e+02, -5.244905395507812e+02, -5.257070922851562e+02, -5.260712890625e+02, -4.525498657226562e+02, -2.015319366455078e+02, -4.332106399536133e+01, -1.02596435546875e+01, -2.871732711791992e+00, -7.830487489700317e-01, -2.033999115228653e-01, -5.098110437393188e-02, -1.247519440948963e-02, -3.038492985069752e-03, -5.829538345337165e+00, -7.147304534911996e+01, -2.431611328125e+02, -3.947911376953125e+02, -4.751986694335938e+02, -5.085858764648438e+02, -5.205518188476562e+02, -5.248009643554688e+02, -5.25712158203125e+02, -5.2607177734375e+02, -4.525499877929688e+02, -2.015319519042969e+02, -4.332107925415039e+01, -1.026191139221191e+01, -2.871731281280518e+00, -7.830432057380676e-01, -2.033964246511459e-01, -5.097945034503937e-02, -1.247456483542919e-02, -3.04072885774076e-03]
-fan3.dp=[0e+00, -5.863370895385742e+01, -2.530459136962891e+02, -4.082364807128906e+02, -4.834882507324219e+02, -5.123427734375e+02, -5.220342407226562e+02, -5.250232543945312e+02, -5.258887939453125e+02, -5.261294555664062e+02, -5.26189697265625e+02, -4.595809020996094e+02, -2.448302459716797e+02, -9.250206756591797e+01, -2.903958511352532e+01, -8.208965301513672e+00, -2.179324388504028e+00, -5.549679994583114e-01, -1.36764869093895e-01, -3.275911137461662e-02, -7.561873644590378e-03, -9.8441162109375e+00, -1.152030715942383e+02, -2.861203918457031e+02, -4.151375732421875e+02, -4.822903442382812e+02, -5.106210327148438e+02, -5.210895385742188e+02, -5.246238403320312e+02, -5.257448120117188e+02, -5.26083740234375e+02, -4.595512390136719e+02, -2.448222351074219e+02, -9.249997711181641e+01, -2.903905296325669e+01, -8.209949493408203e+00, -2.179113388061523e+00, -5.52104651927948e-01, -1.35576993227005e-01, -3.25201153755188e-02, -7.563303224742413e-03, -9.843556404113626e+00, -1.152106399536133e+02, -2.861275939941406e+02, -4.151300659179688e+02, -4.822887268066406e+02, -5.106224060058594e+02, -5.210943603515625e+02, -5.246336059570312e+02, -5.257501220703125e+02, -5.26084716796875e+02, -4.595515747070312e+02, -2.448223266601562e+02, -9.25e+01, -2.90390567779541e+01, -8.210522651672363e+00, -2.178419113159155e+00, -5.537098050117576e-01, -1.369628459215164e-01, -3.319802135229111e-02, -7.910600863397121e-03, -9.843910217285156e+00, -1.152151870727539e+02, -2.861302490234375e+02, -4.15137451171875e+02, -4.822879333496094e+02, -5.106194458007812e+02, -5.210906372070312e+02, -5.2462548828125e+02, -5.257411499023438e+02, -5.2607958984375e+02, -4.595498962402344e+02, -2.448218231201172e+02, -9.249986267089844e+01, -2.903903007507324e+01, -8.210043907165527e+00, -2.177353382110596e+00, -5.53350031375885e-01, -1.365481615066528e-01, -3.303346410393715e-02, -7.979290559887886e-03, -9.843980789185078e+00, -1.152158813476548e+02, -2.861275329589844e+02, -4.151350708007812e+02, -4.822879638671875e+02, -5.106210327148438e+02, -5.210934448242188e+02, -5.246286010742188e+02, -5.25745361328125e+02, -5.260799560546875e+02, -4.595500183105469e+02, -2.448218688964844e+02, -9.24998779296875e+01, -2.903903388977051e+01, -8.210038185119629e+00, -2.177330732345581e+00, -5.533382892608643e-01, -1.365432441234589e-01, -3.303169831633568e-02, -7.985386997461319e-03]
+fan1.m_flow=[0e+00, 2.449972182512283e-01, 6.490549445152283e-01, 9.733129143714905e-01, 1.311649084091187e+00, 1.615322828292847e+00, 1.622063040733337e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735019207000732e-01, 6.504985094070435e-01, 2.454791069030752e-01, 1.11962654045783e-04, 0e+00, 5.38530414184543e-27, 0e+00, 0e+00, 0e+00, 2.449972480535507e-01, 6.488056778907776e-01, 9.716808795928955e-01, 1.293670177459717e+00, 1.615337252616882e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735018610954285e-01, 6.504906415939331e-01, 2.454813271760921e-01, 1.103719769162126e-04, -4.829416866414249e-10, 0e+00, 9.094947017729282e-13, 4.547473508864641e-13, 4.547473508864641e-13, 2.449971735477428e-01, 6.48726224899292e-01, 9.731220602989197e-01, 1.297741770744324e+00, 1.615294098854065e+00, 1.62206494808197e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735153317451477e-01, 6.489861607551575e-01, 2.460491359233856e-01, 1.110721714212559e-04, -8.185452315955966e-12, 0e+00, 0e+00, 0e+00, 0e+00, 2.449972480535507e-01, 6.508093476295471e-01, 9.730848073959351e-01, 1.297595381736755e+00, 1.615296840667725e+00, 1.622061610221863e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735019207000732e-01, 6.504978537559509e-01, 2.454785108566284e-01, 1.103186077671126e-04, -9.745235729496926e-10, 0e+00, 0e+00, 0e+00, 0e+00, 2.449973076581998e-01, 6.536422371864286e-01, 9.732654690742493e-01, 1.29736340045929e+00, 1.615300416946411e+00, 1.622064352035522e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735517501831055e-01, 6.496753692626953e-01, 2.442142367362976e-01, 1.102633323171176e-04, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 0e+00]
+fan2.m_flow=[0e+00, 1.510780900716782e-01, 3.510570824146271e-01, 5.508981347084045e-01, 7.457233667373657e-01, 9.510061740875244e-01, 1.150986433029175e+00, 1.350966691970825e+00, 1.550946950912476e+00, 1.622061014175415e+00, 1.622062921524048e+00, 1.426591038703918e+00, 1.226550102233887e+00, 1.026526570320129e+00, 8.265087008476253e-01, 6.26488983631134e-01, 4.264481961727142e-01, 2.264404743909831e-01, 2.644503302872181e-02, 1.160731244453928e-06, -1.566245373396669e-07, 1.510819494724274e-01, 3.510530591011047e-01, 5.509540438652039e-01, 7.485788464546204e-01, 9.509879946708679e-01, 1.150968194007874e+00, 1.350948572158813e+00, 1.550928831100465e+00, 1.622061371803284e+00, 1.622062921524048e+00, 1.426591038703918e+00, 1.226550221443176e+00, 1.026526689529419e+00, 8.265088200569143e-01, 6.264891028404236e-01, 4.268206059932709e-01, 2.266406863927841e-01, 2.649426274001598e-02, 4.840585461352021e-07, -3.830868990917224e-07, 1.510490030050268e-01, 3.510088920593262e-01, 5.508546829223633e-01, 7.410769462585449e-01, 9.509396553039551e-01, 1.150920271873474e+00, 1.350900650024414e+00, 1.550857067108154e+00, 1.622062563896179e+00, 1.622059941291809e+00, 1.426589131355286e+00, 1.226551651954651e+00, 1.026536345481873e+00, 8.265165686607361e-01, 6.264967918395996e-01, 4.359624385833718e-01, 2.290879637002966e-01, 2.645600214600563e-02, -2.98784925689688e-07, 9.340510587207973e-10, 1.510761976242065e-01, 3.510645627975464e-01, 5.510421991348267e-01, 7.500321269035339e-01, 9.510041475296021e-01, 1.150984525680542e+00, 1.350964784622192e+00, 1.550945043563845e+00, 1.622070670127869e+00, 1.622062921524048e+00, 1.426591038703918e+00, 1.226550102233887e+00, 1.026526689529419e+00, 8.265087008476257e-01, 6.26488983631134e-01, 4.231171011924744e-01, 2.264502048492432e-01, 2.644366770982742e-02, -3.035929694306105e-07, -7.408607416437007e-08, 1.510637551546116e-01, 3.510526716709118e-01, 5.510405302047729e-01, 7.51348614692688e-01, 9.509917497634888e-01, 1.150972008705139e+00, 1.35095226764679e+00, 1.550932049751282e+00, 1.622053980827332e+00, 1.622058868408203e+00, 1.426577210426331e+00, 1.22636342048645e+00, 1.026561856269836e+00, 8.265403509140015e-01, 6.26520574092865e-01, 4.26481157541275e-01, 2.264417111873627e-01, 2.648130431771278e-02, 1.99108399101533e-07, -4.397134034661576e-08]
+fan3.m_flow=[0e+00, 2.314871409907937e-03, 4.658571444451809e-03, 7.002185564488173e-03, 9.34566929936409e-03, 1.168898120522499e-02, 1.403207518160343e-02, 1.637491025030613e-02, 1.87174417078495e-02, 2.105962671339512e-02, 2.340142242610455e-02, 2.57427841424942e-02, 2.80836708843708e-02, 3.042403608560562e-02, 3.276383876800538e-02, 3.352393582463264e-02, 3.118432313203812e-02, 2.884413488209247e-02, 2.650341391563416e-02, 2.416220121085644e-02, 2.182054333388805e-02, 2.282586693763733e-02, 2.516733855009079e-02, 2.750834636390209e-02, 2.98488438129425e-02, 3.21887880563736e-02, 3.452813997864723e-02, 3.686685115098953e-02, 3.920487686991693e-02, 4.15421836078167e-02, 4.38787154853344e-02, 4.621444270014763e-02, 4.854930937290192e-02, 5.088328197598457e-02, 5.321631208062173e-02, 5.338140949606895e-02, 5.104844272136688e-02, 4.87145371735096e-02, 4.637973010540009e-02, 4.404406622052193e-02, 4.170758649706841e-02, 4.224802553653716e-02, 4.458432272076607e-02, 4.691979289054871e-02, 4.92543950676918e-02, 5.158808454871178e-02, 5.392082408070564e-02, 5.625256896018982e-02, 5.858327075839043e-02, 6.091289222240448e-02, 6.32413849234581e-02, 6.55687153339386e-02, 6.78948387503624e-02, 7.021970301866531e-02, 7.254327088594437e-02, 7.240782678127289e-02, 7.008417695760724e-02, 6.775923818349841e-02, 6.543304771184921e-02, 6.310565024614334e-02, 6.077708676457405e-02, 6.087749451398849e-02, 6.320600956678391e-02, 6.55333548784256e-02, 6.785949319601059e-02, 7.01843798160553e-02, 7.250797003507614e-02, 7.483021914958954e-02, 7.715108990669253e-02, 7.947053760290143e-02, 8.178852498531342e-02, 8.410500735044479e-02, 8.641993254423141e-02, 8.873327076435089e-02, 9.104497730731964e-02, 9.058556705713272e-02, 8.827353268861771e-02, 8.595987409353256e-02, 8.364463597536087e-02, 8.132785558700562e-02, 7.900957763195038e-02, 7.880211621522906e-02, 8.112052828073499e-02, 8.343745023012161e-02, 8.575282990932465e-02, 8.806663006544113e-02, 9.037880599498749e-02, 9.268932044506073e-02, 9.499813616275787e-02, 9.730520099401474e-02, 9.961047023534775e-02, 1.019139140844345e-01, 1.042154878377914e-01, 1.065151393413544e-01, 1.088128462433815e-01, 1.081365346908569e-01, 1.058382540941238e-01, 1.035380288958549e-01, 1.012359037995338e-01, 9.893191605806351e-02, 9.662611037492752e-02]
+fan1.dp=[0e+00, -2.167827987670898e+01, -8.420549774169922e+01, -1.894620819091797e+02, -3.371232299804688e+02, -5.21931640625e+02, -5.262177124023438e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894652862548828e+02, -8.422185516357422e+01, -2.167975997924795e+01, -9.408608078956604e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.167827987670898e+01, -8.420267486572266e+01, -1.894343719482422e+02, -3.367157592773438e+02, -5.219407958984375e+02, -5.262176513671875e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894652862548828e+02, -8.422177124023438e+01, -2.167976570129376e+01, -9.368809871375561e-03, 1.455191522836685e-11, 0e+00, 0e+00, 0e+00, 0e+00, -2.16782798767088e+01, -8.420177459716797e+01, -1.894588470458984e+02, -3.36807861328125e+02, -5.219134521484375e+02, -5.262190551757812e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894655151367188e+02, -8.420471954345703e+01, -2.16815071105957e+01, -9.37599316239357e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.167827987670898e+01, -8.422537994384766e+01, -1.894582061767578e+02, -3.368045349121094e+02, -5.219149780273438e+02, -5.26216796875e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894652862548828e+02, -8.422184753417969e+01, -2.167975807189941e+01, -9.375622496008873e-03, 1.455191522836685e-11, 0e+00, 0e+00, 0e+00, 0e+00, -2.167827987670942e+01, -8.425753784179611e+01, -1.894612731933594e+02, -3.367992858886719e+02, -5.219176635742188e+02, -5.262183837890625e+02, -5.262176513671875e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894661407470703e+02, -8.42125244140625e+01, -2.167587089538574e+01, -9.357291273772717e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+fan2.dp=[0e+00, -9.68142032623291e+00, -2.841751670837402e+01, -6.087805938720703e+01, -1.122266540527344e+02, -1.809048614501953e+02, -2.649866333007812e+02, -3.650672302246095e+02, -4.811466369628906e+02, -5.262163696289062e+02, -5.262175903320312e+02, -4.069819946289062e+02, -3.00847900390625e+02, -2.107258453369141e+02, -1.36606475830078e+02, -7.848799896240234e+01, -3.8593017578125e+01, -1.560901832580562e+01, -1.592719674110413e+00, -6.971695984248072e-05, 9.402065188623965e-06, -9.681696891784668e+00, -2.841588973999023e+01, -6.087978363037109e+01, -1.125432662963867e+02, -1.8089794921875e+02, -2.64978271484375e+02, -3.650574035644531e+02, -4.811353759765631e+02, -5.262166137695312e+02, -5.262176513671875e+02, -4.069820251464844e+02, -3.008479614257812e+02, -2.107258911132812e+02, -1.366065063476559e+02, -7.848802947998047e+01, -3.861096572875977e+01, -1.561605358123779e+01, -1.594300031661987e+00, -2.907640009652823e-05, 2.301199128851295e-05, -9.679324150085383e+00, -2.841036605834961e+01, -6.086569976806641e+01, -1.116960983276367e+02, -1.808796234130859e+02, -2.649561462402344e+02, -3.650314636230469e+02, -4.811000366210938e+02, -5.262174072265625e+02, -5.262156372070312e+02, -4.0698095703125e+02, -3.00850341796875e+02, -2.107293548583984e+02, -1.366090698242188e+02, -7.848996734619141e+01, -3.905757141113253e+01, -1.570248413085956e+01, -1.593294501304626e+00, 1.794795389287174e-05, -5.665060598403215e-08, -9.681283950805664e+00, -2.841767120361328e+01, -6.088866806030273e+01, -1.127096633911133e+02, -1.809041137695312e+02, -2.649857482910156e+02, -3.650661926269531e+02, -4.811454467773449e+02, -5.262227783203125e+02, -5.262175903320312e+02, -4.069819946289062e+02, -3.00847900390625e+02, -2.107258605957031e+02, -1.366064758300781e+02, -7.848800659179688e+01, -3.843334197998047e+01, -1.560936069488525e+01, -1.592676401138306e+00, 1.821230398491025e-05, 4.450863343663514e-06, -9.680388450622701e+00, -2.841618156433084e+01, -6.088683700561523e+01, -1.128555679321289e+02, -1.808993835449219e+02, -2.649800109863281e+02, -3.650594482421875e+02, -4.811376342773438e+02, -5.262118530273438e+02, -5.262149658203125e+02, -4.069739990234375e+02, -3.00822265625e+02, -2.107393951416016e+02, -1.366169281005859e+02, -7.849592590332031e+01, -3.859781265258789e+01, -1.561068058013916e+01, -1.594781279563904e+00, -1.19359465315938e-05, 2.637156285345554e-06]
+fan3.dp=[0e+00, -1.97549432516098e-01, -3.975494503974915e-01, -5.975494384765625e-01, -7.975494265556335e-01, -9.975494146347046e-01, -1.19754946231842e+00, -1.397549390792847e+00, -1.597549438476562e+00, -1.797549486160278e+00, -1.997549414634705e+00, -2.197549343109131e+00, -2.397549390792847e+00, -2.597549438476562e+00, -2.797549486160279e+00, -2.862504959106445e+00, -2.662504911422729e+00, -2.462504863739013e+00, -2.262504816055298e+00, -2.062505006790161e+00, -1.862504839897156e+00, -1.948391079902649e+00, -2.148391008377075e+00, -2.348391056060791e+00, -2.548391103744507e+00, -2.748391151428223e+00, -2.948390960693359e+00, -3.148391008377075e+00, -3.348391056060792e+00, -3.548391103744507e+00, -3.748391151428223e+00, -3.948390960693359e+00, -4.148391246795654e+00, -4.348391056060791e+00, -4.548390865325929e+00, -4.562520503997803e+00, -4.362520694732666e+00, -4.162520408630371e+00, -3.962520599365234e+00, -3.762520551681519e+00, -3.562520503997803e+00, -3.608802080154418e+00, -3.808801889419556e+00, -4.008801937103271e+00, -4.208802223205566e+00, -4.408802032470703e+00, -4.60880184173584e+00, -4.808802127838135e+00, -5.008801937103271e+00, -5.208802223205566e+00, -5.408802032470703e+00, -5.60880184173584e+00, -5.808802127838135e+00, -6.008801937103271e+00, -6.208802223205566e+00, -6.197113990783691e+00, -5.997114181518553e+00, -5.797113895416262e+00, -5.597114086151123e+00, -5.397113800048828e+00, -5.197113990783691e+00, -5.205762386322021e+00, -5.405762672424316e+00, -5.605762481689453e+00, -5.80576229095459e+00, -6.005762577056885e+00, -6.205762386322021e+00, -6.405762672424316e+00, -6.605762481689455e+00, -6.805762290954588e+00, -7.005762577056885e+00, -7.205762386322021e+00, -7.405762672424316e+00, -7.605762481689453e+00, -7.80576229095459e+00, -7.76597785949707e+00, -7.565978050231934e+00, -7.365978240966797e+00, -7.165977954864502e+00, -6.965978145599365e+00, -6.76597785949707e+00, -6.74811363220215e+00, -6.948113441467283e+00, -7.148113250732422e+00, -7.348113536834717e+00, -7.548113346099854e+00, -7.748113632202148e+00, -7.948113441467285e+00, -8.148113250732422e+00, -8.348113059997559e+00, -8.548113822937012e+00, -8.748113632202148e+00, -8.948113441467285e+00, -9.148113250732422e+00, -9.348113059997559e+00, -9.289200782775879e+00, -9.089200973510742e+00, -8.889200210571289e+00, -8.689200401306152e+00, -8.489200592041016e+00, -8.289200782775879e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachine.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachine.txt
index a98f7f25bd..c313085efd 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachine.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachine.txt
@@ -1,4 +1,4 @@
-last-generated=2023-03-21
+last-generated=2024-08-26
statistics-initialization=
{
"nonlinear": "1, 0, 1, 1",
@@ -8,13 +8,13 @@ statistics-simulation=
{
"linear": " ",
"nonlinear": "1, 0, 1, 1",
- "number of continuous time states": "11",
+ "number of continuous time states": "10",
"numerical Jacobians": "0"
}
time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 3.501396393403411e-03, 4.242143128067255e-03, 4.39867889508605e-03, 4.431803245097399e-03, 4.438792821019888e-03, 4.440272692590952e-03, 4.440572112798691e-03, 4.44065174087882e-03, 4.440661985427141e-03, 4.440653137862682e-03, 2.397834090515971e-03, 6.946481298655272e-04, 9.09602313186042e-05, 6.909262083354372e-06, 4.639737198885996e-07, 3.107197699137032e-08, 7.696144166402537e-09, 1.156968210125342e-08, -4.611592885339633e-09, -1.5003934095148e-08, 2.042267937213182e-03, 3.625045297667384e-03, 4.202968906611204e-03, 4.376598633825779e-03, 4.4242013245821e-03, 4.436568357050419e-03, 4.439670126885176e-03, 4.440417978912592e-03, 4.440620075911283e-03, 4.440667573362589e-03, 2.39783781580627e-03, 6.946492358110845e-04, 9.096039138967171e-05, 6.909271178301356e-06, 4.639737198885996e-07, 3.107334123342298e-08, 7.693870429648086e-09, 1.158241502707824e-08, -4.597040970111266e-09, -1.503212843090296e-08, 2.042269567027677e-03, 3.625045297667384e-03, 4.202968906611204e-03, 4.376598633825779e-03, 4.424200858920813e-03, 4.436567891389132e-03, 4.439669661223888e-03, 4.440417978912592e-03, 4.440621472895145e-03, 4.440667107701302e-03, 2.39783781580627e-03, 6.946492358110845e-04, 9.096039138967171e-05, 6.909270723554073e-06, 4.639741746359505e-07, 3.107243173872062e-08, 7.694779924349758e-09, 1.158241502707824e-08, -4.596586222760379e-09, -1.50307641888503e-08, 2.042275387793779e-03, 3.62504506483674e-03, 4.202969372272491e-03, 4.376598633825779e-03, 4.424192011356354e-03, 4.436553455889225e-03, 4.439650103449821e-03, 4.440410528331995e-03, 4.440587013959885e-03, 4.440615884959698e-03, 2.397824544459581e-03, 6.946453358978033e-04, 9.095983841689304e-05, 6.909240710228914e-06, 4.639741746359505e-07, 3.107197699137032e-08, 7.700236892560497e-09, 1.153784978669137e-08, -4.656612873077393e-09, -1.492844603490084e-08, 2.042271662503501e-03, 3.625045297667374e-03, 4.202969372272491e-03, 4.376598633825779e-03, 4.424192011356354e-03, 4.436551127582788e-03, 4.439655225723982e-03, 4.440411925315857e-03, 4.440597258508205e-03, 4.440654534846544e-03, 2.397834556177258e-03, 6.946483044885099e-04, 9.096026042243466e-05, 6.909264811838511e-06, 4.639737198885996e-07, 3.107243173872121e-08, 7.695689419051632e-09, 1.157013684860431e-08, -4.612502380041406e-09, -1.5003934095148e-08]
-fan2.m_flow=[0e+00, 3.501242492347956e-03, 4.242110997438431e-03, 4.398672375828028e-03, 4.431801848113537e-03, 4.438792355358601e-03, 4.440272692590952e-03, 4.440572112798691e-03, 4.44065174087882e-03, 4.440661985427141e-03, 4.440653137862682e-03, 2.398072276264429e-03, 6.94765243679285e-04, 9.098378359340131e-05, 6.910980118846021e-06, 4.641105988412164e-07, 3.108107193838805e-08, 7.691596692893672e-09, 1.157241058535874e-08, -4.61841409560293e-09, -1.500302460044622e-08, 2.042017877101898e-03, 3.624944481998682e-03, 4.20293677598238e-03, 4.37658978626132e-03, 4.424198996275663e-03, 4.436567891389132e-03, 4.439670126885176e-03, 4.440417978912592e-03, 4.440620075911283e-03, 4.440667573362589e-03, 2.398076001554728e-03, 6.947664078325033e-04, 9.098395094042644e-05, 6.910989668540356e-06, 4.641101440938655e-07, 3.108152668573894e-08, 7.690687198191881e-09, 1.158468876383267e-08, -4.602497938321903e-09, -1.503121893620118e-08, 2.042019506916392e-03, 3.624944481998682e-03, 4.20293677598238e-03, 4.37658978626132e-03, 4.424198530614376e-03, 4.436567425727844e-03, 4.439669661223888e-03, 4.440417978912592e-03, 4.440621472895145e-03, 4.440667107701302e-03, 2.398076001554728e-03, 6.947663496248424e-04, 9.098394366446882e-05, 6.910989213793073e-06, 4.641105988412164e-07, 3.108152668573835e-08, 7.691141945542667e-09, 1.158423401648179e-08, -4.603862180374563e-09, -1.502985469414853e-08, 2.042025327682495e-03, 3.624944481998682e-03, 4.202937241643667e-03, 4.37658978626132e-03, 4.424189683049917e-03, 4.43655252456665e-03, 4.439650103449821e-03, 4.440410528331995e-03, 4.440587013959885e-03, 4.440615884959698e-03, 2.398062730208039e-03, 6.947625079192221e-04, 9.098339069169015e-05, 6.910958745720563e-06, 4.641119630832691e-07, 3.108107193838805e-08, 7.696598913753405e-09, 1.153921402874403e-08, -4.664343578042462e-09, -1.492799128754996e-08, 2.042021602392217e-03, 3.624944714829316e-03, 4.202937241643667e-03, 4.37658978626132e-03, 4.424189683049917e-03, 4.436550661921501e-03, 4.439654760062695e-03, 4.440411925315857e-03, 4.440597258508205e-03, 4.440654534846544e-03, 2.398072741925716e-03, 6.947654765099287e-04, 9.098381997318938e-05, 6.91098239258281e-06, 4.641110535885673e-07, 3.108107193838805e-08, 7.692506187595427e-09, 1.157241058535874e-08, -4.61841409560293e-09, -1.5003934095148e-08]
-fan3.m_flow=[0e+00, 3.501242492347956e-03, 4.242110997438431e-03, 4.398672375828028e-03, 4.431801848113537e-03, 4.438792355358601e-03, 4.440272692590952e-03, 4.440572112798691e-03, 4.44065174087882e-03, 4.440661985427141e-03, 4.440653137862682e-03, 2.398072276264429e-03, 6.94765243679285e-04, 9.098378359340131e-05, 6.910980118846021e-06, 4.641101440938655e-07, 3.108107193838805e-08, 7.691596692893672e-09, 1.157241058535874e-08, -4.619323590304703e-09, -1.500302460044622e-08, 2.042017877101898e-03, 3.624944481998682e-03, 4.20293677598238e-03, 4.37658978626132e-03, 4.424198996275663e-03, 4.436567891389132e-03, 4.439670126885176e-03, 4.440417978912592e-03, 4.440620075911283e-03, 4.440667573362589e-03, 2.398076001554728e-03, 6.947664078325033e-04, 9.098395094042644e-05, 6.910989668540356e-06, 4.641105988412164e-07, 3.108107193838805e-08, 7.690232450840995e-09, 1.158423401648179e-08, -4.60158844362013e-09, -1.503030944149941e-08, 2.042019506916392e-03, 3.624944481998682e-03, 4.20293677598238e-03, 4.37658978626132e-03, 4.424198530614376e-03, 4.436567425727844e-03, 4.439669661223888e-03, 4.440417978912592e-03, 4.440621472895145e-03, 4.440667107701302e-03, 2.398076001554728e-03, 6.947663496248424e-04, 9.098394366446882e-05, 6.910989668540424e-06, 4.641101440938655e-07, 3.108152668573835e-08, 7.69205144024444e-09, 1.158423401648179e-08, -4.602497938321903e-09, -1.502985469414853e-08, 2.042025327682495e-03, 3.624944481998682e-03, 4.202937241643667e-03, 4.37658978626132e-03, 4.424189683049917e-03, 4.43655252456665e-03, 4.439650103449821e-03, 4.440410528331995e-03, 4.440587013959885e-03, 4.440615884959698e-03, 2.398062730208039e-03, 6.947625079192221e-04, 9.098339069169015e-05, 6.910958745720563e-06, 4.641119630832691e-07, 3.108061719103716e-08, 7.696598913753405e-09, 1.153966877609491e-08, -4.664798325393349e-09, -1.492799128754996e-08, 2.042021602392217e-03, 3.624944714829316e-03, 4.202937241643667e-03, 4.37658978626132e-03, 4.424189683049917e-03, 4.436550661921501e-03, 4.439654760062695e-03, 4.440411925315857e-03, 4.440597258508205e-03, 4.440654534846544e-03, 2.398072741925716e-03, 6.947654765099287e-04, 9.098381997318938e-05, 6.91098239258281e-06, 4.641101440938655e-07, 3.108152668573894e-08, 7.692506187595427e-09, 1.157241058535874e-08, -4.61841409560293e-09, -1.5003934095148e-08]
-fan1.dp=[0e+00, -1.702916015625e+04, -2.4994810546875e+04, -2.68729375e+04, -2.7279142578125e+04, -2.736525390625e+04, -2.7383505859375e+04, -2.7387197265625e+04, -2.738818359375e+04, -2.73883046875e+04, -2.7388201171875e+04, -7.98564013671875e+03, -1.274956420898438e+03, -1.61800048828125e+02, -1.228128147125238e+01, -8.146507740020752e-01, -5.059166252613068e-02, -3.019548486918196e-03, -1.79614798980765e-04, -1.192482886835933e-05, -2.99859675578773e-06, -5.7939482421875e+03, -1.8251650390625e+04, -2.45349375e+04, -2.6603775390625e+04, -2.718563671875e+04, -2.7337833984375e+04, -2.7376072265625e+04, -2.7385294921875e+04, -2.7387791015625e+04, -2.7388376953125e+04, -7.98566552734375e+03, -1.274958740234375e+03, -1.618003540039062e+02, -1.22813034057616e+01, -8.146522045135498e-01, -5.059175193309784e-02, -3.019551746547222e-03, -1.796161668607965e-04, -1.192410127259791e-05, -2.998858690261841e-06, -5.793948242187445e+03, -1.8251650390625e+04, -2.45349375e+04, -2.66037734375e+04, -2.7185634765625e+04, -2.7337830078125e+04, -2.73760703125e+04, -2.7385294921875e+04, -2.738780859375e+04, -2.738837109375e+04, -7.9856650390625e+03, -1.274958618164062e+03, -1.618003540039062e+02, -1.228130340576172e+01, -8.146522045135498e-01, -5.059174820780651e-02, -3.019551746547331e-03, -1.796161232050508e-04, -1.192413037642837e-05, -2.998844138346612e-06, -5.79394921875e+03, -1.8251650390625e+04, -2.4534939453125e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337650390625e+04, -2.7375830078125e+04, -2.738520703125e+04, -2.73873828125e+04, -2.7387740234375e+04, -7.985576171875e+03, -1.274951049804688e+03, -1.6179931640625e+02, -1.228122901916504e+01, -8.146474957466125e-01, -5.059144273400307e-02, -3.019541734829545e-03, -1.79611161001958e-04, -1.192682248074561e-05, -2.99788371194154e-06, -5.793948242187626e+03, -1.82516503906249e+04, -2.45349375e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337625e+04, -2.7375888671875e+04, -2.738522265625e+04, -2.7387509765625e+04, -2.738821484375e+04, -7.9856435546875e+03, -1.274956787109375e+03, -1.618001098632812e+02, -1.228128623962402e+01, -8.146511316299438e-01, -5.059168115258217e-02, -3.019549651071429e-03, -1.796148862922564e-04, -1.19248143164441e-05, -2.99859675578773e-06]
-fan2.dp=[0e+00, -1.702916015625e+04, -2.4994810546875e+04, -2.68729375e+04, -2.7279142578125e+04, -2.736525390625e+04, -2.7383505859375e+04, -2.7387197265625e+04, -2.738818359375e+04, -2.73883046875e+04, -2.7388201171875e+04, -7.98564013671875e+03, -8.403992919921875e+02, -8.571690368652344e+01, -6.476733207702605e+00, -4.296080768108368e-01, -2.667966671288013e-02, -1.592456363141529e-03, -9.489382500760257e-05, -6.218513590283692e-06, -1.35437585413456e-06, -5.7939482421875e+03, -1.8251650390625e+04, -2.45349375e+04, -2.6603775390625e+04, -2.718563671875e+04, -2.7337833984375e+04, -2.7376072265625e+04, -2.7385294921875e+04, -2.7387791015625e+04, -2.7388376953125e+04, -7.98566552734375e+03, -8.404012451171875e+02, -8.571707153320312e+01, -6.47674465179437e+00, -4.296088218688965e-01, -2.667971514165401e-02, -1.592457992956042e-03, -9.48947126744315e-05, -6.218397174961865e-06, -1.354099367745221e-06, -5.793948242187443e+03, -1.8251650390625e+04, -2.45349375e+04, -2.66037734375e+04, -2.7185634765625e+04, -2.7337830078125e+04, -2.73760703125e+04, -2.7385294921875e+04, -2.738780859375e+04, -2.738837109375e+04, -7.9856650390625e+03, -8.404011840820312e+02, -8.571706390380859e+01, -6.476744174957275e+00, -4.296087920665741e-01, -2.667971327900832e-02, -1.592457992956099e-03, -9.489468357060105e-05, -6.218368071131408e-06, -1.354113919660449e-06, -5.79394921875e+03, -1.8251650390625e+04, -2.4534939453125e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337650390625e+04, -2.7375830078125e+04, -2.738520703125e+04, -2.73873828125e+04, -2.7387740234375e+04, -7.985576171875e+03, -8.403944702148438e+02, -8.571651458740234e+01, -6.476705074310303e+00, -4.296063184738159e-01, -2.667955122888088e-02, -1.592452870681882e-03, -9.489138028584421e-05, -6.218862836249173e-06, -1.355132553726435e-06, -5.793948242187626e+03, -1.82516503906249e+04, -2.45349375e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337625e+04, -2.7375888671875e+04, -2.738522265625e+04, -2.7387509765625e+04, -2.738821484375e+04, -7.9856435546875e+03, -8.40399658203125e+02, -8.571694183349609e+01, -6.476735591888428e+00, -4.296082556247711e-01, -2.667967602610588e-02, -1.592456945218146e-03, -9.489385411143303e-05, -6.21852814219892e-06, -1.354361302219331e-06]
-fan3.dp=[0e+00, -1.702916015625e+04, -2.4994810546875e+04, -2.68729375e+04, -2.7279142578125e+04, -2.736525390625e+04, -2.7383505859375e+04, -2.7387197265625e+04, -2.738818359375e+04, -2.73883046875e+04, -2.7388201171875e+04, -7.98564013671875e+03, -1.274956420898438e+03, -1.61800048828125e+02, -1.228128147125238e+01, -8.146507740020752e-01, -5.059166252613068e-02, -3.019548486918196e-03, -1.79614798980765e-04, -1.192482886835933e-05, -2.99859675578773e-06, -5.7939482421875e+03, -1.8251650390625e+04, -2.45349375e+04, -2.6603775390625e+04, -2.718563671875e+04, -2.7337833984375e+04, -2.7376072265625e+04, -2.7385294921875e+04, -2.7387791015625e+04, -2.7388376953125e+04, -7.98566552734375e+03, -1.274958740234375e+03, -1.618003540039062e+02, -1.22813034057616e+01, -8.146522045135498e-01, -5.059175193309784e-02, -3.019551746547222e-03, -1.796161668607965e-04, -1.192410127259791e-05, -2.998858690261841e-06, -5.793948242187445e+03, -1.8251650390625e+04, -2.45349375e+04, -2.66037734375e+04, -2.7185634765625e+04, -2.7337830078125e+04, -2.73760703125e+04, -2.7385294921875e+04, -2.738780859375e+04, -2.738837109375e+04, -7.9856650390625e+03, -1.274958618164062e+03, -1.618003540039062e+02, -1.228130340576172e+01, -8.146522045135498e-01, -5.059174820780651e-02, -3.019551746547331e-03, -1.796161232050508e-04, -1.192413037642837e-05, -2.998844138346612e-06, -5.79394921875e+03, -1.8251650390625e+04, -2.4534939453125e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337650390625e+04, -2.7375830078125e+04, -2.738520703125e+04, -2.73873828125e+04, -2.7387740234375e+04, -7.985576171875e+03, -1.274951049804688e+03, -1.6179931640625e+02, -1.228122901916504e+01, -8.146474957466125e-01, -5.059144273400307e-02, -3.019541734829545e-03, -1.79611161001958e-04, -1.192682248074561e-05, -2.99788371194154e-06, -5.793948242187626e+03, -1.82516503906249e+04, -2.45349375e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337625e+04, -2.7375888671875e+04, -2.738522265625e+04, -2.7387509765625e+04, -2.738821484375e+04, -7.9856435546875e+03, -1.274956787109375e+03, -1.618001098632812e+02, -1.228128623962402e+01, -8.146511316299438e-01, -5.059168115258217e-02, -3.019549651071429e-03, -1.796148862922564e-04, -1.19248143164441e-05, -2.99859675578773e-06]
+fan1.m_flow=[0e+00, 8.212513639591634e-04, 1.741650514304638e-03, 2.654215320944786e-03, 3.552448470145464e-03, 4.422521218657494e-03, 4.44065174087882e-03, 4.440655000507832e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.543968312442303e-03, 2.625523135066032e-03, 1.707070507109165e-03, 7.923736702650765e-04, 5.561441867030226e-07, 5.203673936193809e-09, -2.728484105318822e-12, -2.273736754432321e-12, 1.182343112304807e-11, -2.273736754432321e-12, 6.616142927668989e-04, 1.740629435516894e-03, 2.627881709486246e-03, 3.552448470145464e-03, 4.422527272254229e-03, 4.44065872579813e-03, 4.440662916749716e-03, 4.440650343894958e-03, 4.440654534846544e-03, 4.440655466169119e-03, 3.543970873579383e-03, 2.625611843541265e-03, 1.707245712168515e-03, 7.943314267322381e-04, 5.562574187933933e-07, 1.878106559161097e-09, 2.877186489058658e-09, 2.14140527532436e-09, -4.779394657816738e-09, 1.105490810004994e-09, 7.758288411423516e-04, 1.775929238647223e-03, 2.664240775629878e-03, 3.552449634298682e-03, 4.422519356012344e-03, 4.440684802830219e-03, 4.440659191459417e-03, 4.440655000507832e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.543967148289084e-03, 2.625632798299193e-03, 1.707291114144027e-03, 7.78949586674571e-04, 5.565866558754351e-07, -3.472905518719739e-09, 2.510205376893151e-09, 4.958565114066005e-09, 1.000444171950221e-11, 0e+00, 6.791445193812251e-04, 1.777468831278384e-03, 2.678203163668513e-03, 3.55245778337121e-03, 4.422535188496113e-03, 4.44065360352397e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655931830406e-03, 4.440656397491693e-03, 3.54437530040741e-03, 2.629631198942661e-03, 1.714879530481994e-03, 8.039861568249762e-04, 5.47899617231451e-07, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.890835356898688e-04, 1.747574540786433e-03, 2.680896315723658e-03, 3.552445210516453e-03, 4.422510974109173e-03, 4.440656397491693e-03, 4.440662916749716e-03, 4.440642893314362e-03, 4.440656863152981e-03, 4.440655000507832e-03, 3.543943865224719e-03, 2.625512424856424e-03, 1.707073533907533e-03, 7.789582014083862e-04, 5.564816092373803e-07, 7.275957614183426e-11, -9.094947017729282e-13, -9.094947017729282e-13, 8.640199666842818e-12, -9.094947017729282e-13]
+fan2.m_flow=[0e+00, 8.211774402298033e-04, 1.741553307510912e-03, 2.654119161888957e-03, 3.552354406565428e-03, 4.422486759722233e-03, 4.44065174087882e-03, 4.440655000507832e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544061910361052e-03, 2.625617664307356e-03, 1.707166084088385e-03, 7.924697711132446e-04, 5.582737685472239e-07, 5.220044840825722e-09, 8.185452315956472e-12, 6.821210263296962e-12, 1.182343112304807e-11, -1.818989403545856e-12, 6.614813464693725e-04, 1.740470295771956e-03, 2.627741545438766e-03, 3.552350914105773e-03, 4.422492813318968e-03, 4.44065872579813e-03, 4.440662916749716e-03, 4.440650343894958e-03, 4.440654534846544e-03, 4.440655466169119e-03, 3.544064471498132e-03, 2.625706605613232e-03, 1.707341172732413e-03, 7.944273529574235e-04, 5.58417468710104e-07, 1.887656253529713e-09, 2.87309376290068e-09, 2.146407496184111e-09, -4.779394657816738e-09, 1.10730979940854e-09, 7.757481653243256e-04, 1.775824232026935e-03, 2.664147410541773e-03, 3.552356269210577e-03, 4.422484897077084e-03, 4.440684802830219e-03, 4.440659191459417e-03, 4.440655000507832e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544060746207833e-03, 2.625727560371161e-03, 1.707386691123247e-03, 7.790561649017036e-04, 5.587353371083736e-07, -3.470177034614421e-09, 2.504293661331628e-09, 4.958565114066005e-09, 8.640199666842818e-12, -4.547473508864641e-13, 6.790109327994287e-04, 1.77732587326318e-03, 2.678094664588571e-03, 3.552375128492713e-03, 4.422500729560852e-03, 4.44065360352397e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655931830406e-03, 4.440656397491693e-03, 3.544468898326159e-03, 2.629725495353341e-03, 1.71497487463057e-03, 8.040818502195179e-04, 5.49950073036598e-07, -6.366462912410498e-12, 0e+00, 0e+00, 0e+00, 9.094947017729282e-13, 6.88950240146377e-04, 1.747431815601874e-03, 2.680782461538911e-03, 3.552362322807312e-03, 4.422476515173912e-03, 4.440656397491693e-03, 4.440662916749716e-03, 4.440642893314362e-03, 4.440656863152981e-03, 4.440655000507832e-03, 3.544037463143468e-03, 2.625606954097748e-03, 1.707169110886753e-03, 7.790641393512487e-04, 5.585993676504586e-07, 7.275957614183426e-11, -4.547473508864641e-13, -3.637978807091713e-12, 8.640199666842818e-12, -4.547473508864641e-13]
+fan3.m_flow=[0e+00, 8.211774402298033e-04, 1.741553307510912e-03, 2.654119161888957e-03, 3.552354406565428e-03, 4.422486759722233e-03, 4.44065174087882e-03, 4.440655000507832e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544061910361052e-03, 2.625617664307356e-03, 1.707166084088385e-03, 7.924697711132446e-04, 5.582737685472239e-07, 5.22277332493104e-09, 7.275957614183555e-12, 7.275957614183426e-12, 1.182343112304807e-11, -1.818989403545856e-12, 6.614813464693725e-04, 1.740470295771956e-03, 2.627741545438766e-03, 3.552350914105773e-03, 4.422492813318968e-03, 4.44065872579813e-03, 4.440662916749716e-03, 4.440650343894958e-03, 4.440654534846544e-03, 4.440655466169119e-03, 3.544064471498132e-03, 2.625706605613232e-03, 1.707341172732413e-03, 7.944273529574235e-04, 5.58417468710104e-07, 1.886292011477053e-09, 2.874003257602453e-09, 2.147316990885884e-09, -4.778030415764078e-09, 1.10730979940854e-09, 7.757481653243256e-04, 1.775824232026935e-03, 2.664147410541773e-03, 3.552356269210577e-03, 4.422484897077084e-03, 4.440684802830219e-03, 4.440659191459417e-03, 4.440655000507832e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544060746207833e-03, 2.625727560371161e-03, 1.707386691123247e-03, 7.790561649017036e-04, 5.587353371083736e-07, -3.47154127666708e-09, 2.505203156033401e-09, 4.959474608767778e-09, 8.640199666842818e-12, 0e+00, 6.790109327994287e-04, 1.77732587326318e-03, 2.678094664588571e-03, 3.552375128492713e-03, 4.422500729560852e-03, 4.44065360352397e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655931830406e-03, 4.440656397491693e-03, 3.544468898326159e-03, 2.629725495353341e-03, 1.71497487463057e-03, 8.040818502195179e-04, 5.49950073036598e-07, -6.821210263296962e-12, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 6.88950240146377e-04, 1.747431815601874e-03, 2.680782461538911e-03, 3.552362322807312e-03, 4.422476515173912e-03, 4.440656397491693e-03, 4.440662916749716e-03, 4.440642893314362e-03, 4.440656863152981e-03, 4.440655000507832e-03, 3.544037463143468e-03, 2.625606954097748e-03, 1.707169110886753e-03, 7.790641393512487e-04, 5.585993676504586e-07, 7.275957614183426e-11, -4.547473508864641e-13, -2.728484105318785e-12, 9.094947017729282e-12, -4.547473508864641e-13]
+fan1.dp=[0e+00, -1.44235009765625e+03, -4.38110205078125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.716499609375e+04, -2.73881796875e+04, -2.7388220703125e+04, -2.7388224609375e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349609374995e+03, -9.881174564361572e-01, -6.816117092967033e-08, 8.949427865446022e-09, 3.617606125771999e-08, -3.492459654808044e-10, 5.820766091346741e-11, -1.4423466796875e+03, -4.3811015625e+03, -9.8586640625e+03, -1.7527734375e+04, -2.71650703125e+04, -2.7388263671875e+04, -2.738831640625e+04, -2.7388162109375e+04, -2.7388212890625e+04, -2.7388224609375e+04, -1.7527734375e+04, -9.8586640625e+03, -4.3811015625e+03, -1.442349487304678e+03, -9.880743622779846e-01, -6.803020369261503e-08, 8.905772119760513e-09, 3.690365701913834e-08, -1.309672370553017e-10, 1.455191522836685e-11, -1.442348876953115e+03, -4.38110205078125e+03, -9.8586650390625e+03, -1.7527734375e+04, -2.7164970703125e+04, -2.7388587890625e+04, -2.73882734375e+04, -2.738821875e+04, -2.7388224609375e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38110205078125e+03, -1.442349365234375e+03, -9.884825348854065e-01, -8.668575901537756e-08, 2.793967723846361e-09, 4.703179001808167e-08, -1.455191522836685e-10, 1.455191522836685e-11, -1.442347290039062e+03, -4.3811025390625e+03, -9.8586650390625e+03, -1.7527734375e+04, -2.7165166015625e+04, -2.7388205078125e+04, -2.7388228515625e+04, -2.7388224609375e+04, -2.7388232421875e+04, -2.738823828125e+04, -1.752774609375e+04, -9.8586728515625e+03, -4.38110693359375e+03, -1.442352294921875e+03, -9.829476475715637e-01, 3.332388587296009e-09, 0e+00, 0e+00, 0e+00, 0e+00, -1.442347534179708e+03, -4.381102539062462e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.71648671875e+04, -2.7388236328125e+04, -2.7388322265625e+04, -2.7388072265625e+04, -2.7388244140625e+04, -2.738821875e+04, -1.752773046875e+04, -9.8586611328125e+03, -4.38109912109375e+03, -1.442348022460938e+03, -9.884712696075439e-01, -9.653740562498569e-08, 1.411535777151585e-09, 5.203764885663986e-08, -5.820766091346741e-11, 0e+00]
+fan2.dp=[0e+00, -9.952142944335938e+02, -4.38095751953125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.716499609375e+04, -2.73881796875e+04, -2.7388220703125e+04, -2.7388224609375e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38095654296875e+03, -9.952136840820272e+02, -5.210861563682556e-01, -1.151784090325236e-07, 4.409230314195368e-09, 1.883017830550671e-08, -3.637978807091713e-10, 4.365574568510056e-11, -9.952108154296875e+02, -4.38095654296875e+03, -9.8586640625e+03, -1.7527734375e+04, -2.71650703125e+04, -2.7388263671875e+04, -2.738831640625e+04, -2.7388162109375e+04, -2.7388212890625e+04, -2.7388224609375e+04, -1.7527734375e+04, -9.8586640625e+03, -4.38095654296875e+03, -9.952135620117105e+02, -5.210633873939514e-01, -6.458139978349209e-08, -3.869354259222746e-08, -1.30821717903018e-08, 7.222115527838469e-08, -1.677835825830698e-08, -9.952130737304605e+02, -4.38095703125e+03, -9.8586650390625e+03, -1.7527734375e+04, -2.7164970703125e+04, -2.7388587890625e+04, -2.73882734375e+04, -2.738821875e+04, -2.7388224609375e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38095703125e+03, -9.952135009765625e+02, -5.212786793708801e-01, 6.722984835504644e-09, -3.630702849477337e-08, -5.018955562263727e-08, -1.891748979687691e-10, 2.91038304567337e-11, -9.952113037109375e+02, -4.38095751953125e+03, -9.8586650390625e+03, -1.7527734375e+04, -2.7165166015625e+04, -2.7388205078125e+04, -2.7388228515625e+04, -2.7388224609375e+04, -2.7388232421875e+04, -2.738823828125e+04, -1.752774609375e+04, -9.8586728515625e+03, -4.3809619140625e+03, -9.9521630859375e+02, -5.183597207069397e-01, 1.964508555829525e-09, 0e+00, 0e+00, 0e+00, -2.91038304567337e-11, -9.952116699218966e+02, -4.38095751953121e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.71648671875e+04, -2.7388236328125e+04, -2.7388322265625e+04, -2.7388072265625e+04, -2.7388244140625e+04, -2.738821875e+04, -1.752773046875e+04, -9.8586611328125e+03, -4.3809541015625e+03, -9.952122192382812e+02, -5.212727189064026e-01, -5.200854502618313e-08, 7.421476766467094e-10, 2.754677552729845e-08, -1.600710675120354e-10, 0e+00]
+fan3.dp=[0e+00, -1.44235009765625e+03, -4.38110205078125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.716499609375e+04, -2.73881796875e+04, -2.7388220703125e+04, -2.7388224609375e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349609374995e+03, -9.881174564361572e-01, -6.816117092967033e-08, 8.949427865446022e-09, 3.617606125771999e-08, -3.492459654808044e-10, 5.820766091346741e-11, -1.4423466796875e+03, -4.3811015625e+03, -9.8586640625e+03, -1.7527734375e+04, -2.71650703125e+04, -2.7388263671875e+04, -2.738831640625e+04, -2.7388162109375e+04, -2.7388212890625e+04, -2.7388224609375e+04, -1.7527734375e+04, -9.8586640625e+03, -4.3811015625e+03, -1.442349487304678e+03, -9.880743622779846e-01, -6.803020369261503e-08, 8.905772119760513e-09, 3.690365701913834e-08, -1.309672370553017e-10, 1.455191522836685e-11, -1.442348876953115e+03, -4.38110205078125e+03, -9.8586650390625e+03, -1.7527734375e+04, -2.7164970703125e+04, -2.7388587890625e+04, -2.73882734375e+04, -2.738821875e+04, -2.7388224609375e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38110205078125e+03, -1.442349365234375e+03, -9.884825348854065e-01, -8.668575901537756e-08, 2.793967723846361e-09, 4.703179001808167e-08, -1.455191522836685e-10, 1.455191522836685e-11, -1.442347290039062e+03, -4.3811025390625e+03, -9.8586650390625e+03, -1.7527734375e+04, -2.7165166015625e+04, -2.7388205078125e+04, -2.7388228515625e+04, -2.7388224609375e+04, -2.7388232421875e+04, -2.738823828125e+04, -1.752774609375e+04, -9.8586728515625e+03, -4.38110693359375e+03, -1.442352294921875e+03, -9.829476475715637e-01, 3.332388587296009e-09, 0e+00, 0e+00, 0e+00, 0e+00, -1.442347534179708e+03, -4.381102539062462e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.71648671875e+04, -2.7388236328125e+04, -2.7388322265625e+04, -2.7388072265625e+04, -2.7388244140625e+04, -2.738821875e+04, -1.752773046875e+04, -9.8586611328125e+03, -4.38109912109375e+03, -1.442348022460938e+03, -9.884712696075439e-01, -9.653740562498569e-08, 1.411535777151585e-09, 5.203764885663986e-08, -5.820766091346741e-11, 0e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
index ff52992b6d..58dab32a32 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
@@ -1,4 +1,4 @@
-last-generated=2023-03-21
+last-generated=2024-08-26
statistics-initialization=
{
"nonlinear": "1, 1, 0, 1",
@@ -8,13 +8,13 @@ statistics-simulation=
{
"linear": " ",
"nonlinear": "1, 1, 0, 1",
- "number of continuous time states": "15",
+ "number of continuous time states": "12",
"numerical Jacobians": "0"
}
time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 3.501603612676263e-03, 4.242093302309513e-03, 4.398667253553867e-03, 4.431773908436298e-03, 4.438776522874832e-03, 4.440257791429758e-03, 4.440571181476116e-03, 4.440637771040201e-03, 4.44065174087882e-03, 4.440654534846544e-03, 2.39775120280683e-03, 6.946184439584613e-04, 9.096858411794528e-05, 6.906999260536361e-06, 4.578628249873873e-07, 2.846309143933468e-08, 1.680746208876363e-09, 9.777068044058979e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.042529406026006e-03, 3.625055309385061e-03, 4.202966578304768e-03, 4.376600962132215e-03, 4.424192477017641e-03, 4.436557181179523e-03, 4.439658485352993e-03, 4.440417047590017e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397748408839107e-03, 6.946174544282258e-04, 9.096862777369097e-05, 6.906991529831362e-06, 4.579219421430025e-07, 2.849401425919496e-08, 1.675289240665734e-09, 9.595169103704393e-11, 5.911715561524034e-12, 1.364242052659392e-12, 2.042528940364707e-03, 3.625062061473727e-03, 4.202965181320906e-03, 4.376600962132215e-03, 4.424193874001503e-03, 4.436555318534374e-03, 4.439657088369131e-03, 4.44041658192873e-03, 4.440597724169493e-03, 4.4406414963305e-03, 2.397748176008463e-03, 6.946173962205648e-04, 9.096862049773335e-05, 6.906990165589377e-06, 4.579223968903534e-07, 2.849446900654526e-08, 1.674834493314909e-09, 9.640643838793039e-11, 5.911715561524034e-12, 1.364242052659392e-12, 2.042528241872787e-03, 3.625059965997934e-03, 4.202966578304768e-03, 4.376600962132215e-03, 4.424191545695066e-03, 4.436556249856949e-03, 4.439657554030418e-03, 4.44041658192873e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397748176008463e-03, 6.946174544282258e-04, 9.096862777369097e-05, 6.906990165589377e-06, 4.579219421430025e-07, 2.849446900654584e-08, 1.674834493314847e-09, 9.5042196335271e-11, 5.002220859751105e-12, 0e+00, 2.042529173195382e-03, 3.625056939199557e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.424193874001503e-03, 4.436558112502098e-03, 4.439661279320717e-03, 4.440418444573879e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.397748408839107e-03, 6.946174544282258e-04, 9.096862777369097e-05, 6.906990620336728e-06, 4.579223968903534e-07, 2.849446900654584e-08, 1.674834493314847e-09, 9.595169103704393e-11, 5.911715561524034e-12, 0e+00]
-fan2.m_flow=[0e+00, 8.94938304554671e-04, 2.659900346770883e-03, 3.744737710803747e-03, 4.20454191043973e-03, 4.367383196949959e-03, 4.419264383614063e-03, 4.434681963175535e-03, 4.439042415469885e-03, 4.440231248736382e-03, 4.440545570105314e-03, 4.118423443287611e-03, 2.755253575742245e-03, 1.314270193688571e-03, 4.79498819913714e-04, 1.478829653933644e-04, 4.136235656915233e-05, 1.089678426069437e-05, 2.760351435426855e-06, 6.803561518609058e-07, 1.643602445255965e-07, 2.817567437887192e-04, 1.649774960242212e-03, 3.029943211004138e-03, 3.847507759928703e-03, 4.22018812969327e-03, 4.365534987300634e-03, 4.416652023792267e-03, 4.433353897184134e-03, 4.438519012182951e-03, 4.440050106495619e-03, 4.118283744901419e-03, 2.755215158686042e-03, 1.314259367063642e-03, 4.794959386344976e-04, 1.478819758631289e-04, 4.136218194616958e-05, 1.089681973098777e-05, 2.760192728601396e-06, 6.803948053857312e-07, 1.644980329729151e-07, 2.817567437887156e-04, 1.64977484382689e-03, 3.029949264600873e-03, 3.847504034638405e-03, 4.220184404402971e-03, 4.365536384284496e-03, 4.416650161147118e-03, 4.43335110321641e-03, 4.438509233295918e-03, 4.440042190253735e-03, 4.118281416594982e-03, 2.755214227363467e-03, 1.314259134232998e-03, 4.794958513230085e-04, 1.478819467592984e-04, 4.136217830819032e-05, 1.089681882149323e-05, 2.760191364359343e-06, 6.803943506383803e-07, 1.644957592361607e-07, 2.817555505316705e-04, 1.649772166274488e-03, 3.029946936294436e-03, 3.847504034638405e-03, 4.220190457999706e-03, 4.365535452961922e-03, 4.416650626808405e-03, 4.433352500200272e-03, 4.438517615199089e-03, 4.440048709511757e-03, 4.118283744901419e-03, 2.755215158686042e-03, 1.314259367063642e-03, 4.794959095306695e-04, 1.478819613112137e-04, 4.136218194616958e-05, 1.089682064048247e-05, 2.760192273854045e-06, 6.803948053857312e-07, 1.644957592361607e-07, 2.817579079419473e-04, 1.649776124395415e-03, 3.029946936294436e-03, 3.847504267469049e-03, 4.220184870064259e-03, 4.365535452961922e-03, 4.416664596647024e-03, 4.433366004377604e-03, 4.438529722392559e-03, 4.440051503479481e-03, 4.118284210562706e-03, 2.755215391516685e-03, 1.314259367063642e-03, 4.794959386344999e-04, 1.478819758631289e-04, 4.136218194616958e-05, 1.089682154997718e-05, 2.760191819106694e-06, 6.803948053857312e-07, 1.644957592361607e-07]
-fan3.m_flow=[0e+00, 1.450190087780356e-03, 3.080722643062472e-03, 3.911587875336409e-03, 4.256732761859894e-03, 4.381781443953514e-03, 4.422977566719055e-03, 4.435604438185692e-03, 4.439265932887793e-03, 4.440284334123135e-03, 4.440558142960072e-03, 4.149960819631815e-03, 3.034249879419804e-03, 1.892999745905399e-03, 8.64098488818852e-04, 2.621285384520888e-04, 7.09153973730281e-05, 1.824533683247859e-05, 4.546296622720547e-06, 1.107147909351625e-06, 2.650272108439822e-07, 3.240082587581128e-04, 2.085338812321424e-03, 3.275965107604861e-03, 3.94449895247817e-03, 4.251337610185146e-03, 4.374356009066105e-03, 4.418967291712761e-03, 4.433934111148119e-03, 4.438660107553005e-03, 4.440083634108305e-03, 4.149817395955324e-03, 3.034196794033051e-03, 1.89297751057893e-03, 8.640842279419263e-04, 2.621245512273163e-04, 7.09145751898177e-05, 1.824535320338327e-05, 4.545952378975926e-06, 1.107211119233398e-06, 2.652700459293555e-07, 3.240090736653612e-04, 2.085291082039475e-03, 3.275923663750291e-03, 3.944504074752331e-03, 4.25132317468524e-03, 4.374359734356403e-03, 4.418967291712761e-03, 4.43393224850297e-03, 4.438652656972408e-03, 4.440077114850283e-03, 4.149815067648888e-03, 3.034195629879832e-03, 1.892976928502321e-03, 8.640838786959648e-04, 2.621244639158249e-04, 7.091454608598645e-05, 1.824535502237295e-05, 4.545948286249768e-06, 1.107211119233398e-06, 2.652673174452502e-07, 3.240096848458052e-04, 2.086654538288713e-03, 3.275966737419367e-03, 3.944503609091043e-03, 4.251360893249512e-03, 4.374357406049967e-03, 4.418967291712761e-03, 4.433933179825544e-03, 4.438659176230431e-03, 4.44008270278573e-03, 4.149816930294037e-03, 3.034196561202407e-03, 1.892977394163609e-03, 8.640841697342694e-04, 2.621245512273163e-04, 7.091456791386008e-05, 1.824535684136208e-05, 4.545951014733873e-06, 1.107211119233398e-06, 2.652686816873029e-07, 3.240084915887708e-04, 2.085314365103827e-03, 3.2759930472821e-03, 3.944506868720055e-03, 4.251324106007814e-03, 4.374356009066105e-03, 4.418975207954645e-03, 4.433942958712578e-03, 4.438669420778751e-03, 4.440085031092167e-03, 4.149817861616611e-03, 3.034196794033051e-03, 1.89297751057893e-03, 8.640842861495912e-04, 2.621245803311467e-04, 7.09145751898177e-05, 1.824536229833029e-05, 4.54594919574447e-06, 1.107211119233398e-06, 2.652673174452502e-07]
-fan1.dp=[0e+00, -1.702959765625e+04, -2.499368359375e+04, -2.6872744140625e+04, -2.727878125e+04, -2.7365052734375e+04, -2.7383322265625e+04, -2.7387189453125e+04, -2.7388005859375e+04, -2.73881796875e+04, -2.7388216796875e+04, -7.98508837890625e+03, -1.274895263671875e+03, -1.618077697753906e+02, -1.227932453155512e+01, -8.13438892364502e-01, -5.041713640093803e-02, -2.984184306114897e-03, -1.707292831270024e-04, -9.510666131973267e-06, -5.186739144846797e-07, -5.7944150390625e+03, -1.825154296875e+04, -2.45347578125e+04, -2.6603802734375e+04, -2.718553125e+04, -2.7337697265625e+04, -2.7375927734375e+04, -2.738528515625e+04, -2.738753125e+04, -2.7388064453125e+04, -7.9850693359375e+03, -1.274893798828125e+03, -1.618075866699219e+02, -1.227931022644031e+01, -8.134448528289795e-01, -5.041838064789772e-02, -2.984314691275358e-03, -1.70696948771365e-04, -9.512295946478844e-06, -5.198817234486341e-07, -5.794407714843695e+03, -1.8251611328125e+04, -2.4534744140625e+04, -2.66038046875e+04, -2.7185546875e+04, -2.733767578125e+04, -2.7375912109375e+04, -2.738527734375e+04, -2.7387513671875e+04, -2.7388056640625e+04, -7.985068359375e+03, -1.274893798828125e+03, -1.618075866699219e+02, -1.227930927276611e+01, -8.134449124336243e-01, -5.041839554905789e-02, -2.98431678675126e-03, -1.706966722849756e-04, -9.512295946478844e-06, -5.198671715334058e-07, -5.7944033203125e+03, -1.825158984375e+04, -2.45347578125e+04, -2.66038046875e+04, -2.7185517578125e+04, -2.733768359375e+04, -2.7375921875e+04, -2.738528125e+04, -2.738753125e+04, -2.7388064453125e+04, -7.98506884765625e+03, -1.274893798828125e+03, -1.618075866699219e+02, -1.227931022644043e+01, -8.134449124336243e-01, -5.041839182376862e-02, -2.98431608825922e-03, -1.706967741483822e-04, -9.512295946478844e-06, -5.198671715334058e-07, -5.794409667968876e+03, -1.82515566406249e+04, -2.4534748046875e+04, -2.6603806640625e+04, -2.7185544921875e+04, -2.733770703125e+04, -2.737596484375e+04, -2.7385302734375e+04, -2.738754296875e+04, -2.7388064453125e+04, -7.9850693359375e+03, -1.274893798828125e+03, -1.618075866699219e+02, -1.227931022644043e+01, -8.13444972038269e-01, -5.041839927434921e-02, -2.984317252412438e-03, -1.706966431811452e-04, -9.512295946478844e-06, -5.198671715334058e-07]
-fan2.dp=[0e+00, -1.237156127929688e+03, -9.827734375e+03, -1.947737109375e+04, -2.455348046875e+04, -2.6491966796875e+04, -2.7125037109375e+04, -2.73146015625e+04, -2.7368337890625e+04, -2.7382994140625e+04, -2.7386869140625e+04, -2.3556548828125e+04, -1.05424462890625e+04, -2.428752197265625e+03, -5.125163574218735e+02, -1.404957580566406e+02, -3.881412506103516e+01, -1.021537399291989e+01, -2.587551832199097e+00, -6.37761116027832e-01, -1.540694832801819e-01, -2.771497192382812e+02, -3.782196533203125e+03, -1.2751853515625e+04, -2.0560908203125e+04, -2.473651171875e+04, -2.6469544921875e+04, -2.7092974609375e+04, -2.7298248046875e+04, -2.7361880859375e+04, -2.7380759765625e+04, -2.3554953125e+04, -1.054215234375e+04, -2.42871435546875e+03, -5.125125122070284e+02, -1.404947967529297e+02, -3.881396102905273e+01, -1.0215407371521e+01, -2.587402582168579e+00, -6.377968788146973e-01, -1.541981846094131e-01, -2.771497192382776e+02, -3.782195556640625e+03, -1.27519052734375e+04, -2.0560869140625e+04, -2.473646875e+04, -2.6469564453125e+04, -2.7092951171875e+04, -2.7298212890625e+04, -2.736176171875e+04, -2.7380666015625e+04, -2.3554923828125e+04, -1.0542146484375e+04, -2.42871337890625e+03, -5.12512451171875e+02, -1.404947662353516e+02, -3.881395339965778e+01, -1.021540737152115e+01, -2.587401151657104e+00, -6.37796938419342e-01, -1.541965454816818e-01, -2.771484375e+02, -3.782183349609375e+03, -1.2751884765625e+04, -2.0560869140625e+04, -2.47365390625e+04, -2.6469552734375e+04, -2.70929609375e+04, -2.7298232421875e+04, -2.73618671875e+04, -2.738074609375e+04, -2.355494921875e+04, -1.054215234375e+04, -2.42871435546875e+03, -5.125125122070312e+02, -1.404947967529297e+02, -3.881395721435547e+01, -1.0215407371521e+01, -2.587401866912842e+00, -6.37796938419342e-01, -1.541971862316132e-01, -2.771509399414181e+02, -3.782201416015565e+03, -1.2751884765625e+04, -2.056087109375e+04, -2.4736474609375e+04, -2.6469552734375e+04, -2.7093130859375e+04, -2.7298392578125e+04, -2.7362015625e+04, -2.738077734375e+04, -2.3554958984375e+04, -1.0542154296875e+04, -2.428714599609375e+03, -5.125125122070312e+02, -1.404947967529297e+02, -3.881396102905273e+01, -1.021540832519531e+01, -2.587401390075684e+00, -6.377969980239868e-01, -1.541963815689087e-01]
-fan3.dp=[0e+00, -3.08101904296875e+03, -1.3182939453125e+04, -2.12513984375e+04, -2.5165326171875e+04, -2.6666720703125e+04, -2.7170654296875e+04, -2.732596875e+04, -2.737109375e+04, -2.7383650390625e+04, -2.7387025390625e+04, -2.3918861328125e+04, -1.27860341796875e+04, -4.97652197265625e+03, -1.616467285156246e+03, -4.679700317382812e+02, -1.260967102050781e+02, -3.243273162841788e+01, -8.081270217895508e+00, -1.96800434589386e+00, -4.710982441902161e-01, -5.800882568359375e+02, -6.0406630859375e+03, -1.49067607421875e+04, -2.16105078125e+04, -2.5102802734375e+04, -2.657660546875e+04, -2.7121384765625e+04, -2.7305388671875e+04, -2.736362109375e+04, -2.7381173828125e+04, -2.391720703125e+04, -1.27855869140625e+04, -4.976404296875e+03, -1.616437622070304e+03, -4.679626770019531e+02, -1.260954742431641e+02, -3.243271255493164e+01, -8.080656051635742e+00, -1.968116402626038e+00, -4.715293049812317e-01, -5.800897827148358e+02, -6.04057177734375e+03, -1.4906724609375e+04, -2.16104921875e+04, -2.5102765625e+04, -2.657664453125e+04, -2.7121384765625e+04, -2.7305369140625e+04, -2.73635390625e+04, -2.738109765625e+04, -2.3917177734375e+04, -1.27855771484375e+04, -4.97640185546875e+03, -1.616436889648438e+03, -4.679624938964844e+02, -1.2609543609619e+02, -3.243270874023486e+01, -8.080648422241211e+00, -1.968116164207458e+00, -4.715237021446228e-01, -5.800908813476562e+02, -6.04061181640625e+03, -1.49066943359375e+04, -2.1610484375e+04, -2.5102833984375e+04, -2.6576634765625e+04, -2.7121384765625e+04, -2.7305380859375e+04, -2.7363611328125e+04, -2.73811640625e+04, -2.3917203125e+04, -1.27855859375e+04, -4.976404296875e+03, -1.6164375e+03, -4.67962646484375e+02, -1.260954742431641e+02, -3.243271636962891e+01, -8.080652236938477e+00, -1.968116521835327e+00, -4.715259075164795e-01, -5.800886840820579e+02, -6.040645507812425e+03, -1.49067509765625e+04, -2.161050390625e+04, -2.5102775390625e+04, -2.657660546875e+04, -2.712148046875e+04, -2.73055e+04, -2.7363732421875e+04, -2.738119140625e+04, -2.3917212890625e+04, -1.2785587890625e+04, -4.97640478515625e+03, -1.616437744140625e+03, -4.679627075195312e+02, -1.260954895019531e+02, -3.243272018432617e+01, -8.08065128326416e+00, -1.968116879463196e+00, -4.71523255109787e-01]
+fan1.m_flow=[0e+00, 7.788031361997128e-04, 1.776682795025408e-03, 2.664240309968591e-03, 3.552448004484177e-03, 4.422476515173912e-03, 4.440655000507832e-03, 4.440655000507832e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.775755430571735e-03, 7.781410822644806e-04, 5.577703632297926e-07, -1.678017724771053e-10, -1.823536877054713e-10, -4.18367562815547e-11, -2.864908310584724e-11, -1.591615728102624e-11, 7.794183329679072e-04, 1.774212694726884e-03, 2.658100565895438e-03, 3.552448004484177e-03, 4.42249933257699e-03, 4.440658260136843e-03, 4.440655000507832e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.775976503267884e-03, 7.792874239385079e-04, 5.565284482145216e-07, -4.189587343716994e-09, 1.455191522836685e-10, -1.262833393411711e-09, -1.417447492713109e-09, 9.777068044058979e-11, 7.78923451434816e-04, 1.776683377102017e-03, 2.664240309968591e-03, 3.552448004484177e-03, 4.42248210310936e-03, 4.440653137862682e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.775739481672645e-03, 7.792765973135829e-04, 5.583192432823125e-07, 1.182343112323416e-11, 1.182343112304829e-10, -8.089955372270197e-10, 7.003109203651547e-11, 1.323314791079611e-10, 7.788782240822911e-04, 1.776652759872377e-03, 2.664298284798861e-03, 3.552448004484177e-03, 4.422479309141636e-03, 4.440663382411003e-03, 4.440654534846544e-03, 4.440655931830406e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.775203971192241e-03, 7.78520479798317e-04, 5.572505870077293e-07, 9.936229616869241e-10, 6.662048690486699e-10, 1.364242052659392e-12, 2.501110429875553e-11, 3.701643436215818e-10, 7.789247320033709e-04, 1.777089666575185e-03, 2.66424217261374e-03, 3.552449401468039e-03, 4.422537516802549e-03, 4.440655000507832e-03, 4.440656397491693e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.773489522747695e-03, 7.740117725916207e-04, 5.574688657361548e-07, 5.557012627832592e-10, -1.327862264588475e-10, -2.009983290918171e-10, -2.837623469531536e-10, -1.84172677109018e-10]
+fan2.m_flow=[0e+00, 7.2104373248294e-04, 1.726206741295755e-03, 2.614634577184916e-03, 3.502998501062393e-03, 4.386134911328554e-03, 4.44065360352397e-03, 4.440643824636936e-03, 4.440655000507832e-03, 4.440655000507832e-03, 4.440655000507832e-03, 3.601892618462443e-03, 2.713678637519479e-03, 1.825259416364133e-03, 8.388031856156861e-04, 8.309280019602738e-06, -1.637090463191271e-10, -2.191882231272748e-10, -5.95719029661268e-11, -3.865352482534945e-11, -1.818989403545856e-11, 7.220402476377785e-04, 1.726041780784726e-03, 2.614828990772367e-03, 3.503010142594576e-03, 4.386105574667454e-03, 4.4406708329916e-03, 4.44065360352397e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.601892618462443e-03, 2.713678870350122e-03, 1.825428218580782e-03, 8.393025491386602e-04, 8.339621672348585e-06, -7.580638339277357e-10, -2.733031578827649e-10, -1.321950549026951e-09, -9.176801540888846e-10, 1.432454155292362e-10, 7.212853524833869e-04, 1.726489863358438e-03, 2.61486042290926e-03, 3.503003623336554e-03, 4.38612699508667e-03, 4.440643358975649e-03, 4.440655931830406e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.601892618462443e-03, 2.713678870350122e-03, 1.825231243856251e-03, 8.387729758396745e-04, 8.276602784462739e-06, -3.432887751841663e-09, 6.871232471894854e-10, -8.535607776138932e-10, -1.068656274583191e-10, 4.774847184307873e-11, 7.213184726424515e-04, 1.726424670778215e-03, 2.614853205159307e-03, 3.503006417304277e-03, 4.386126529425383e-03, 4.440696910023689e-03, 4.440648946911097e-03, 4.440661519765854e-03, 4.440656397491693e-03, 4.440655466169119e-03, 3.601892618462443e-03, 2.713678870350122e-03, 1.824794453568757e-03, 8.382944506593049e-04, 8.353237717528827e-06, 1.852185960160568e-09, -1.468833943363279e-09, -1.182343112304807e-11, -2.091837814077735e-11, -4.279172571841627e-10, 7.213917560875513e-04, 1.726950402371576e-03, 2.614560769870877e-03, 3.503003623336554e-03, 4.386139567941427e-03, 4.440663382411003e-03, 4.440662451088428e-03, 4.440657328814268e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.601874224841595e-03, 2.71367677487433e-03, 1.82338198646903e-03, 8.351024589501321e-04, 8.427092325291596e-06, 3.94311427953653e-09, -4.170033207628876e-10, 1.20508047984913e-10, -3.014974936377257e-10, -3.351487976033241e-10]
+fan3.m_flow=[0e+00, 1.123789843404666e-07, 2.248757482448127e-07, 3.373747858859133e-07, 4.498720045376103e-07, 5.623701326840091e-07, 6.748678060830571e-07, 7.873663889768069e-07, 8.998640623758547e-07, 1.012361281027552e-06, 1.124859863921301e-06, 1.237357537320349e-06, 1.349856120214099e-06, 1.462353793613147e-06, 1.574851467012195e-06, 1.681028152233921e-06, 1.568412699270993e-06, 1.455914571124594e-06, 1.343416897725547e-06, 1.230918769579148e-06, 1.1184210961801e-06, 1.225424057338387e-06, 1.337921275990084e-06, 1.45041803989443e-06, 1.562917987030232e-06, 1.675416115176631e-06, 1.787913333828328e-06, 1.900411461974727e-06, 2.012909590121126e-06, 2.125407263520174e-06, 2.237904936919222e-06, 2.35040306506562e-06, 2.462900738464668e-06, 2.575398866611067e-06, 2.687896994757466e-06, 2.790189682855271e-06, 2.677687007235363e-06, 2.565189333836315e-06, 2.452692115184618e-06, 2.34019444178557e-06, 2.227696313639171e-06, 2.331317318748915e-06, 2.443814992147963e-06, 2.556313120294362e-06, 2.668810338946059e-06, 2.781308921839809e-06, 2.893806595238857e-06, 3.006303813890554e-06, 3.118801942036953e-06, 3.231299615436001e-06, 3.343797288835049e-06, 3.456294962234097e-06, 3.568793090380495e-06, 3.681290763779543e-06, 3.793788437178591e-06, 3.894368092005607e-06, 3.781865871133049e-06, 3.669367742986652e-06, 3.556869614840252e-06, 3.444371941441204e-06, 3.331874268042156e-06, 3.434788141021272e-06, 3.547285359672969e-06, 3.65978439731407e-06, 3.772280706471065e-06, 3.884778834617464e-06, 3.997276508016512e-06, 4.10977418141556e-06, 4.222271400067258e-06, 4.334769528213655e-06, 4.447267201612704e-06, 4.559764420264401e-06, 4.672261638916098e-06, 4.784759312315146e-06, 4.897256530966843e-06, 4.994486971554579e-06, 4.881990207650233e-06, 4.769492534251185e-06, 4.656995315599488e-06, 4.544495823211037e-06, 4.431977686181199e-06, 4.532826096692589e-06, 4.645323315344284e-06, 4.757820988743333e-06, 4.87031820739503e-06, 4.982815426046727e-06, 5.095313554193126e-06, 5.207810772844823e-06, 5.320308446243871e-06, 5.432805664895568e-06, 5.545302883547265e-06, 5.657800556946313e-06, 5.770297320850659e-06, 5.882794994249707e-06, 5.995291758154053e-06, 6.0923989622097e-06, 5.979902198305354e-06, 5.867404524906306e-06, 5.754907306254609e-06, 5.642410087602912e-06, 5.529912868951214e-06]
+fan1.dp=[0e+00, -1.442349365234375e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7164447265625e+04, -2.7388220703125e+04, -2.738822265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811025390625e+03, -1.442349243164058e+03, -9.91596519947052e-01, 2.066371962428093e-09, 1.455191522836668e-11, 0e+00, 0e+00, 0e+00, -1.442349365234375e+03, -4.38110302734375e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.7164728515625e+04, -2.738826171875e+04, -2.738822265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.38110302734375e+03, -1.442349365234365e+03, -9.89658534526825e-01, 1.79570633918047e-08, 3.680179361253977e-08, -9.895302355289459e-10, -4.220055416226387e-10, -1.455191522836685e-11, -1.442349487304678e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7164517578125e+04, -2.738819921875e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.38110302734375e+03, -1.442349365234375e+03, -9.908282160758972e-01, -2.105662133544588e-08, 1.047737896442426e-09, 4.365574568510056e-11, 0e+00, 0e+00, -1.442349365234375e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.71644765625e+04, -2.7388326171875e+04, -2.7388216796875e+04, -2.7388234375e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.38110302734375e+03, -1.442349243164062e+03, -9.915400743484497e-01, 1.979060471057892e-09, -3.521563485264778e-09, 0e+00, -4.365574568510056e-11, -6.592017598450184e-09, -1.442352783203146e+03, -4.381110351562462e+03, -9.8586767578125e+03, -1.752775e+04, -2.7165193359375e+04, -2.7388220703125e+04, -2.7388240234375e+04, -2.7388228515625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.3811025390625e+03, -1.442349243164062e+03, -9.910746812820435e-01, -1.8453283701092e-07, -2.328306436538696e-10, 5.820766091346741e-10, 1.455191522836685e-11, -5.820766091346741e-11]
+fan2.dp=[0e+00, -8.873370361328125e+02, -4.13925634765625e+03, -9.495646484375e+03, -1.7044076171875e+04, -2.6720673828125e+04, -2.7388203125e+04, -2.7388080078125e+04, -2.738821875e+04, -2.738822265625e+04, -2.738822265625e+04, -1.8018109375e+04, -1.0227232421875e+04, -4.62676708984375e+03, -1.115340454101558e+03, -7.776779651641846e+00, 1.529430446680635e-04, 2.053629432339213e-04, 5.555119423661381e-05, 3.615838068071753e-05, 1.67655962286517e-05, -8.891307373046875e+02, -4.1384462890625e+03, -9.4969736328125e+03, -1.7044189453125e+04, -2.672031640625e+04, -2.73884140625e+04, -2.7388205078125e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.8018111328125e+04, -1.02272333984375e+04, -4.627623046875e+03, -1.116384399414053e+03, -7.805173397064209e+00, 7.157260552048683e-04, 2.551261568441987e-04, 1.239163684658706e-03, 8.613077225163579e-04, -1.343413023278117e-04, -8.87771667480461e+02, -4.14060986328125e+03, -9.4972822265625e+03, -1.7044125e+04, -2.6720578125e+04, -2.7388078125e+04, -2.738823046875e+04, -2.7388224609375e+04, -2.73882265625e+04, -2.73882265625e+04, -1.8018111328125e+04, -1.0227234375e+04, -4.62662451171875e+03, -1.115281982421875e+03, -7.746200084686279e+00, 3.212120383977651e-03, -6.434209644794823e-04, 8.005665149539709e-04, 9.992535342462361e-05, -4.498942871578038e-05, -8.878310546875e+02, -4.1402978515625e+03, -9.49723046875e+03, -1.7044154296875e+04, -2.6720572265625e+04, -2.7388734375e+04, -2.73881484375e+04, -2.738830078125e+04, -2.7388236328125e+04, -2.7388224609375e+04, -1.8018111328125e+04, -1.0227234375e+04, -4.62440869140625e+03, -1.114283447265625e+03, -7.817917823791504e+00, -1.734911347739398e-03, 1.373013714328408e-03, 1.071814040187746e-05, 1.944902760442346e-05, 3.931776736862957e-04, -8.879628906250201e+02, -4.14281591796871e+03, -9.495109375e+03, -1.7044126953125e+04, -2.6720732421875e+04, -2.7388322265625e+04, -2.7388314453125e+04, -2.7388248046875e+04, -2.73882265625e+04, -2.7388224609375e+04, -1.8017927734375e+04, -1.02272177734375e+04, -4.61724951171875e+03, -1.107640014648438e+03, -7.88703727722168e+00, -3.690893528982997e-03, 3.900671727024019e-04, -1.11761357402429e-04, 2.828065189532936e-04, 3.136120794806629e-04]
+fan3.dp=[0e+00, -1.998085379600525e-01, -3.998070359230042e-01, -5.998085141181946e-01, -7.998080849647522e-01, -9.998080730438232e-01, -1.199808120727539e+00, -1.399808049201966e+00, -1.599808096885681e+00, -1.799808025360107e+00, -1.999808073043823e+00, -2.199808120727539e+00, -2.399808168411255e+00, -2.599807977676392e+00, -2.799808025360108e+00, -2.988526344299316e+00, -2.788318395614624e+00, -2.588318586349487e+00, -2.388318538665771e+00, -2.188318729400635e+00, -1.988318562507629e+00, -2.178592205047607e+00, -2.378592252731323e+00, -2.57859206199646e+00, -2.778592109680176e+00, -2.978592157363892e+00, -3.178592205047607e+00, -3.378592252731323e+00, -3.578592061996461e+00, -3.778592109680176e+00, -3.978592157363892e+00, -4.178592205047607e+00, -4.378592014312744e+00, -4.578592300415039e+00, -4.778592109680177e+00, -4.960408210754395e+00, -4.76039981842041e+00, -4.560400009155273e+00, -4.360400676727295e+00, -4.160400390625e+00, -3.960400342941284e+00, -4.14466094970703e+00, -4.344660758972168e+00, -4.544661045074463e+00, -4.7446608543396e+00, -4.944660663604736e+00, -5.144660949707031e+00, -5.344660758972168e+00, -5.544661045074463e+00, -5.7446608543396e+00, -5.944660663604736e+00, -6.144660949707031e+00, -6.344660758972168e+00, -6.544661045074463e+00, -6.7446608543396e+00, -6.923431396484375e+00, -6.723422527313231e+00, -6.523422241210939e+00, -6.323422431945801e+00, -6.123422622680664e+00, -5.923422336578369e+00, -6.106425285339355e+00, -6.306425094604492e+00, -6.506424903869629e+00, -6.706425189971924e+00, -6.906424999237061e+00, -7.106425285339355e+00, -7.306425094604492e+00, -7.506424903869631e+00, -7.706425189971922e+00, -7.906424999237061e+00, -8.106425285339355e+00, -8.306425094604492e+00, -8.506424903869629e+00, -8.706424713134766e+00, -8.879240989685059e+00, -8.679242134094238e+00, -8.479241371154785e+00, -8.279241561889648e+00, -8.079240798950195e+00, -7.879234790802002e+00, -8.058533668518068e+00, -8.258533477783201e+00, -8.45853328704834e+00, -8.658534049987793e+00, -8.85853385925293e+00, -9.058533668518066e+00, -9.258533477783203e+00, -9.45853328704834e+00, -9.658534049987793e+00, -9.85853385925293e+00, -1.005853366851807e+01, -1.02585334777832e+01, -1.045853328704834e+01, -1.065853404998779e+01, -1.0831130027771e+01, -1.063113117218018e+01, -1.043113040924072e+01, -1.023113059997559e+01, -1.003113079071045e+01, -9.831130981445312e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_PressureCurve.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_PressureCurve.txt
index 671a5d27cf..0ec168773e 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_PressureCurve.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_PressureCurve.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-01
+last-generated=2024-08-26
statistics-initialization=
{
"nonlinear": "1",
@@ -8,7 +8,7 @@ statistics-simulation=
{
"linear": " ",
"nonlinear": "1",
- "number of continuous time states": "2",
+ "number of continuous time states": "1",
"numerical Jacobians": "0"
}
time=[0e+00, 1e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_Pump_y_stratos.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_Pump_y_stratos.txt
index 806384f990..880758bfa2 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_Pump_y_stratos.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_Pump_y_stratos.txt
@@ -1,24 +1,24 @@
-last-generated=2020-08-17
+last-generated=2024-08-26
statistics-simulation=
{
"linear": " ",
"nonlinear": " ",
- "number of continuous time states": "20",
+ "number of continuous time states": "10",
"numerical Jacobians": "0"
}
time=[0e+00, 1e+03]
-pump1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.105801582336426e+01, 1.110439014434814e+01, 1.111040306091309e+01, 1.111104297637939e+01, 1.111110496520996e+01, 1.111110973358154e+01, 1.111111164093018e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
-pump2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.108942699432373e+01, 1.129776096343994e+01, 1.150609397888184e+01, 1.171442699432373e+01, 1.192276096343994e+01, 1.213109397888184e+01, 1.233942699432373e+01, 1.254776096343994e+01, 1.275609397888184e+01, 1.296442699432373e+01, 1.317276096343994e+01, 1.338109397888184e+01, 1.358942699432373e+01, 1.379776096343994e+01, 1.400609397888184e+01, 1.421442699432373e+01, 1.442276096343994e+01, 1.463109397888184e+01, 1.483942699432373e+01, 1.504776096343994e+01, 1.522468376159668e+01, 1.527105712890625e+01, 1.527706909179688e+01, 1.527770900726318e+01, 1.527777099609375e+01, 1.527777671813965e+01, 1.527777862548828e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01]
-pump3.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.105801582336426e+01, 1.110439014434814e+01, 1.111040306091309e+01, 1.111104297637939e+01, 1.111110496520996e+01, 1.111110973358154e+01, 1.111111164093018e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
-pump4.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.058016777038574e+00, 6.104390144348145e+00, 6.110403060913086e+00, 6.111042499542236e+00, 6.111104488372803e+00, 6.111110687255859e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00]
-pump5.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.391349315643311e+00, 4.437723159790039e+00, 4.443736553192139e+00, 4.444375991821289e+00, 4.444437980651855e+00, 4.444443702697754e+00, 4.444444179534912e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00]
-forcedPump1.dp=[7.83562578125e+04, 9.90089765625e+04, 1.00647609375e+05, 1.00770484375e+05, 1.0077965625e+05, 1.0078034375e+05, 1.00780390625e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007768984375e+05, 1.007680078125e+05, 1.007576015625e+05, 1.007466875e+05, 1.00735515625e+05, 1.0072421875e+05, 1.00712953125e+05, 1.007018515625e+05, 1.006910390625e+05, 1.006806640625e+05, 1.006708671875e+05, 1.006617734375e+05, 1.006535234375e+05, 1.006462578125e+05, 1.00640109375e+05, 1.006352109375e+05, 1.0063134375e+05, 1.0062796875e+05, 1.00624546875e+05, 1.00620578125e+05, 1.00615515625e+05, 1.00608859375e+05, 1.006000859375e+05, 1.005886640625e+05, 1.005740703125e+05, 1.00555796875e+05, 1.005333125e+05, 1.005061015625e+05, 1.00473640625e+05, 1.004353984375e+05, 1.00390828125e+05, 1.003189453125e+05, 1.002041640625e+05, 1.000486484375e+05, 9.98545390625e+04, 9.96240078125e+04, 9.93592109375e+04, 9.9062296875e+04, 9.87354296875e+04, 9.8380765625e+04, 9.800046875e+04, 9.75966875e+04, 9.71715625e+04, 9.67250625e+04, 9.62545234375e+04, 9.5757390625e+04, 9.52311015625e+04, 9.46731015625e+04, 9.40808359375e+04, 9.345175e+04, 9.27832890625e+04, 9.2072890625e+04, 9.13180078125e+04, 9.06401015625e+04, 9.0456375e+04, 9.043234375e+04, 9.04297890625e+04, 9.04295390625e+04, 9.0429515625e+04, 9.04295078125e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04]
-forcedPump2.dp=[7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.835315625e+04, 7.83452421875e+04, 7.83359609375e+04, 7.83262109375e+04, 7.8316265625e+04, 7.83062890625e+04, 7.82964296875e+04, 7.828684375e+04, 7.82776875e+04, 7.82691171875e+04, 7.82612890625e+04, 7.82543515625e+04, 7.824846875e+04, 7.8243796875e+04, 7.824025e+04, 7.8237234375e+04, 7.823415625e+04, 7.82304296875e+04, 7.82254609375e+04, 7.82186640625e+04, 7.82094375e+04, 7.81971953125e+04, 7.818134375e+04, 7.8161296875e+04, 7.81364609375e+04, 7.810625e+04, 7.80700625e+04, 7.80201171875e+04, 7.7929359375e+04, 7.779740625e+04, 7.76266875e+04, 7.74196640625e+04, 7.71787734375e+04, 7.69064609375e+04, 7.66051875e+04, 7.62773828125e+04, 7.59255078125e+04, 7.5551984375e+04, 7.51570390625e+04, 7.473771875e+04, 7.4291140625e+04, 7.3814390625e+04, 7.33045859375e+04, 7.2758828125e+04, 7.2174203125e+04, 7.15478203125e+04, 7.08767890625e+04, 7.01574765625e+04, 6.9383515625e+04, 6.855575e+04, 6.767634375e+04, 6.67474453125e+04, 6.577121875e+04, 6.47498125e+04, 6.3685390625e+04, 6.257675390625e+04, 6.1419390625e+04, 6.021051953125e+04, 5.89473671875e+04, 5.762715625e+04, 5.6247109375e+04, 5.48053046875e+04, 5.33065625e+04, 5.174723828125e+04, 5.012122265625e+04, 4.84224140625e+04, 4.664469921875e+04, 4.4778953125e+04, 4.28016875e+04, 4.073221875e+04, 3.85990703125e+04, 3.64307578125e+04, 3.42558046875e+04, 3.242482421875e+04, 3.19496953125e+04, 3.188827734375e+04, 3.1881744140625e+04, 3.1881109375e+04, 3.1881060546875e+04, 3.1881041015625e+04, 3.188104296875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04]
-forcedPump3.dp=[7.83562578125e+04, 4.512932421875e+04, 4.3014140625e+04, 4.2858265625e+04, 4.2846640625e+04, 4.28457734375e+04, 4.28457109375e+04, 4.2845703125e+04, 4.284570703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.284337890625e+04, 4.283737890625e+04, 4.283029296875e+04, 4.28228984375e+04, 4.281548046875e+04, 4.28082578125e+04, 4.280144140625e+04, 4.27952421875e+04, 4.27898671875e+04, 4.27855234375e+04, 4.278239453125e+04, 4.278004296875e+04, 4.277765625e+04, 4.27744375e+04, 4.27695859375e+04, 4.27623046875e+04, 4.27517890625e+04, 4.273723828125e+04, 4.271786328125e+04, 4.26928515625e+04, 4.26557109375e+04, 4.25791640625e+04, 4.246258984375e+04, 4.230929296875e+04, 4.212258203125e+04, 4.1905765625e+04, 4.166216015625e+04, 4.139506640625e+04, 4.110669921875e+04, 4.07941484375e+04, 4.045346875e+04, 4.008073828125e+04, 3.967204296875e+04, 3.922345703125e+04, 3.873106640625e+04, 3.818964453125e+04, 3.759371875e+04, 3.694563671875e+04, 3.62483203125e+04, 3.55046875e+04, 3.471760546875e+04, 3.3885296875e+04, 3.3002796875e+04, 3.20663515625e+04, 3.1072205078125e+04, 3.00169296875e+04, 2.8903662109375e+04, 2.7728056640625e+04, 2.6481849609375e+04, 2.515678125e+04, 2.3734591796875e+04, 2.221242578125e+04, 2.0627994140625e+04, 1.926232421875e+04, 1.8904478515625e+04, 1.8858134765625e+04, 1.8853208984375e+04, 1.8852728515625e+04, 1.88526875e+04, 1.8852677734375e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04]
-forcedPump4.dp=[7.83562578125e+04, 1.21382234375e+05, 1.249705625e+05, 1.25240546875e+05, 1.252607109375e+05, 1.2526221875e+05, 1.25262328125e+05, 1.2526234375e+05, 1.252623359375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.25258453125e+05, 1.25248609375e+05, 1.252371328125e+05, 1.2522509375e+05, 1.252127421875e+05, 1.2520021875e+05, 1.251876484375e+05, 1.251751484375e+05, 1.251628515625e+05, 1.251508671875e+05, 1.251393203125e+05, 1.2512834375e+05, 1.251180546875e+05, 1.251085703125e+05, 1.251000234375e+05, 1.250925234375e+05, 1.250862109375e+05, 1.2508115625e+05, 1.25077015625e+05, 1.250732890625e+05, 1.250695234375e+05, 1.250652421875e+05, 1.250599765625e+05, 1.250532578125e+05, 1.25044625e+05, 1.25033609375e+05, 1.250197421875e+05, 1.25002546875e+05, 1.249815703125e+05, 1.249604296875e+05, 1.2495434375e+05, 1.249535390625e+05, 1.24953453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05]
-forcedPump5.dp=[7.83562578125e+04, 1.21476435546875e+04, 9.51540625e+03, 9.3317724609375e+03, 9.318134765625e+03, 9.3171171875e+03, 9.317044921875e+03, 9.3170341796875e+03, 9.317037109375e+03, 9.3170341796875e+03, 9.317033203125e+03, 9.3158857421875e+03, 9.3128330078125e+03, 9.3093193359375e+03, 9.306072265625e+03, 9.30358203125e+03, 9.3021455078125e+03, 9.3006884765625e+03, 9.29749609375e+03, 9.2908525390625e+03, 9.2789912109375e+03, 9.2408076171875e+03, 9.164931640625e+03, 9.0584609375e+03, 8.928126953125e+03, 8.772828125e+03, 8.5843662109375e+03, 8.3542978515625e+03, 8.07286181640625e+03, 7.7413671875e+03, 7.36500390625e+03, 6.9387421875e+03, 6.53136962890625e+03, 6.4175234375e+03, 6.40255615234375e+03, 6.40096044921875e+03, 6.40080615234375e+03, 6.40079248046875e+03, 6.40079052734375e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03]
-pump1.P=[4.36944091796875e+02, 6.206221313476562e+02, 6.360929565429688e+02, 6.372581176757812e+02, 6.373451538085938e+02, 6.373516845703125e+02, 6.373521118164062e+02, 6.373521728515625e+02, 6.373521728515625e+02, 6.373521728515625e+02, 6.373522338867188e+02, 6.426599731445312e+02, 6.554689331054688e+02, 6.6954248046875e+02, 6.83611328125e+02, 6.97579345703125e+02, 7.11495361328125e+02, 7.2542333984375e+02, 7.394284057617188e+02, 7.535760498046875e+02, 7.679315795898438e+02, 7.82560546875e+02, 7.975281982421875e+02, 8.129000854492188e+02, 8.287415771484375e+02, 8.451179809570312e+02, 8.620972290039062e+02, 8.79808349609375e+02, 8.982250366210938e+02, 9.17248779296875e+02, 9.367811279296875e+02, 9.567235107421875e+02, 9.769774169921875e+02, 9.974443969726562e+02, 1.01802587890625e+03, 1.038623413085938e+03, 1.059138427734375e+03, 1.079472412109375e+03, 1.099526977539062e+03, 1.119203491210938e+03, 1.138403442382812e+03, 1.15702880859375e+03, 1.175201293945312e+03, 1.193089233398438e+03, 1.210715209960938e+03, 1.228101806640625e+03, 1.245271728515625e+03, 1.262247436523438e+03, 1.279051635742188e+03, 1.295706909179688e+03, 1.31223583984375e+03, 1.328661010742188e+03, 1.345005004882812e+03, 1.36129150390625e+03, 1.377591186523438e+03, 1.393895751953125e+03, 1.4101474609375e+03, 1.426288818359375e+03, 1.44226220703125e+03, 1.458010131835938e+03, 1.473474731445312e+03, 1.488598754882812e+03, 1.503324340820312e+03, 1.517593994140625e+03, 1.529311401367188e+03, 1.5323212890625e+03, 1.5327099609375e+03, 1.532751342773438e+03, 1.532755249023438e+03, 1.532755615234375e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03]
-pump2.P=[4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.410687561035156e+02, 4.510078125e+02, 4.619131774902344e+02, 4.728125e+02, 4.836459350585938e+02, 4.94466064453125e+02, 5.053371276855469e+02, 5.163244018554688e+02, 5.274932250976562e+02, 5.389091186523438e+02, 5.506373901367188e+02, 5.627434692382812e+02, 5.752927856445312e+02, 5.883507690429688e+02, 6.020260620117188e+02, 6.163313598632812e+02, 6.311682739257812e+02, 6.464382934570312e+02, 6.620429077148438e+02, 6.778836059570312e+02, 6.938619384765625e+02, 7.098792724609375e+02, 7.258372802734375e+02, 7.416372680664062e+02, 7.571808471679688e+02, 7.723694458007812e+02, 7.871046142578125e+02, 8.013530883789062e+02, 8.153215942382812e+02, 8.290548095703125e+02, 8.425753784179688e+02, 8.559059448242188e+02, 8.690690307617188e+02, 8.820872802734375e+02, 8.949832763671875e+02, 9.077796630859375e+02, 9.204989624023438e+02, 9.331644897460938e+02, 9.4583837890625e+02, 9.585100708007812e+02, 9.711220092773438e+02, 9.836165771484375e+02, 9.959361572265625e+02, 1.008023193359375e+03, 1.019820068359375e+03, 1.031269287109375e+03, 1.042313110351562e+03, 1.05290673828125e+03, 1.063102294921875e+03, 1.072906860351562e+03, 1.082311401367188e+03, 1.091307006835938e+03, 1.099884643554688e+03, 1.108035400390625e+03, 1.115750366210938e+03, 1.123005981445312e+03, 1.129784912109375e+03, 1.136087524414062e+03, 1.141914184570312e+03, 1.147265380859375e+03, 1.152141357421875e+03, 1.15654296875e+03, 1.160464111328125e+03, 1.163878173828125e+03, 1.166755249023438e+03, 1.16906591796875e+03, 1.170780395507812e+03, 1.171843139648438e+03, 1.172058715820312e+03, 1.171569213867188e+03, 1.17059326171875e+03, 1.169349487304688e+03, 1.16805615234375e+03, 1.167082153320312e+03, 1.166863647460938e+03, 1.166836791992188e+03, 1.166833862304688e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03]
-pump3.P=[4.36944091796875e+02, 1.909869232177734e+02, 1.777183532714844e+02, 1.767532043457031e+02, 1.766812896728516e+02, 1.766759185791016e+02, 1.76675537109375e+02, 1.766754913330078e+02, 1.766755065917969e+02, 1.766754913330078e+02, 1.766754760742188e+02, 1.789274749755859e+02, 1.843316955566406e+02, 1.902439880371094e+02, 1.961623840332031e+02, 2.020842895507812e+02, 2.080681610107422e+02, 2.141787872314453e+02, 2.204814758300781e+02, 2.270416564941406e+02, 2.339247131347656e+02, 2.412034301757812e+02, 2.489526977539062e+02, 2.570982360839844e+02, 2.655415954589844e+02, 2.741841735839844e+02, 2.829275512695312e+02, 2.916731872558594e+02, 3.003225402832031e+02, 3.087771606445312e+02, 3.169385070800781e+02, 3.247470703125e+02, 3.323451843261719e+02, 3.397773742675781e+02, 3.470662231445312e+02, 3.542343139648438e+02, 3.613042907714844e+02, 3.682987365722656e+02, 3.75240234375e+02, 3.821669311523438e+02, 3.890924987792969e+02, 3.959611511230469e+02, 4.0271533203125e+02, 4.092973937988281e+02, 4.156497802734375e+02, 4.217148742675781e+02, 4.274548950195312e+02, 4.329044799804688e+02, 4.380598449707031e+02, 4.429120178222656e+02, 4.474520568847656e+02, 4.516707763671875e+02, 4.55546875e+02, 4.590706787109375e+02, 4.622424926757812e+02, 4.650627136230469e+02, 4.675318603515625e+02, 4.696452331542969e+02, 4.713772277832031e+02, 4.726981811523438e+02, 4.735784912109375e+02, 4.739219970703125e+02, 4.737006225585938e+02, 4.731275939941406e+02, 4.725277709960938e+02, 4.72371337890625e+02, 4.723513793945312e+02, 4.723492736816406e+02, 4.723490600585938e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02]
-pump4.P=[4.36944091796875e+02, 8.424577026367188e+02, 8.800897216796875e+02, 8.829432983398438e+02, 8.831565551757812e+02, 8.831724853515625e+02, 8.831736450195312e+02, 8.831737670898438e+02, 8.831737670898438e+02, 8.831737670898438e+02, 8.83173828125e+02, 8.897735595703125e+02, 9.057191162109375e+02, 9.232597045898438e+02, 9.408016967773438e+02, 9.5820947265625e+02, 9.755277099609375e+02, 9.928200073242188e+02, 1.010151428222656e+03, 1.027587524414062e+03, 1.045193603515625e+03, 1.06303515625e+03, 1.081177490234375e+03, 1.09968603515625e+03, 1.118626220703125e+03, 1.1380634765625e+03, 1.158063110351562e+03, 1.178690673828125e+03, 1.200027587890625e+03, 1.222202880859375e+03, 1.245151489257812e+03, 1.26877490234375e+03, 1.292974487304688e+03, 1.317651733398438e+03, 1.342708251953125e+03, 1.36804541015625e+03, 1.393564819335938e+03, 1.419167846679688e+03, 1.444756103515625e+03, 1.470231079101562e+03, 1.49170263671875e+03, 1.4972978515625e+03, 1.498022216796875e+03, 1.498099243164062e+03, 1.498106689453125e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03]
-pump5.P=[4.36944091796875e+02, 2.66718692779541e+01, 1.84908275604248e+01, 1.795815086364746e+01, 1.791879844665527e+01, 1.791586303710938e+01, 1.79156551361084e+01, 1.791562271118164e+01, 1.791563034057617e+01, 1.791562461853027e+01, 1.791562080383301e+01, 1.840224456787109e+01, 1.955545234680176e+01, 2.08275203704834e+01, 2.216099166870117e+01, 2.360690307617188e+01, 2.523238945007324e+01, 2.703916931152344e+01, 2.893294906616211e+01, 3.081521606445312e+01, 3.258761978149414e+01, 3.423546981811523e+01, 3.581338500976562e+01, 3.734397125244141e+01, 3.885184860229492e+01, 4.034844207763672e+01, 4.178400039672852e+01, 4.310113525390625e+01, 4.427668380737305e+01, 4.531203079223633e+01, 4.619688415527344e+01, 4.69188346862793e+01, 4.740321731567383e+01, 4.751062393188477e+01, 4.752394104003906e+01, 4.752534866333008e+01, 4.752548599243164e+01, 4.752549743652344e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01]
+pump1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.01388880610466e-01, 4.097222089767456e-01, 6.180555820465088e-01, 8.263888955116272e-01, 1.034722208976746e+00, 1.243055582046509e+00, 1.451388835906982e+00, 1.659722208976746e+00, 1.868055582046509e+00, 2.076388835906982e+00, 2.284722328186035e+00, 2.493055582046509e+00, 2.701388835906982e+00, 2.909722328186035e+00, 3.118055582046509e+00, 3.326388835906982e+00, 3.534722328186035e+00, 3.743055582046509e+00, 3.951388835906982e+00, 4.159722328186035e+00, 4.36805534362793e+00, 4.576388835906982e+00, 4.784722328186035e+00, 4.99305534362793e+00, 5.201388835906982e+00, 5.409722328186035e+00, 5.61805534362793e+00, 5.826388835906982e+00, 6.034722328186035e+00, 6.24305534362793e+00, 6.451388835906982e+00, 6.659722328186035e+00, 6.86805534362793e+00, 7.076388835906982e+00, 7.284722328186035e+00, 7.49305534362793e+00, 7.701388835906982e+00, 7.909722328186035e+00, 8.11805534362793e+00, 8.326389312744141e+00, 8.534722328186035e+00, 8.74305534362793e+00, 8.951389312744141e+00, 9.159722328186035e+00, 9.36805534362793e+00, 9.576389312744141e+00, 9.784722328186035e+00, 9.99305534362793e+00, 1.020138931274414e+01, 1.040972232818604e+01, 1.061805534362793e+01, 1.082638931274414e+01, 1.103472232818604e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
+pump2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.01388880610466e-01, 4.097222089767456e-01, 6.180555820465088e-01, 8.263888955116272e-01, 1.034722208976746e+00, 1.243055582046509e+00, 1.451388835906982e+00, 1.659722208976746e+00, 1.868055582046509e+00, 2.076388835906982e+00, 2.284722328186035e+00, 2.493055582046509e+00, 2.701388835906982e+00, 2.909722328186035e+00, 3.118055582046509e+00, 3.326388835906982e+00, 3.534722328186035e+00, 3.743055582046509e+00, 3.951388835906982e+00, 4.159722328186035e+00, 4.36805534362793e+00, 4.576388835906982e+00, 4.784722328186035e+00, 4.99305534362793e+00, 5.201388835906982e+00, 5.409722328186035e+00, 5.61805534362793e+00, 5.826388835906982e+00, 6.034722328186035e+00, 6.24305534362793e+00, 6.451388835906982e+00, 6.659722328186035e+00, 6.86805534362793e+00, 7.076388835906982e+00, 7.284722328186035e+00, 7.49305534362793e+00, 7.701388835906982e+00, 7.909722328186035e+00, 8.11805534362793e+00, 8.326389312744141e+00, 8.534722328186035e+00, 8.74305534362793e+00, 8.951389312744141e+00, 9.159722328186035e+00, 9.36805534362793e+00, 9.576389312744141e+00, 9.784722328186035e+00, 9.99305534362793e+00, 1.020138931274414e+01, 1.040972232818604e+01, 1.061805534362793e+01, 1.082638931274414e+01, 1.103472232818604e+01, 1.124305534362793e+01, 1.145138931274414e+01, 1.165972232818604e+01, 1.186805534362793e+01, 1.207638931274414e+01, 1.228472232818604e+01, 1.249305534362793e+01, 1.270138931274414e+01, 1.290972232818604e+01, 1.311805534362793e+01, 1.332638931274414e+01, 1.353472232818604e+01, 1.374305534362793e+01, 1.395138931274414e+01, 1.415972232818604e+01, 1.436805534362793e+01, 1.457638931274414e+01, 1.478472232818604e+01, 1.499305534362793e+01, 1.520138931274414e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01]
+pump3.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.01388880610466e-01, 4.097222089767456e-01, 6.180555820465088e-01, 8.263888955116272e-01, 1.034722208976746e+00, 1.243055582046509e+00, 1.451388835906982e+00, 1.659722208976746e+00, 1.868055582046509e+00, 2.076388835906982e+00, 2.284722328186035e+00, 2.493055582046509e+00, 2.701388835906982e+00, 2.909722328186035e+00, 3.118055582046509e+00, 3.326388835906982e+00, 3.534722328186035e+00, 3.743055582046509e+00, 3.951388835906982e+00, 4.159722328186035e+00, 4.36805534362793e+00, 4.576388835906982e+00, 4.784722328186035e+00, 4.99305534362793e+00, 5.201388835906982e+00, 5.409722328186035e+00, 5.61805534362793e+00, 5.826388835906982e+00, 6.034722328186035e+00, 6.24305534362793e+00, 6.451388835906982e+00, 6.659722328186035e+00, 6.86805534362793e+00, 7.076388835906982e+00, 7.284722328186035e+00, 7.49305534362793e+00, 7.701388835906982e+00, 7.909722328186035e+00, 8.11805534362793e+00, 8.326389312744141e+00, 8.534722328186035e+00, 8.74305534362793e+00, 8.951389312744141e+00, 9.159722328186035e+00, 9.36805534362793e+00, 9.576389312744141e+00, 9.784722328186035e+00, 9.99305534362793e+00, 1.020138931274414e+01, 1.040972232818604e+01, 1.061805534362793e+01, 1.082638931274414e+01, 1.103472232818604e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
+pump4.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.01388880610466e-01, 4.097222089767456e-01, 6.180555820465088e-01, 8.263888955116272e-01, 1.034722208976746e+00, 1.243055582046509e+00, 1.451388835906982e+00, 1.659722208976746e+00, 1.868055582046509e+00, 2.076388835906982e+00, 2.284722328186035e+00, 2.493055582046509e+00, 2.701388835906982e+00, 2.909722328186035e+00, 3.118055582046509e+00, 3.326388835906982e+00, 3.534722328186035e+00, 3.743055582046509e+00, 3.951388835906982e+00, 4.159722328186035e+00, 4.36805534362793e+00, 4.576388835906982e+00, 4.784722328186035e+00, 4.99305534362793e+00, 5.201388835906982e+00, 5.409722328186035e+00, 5.61805534362793e+00, 5.826388835906982e+00, 6.034722328186035e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00]
+pump5.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.01388880610466e-01, 4.097222089767456e-01, 6.180555820465088e-01, 8.263888955116272e-01, 1.034722208976746e+00, 1.243055582046509e+00, 1.451388835906982e+00, 1.659722208976746e+00, 1.868055582046509e+00, 2.076388835906982e+00, 2.284722328186035e+00, 2.493055582046509e+00, 2.701388835906982e+00, 2.909722328186035e+00, 3.118055582046509e+00, 3.326388835906982e+00, 3.534722328186035e+00, 3.743055582046509e+00, 3.951388835906982e+00, 4.159722328186035e+00, 4.36805534362793e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00]
+forcedPump1.dp=[7.83562578125e+04, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007708515625e+05, 1.007604296875e+05, 1.0074959375e+05, 1.007384609375e+05, 1.007271875e+05, 1.007158984375e+05, 1.007047421875e+05, 1.0069384375e+05, 1.0068334375e+05, 1.00673375e+05, 1.006640859375e+05, 1.006556015625e+05, 1.006480625e+05, 1.006416015625e+05, 1.006363671875e+05, 1.006322890625e+05, 1.006288359375e+05, 1.006254765625e+05, 1.00621703125e+05, 1.00616984375e+05, 1.00610796875e+05, 1.00602625e+05, 1.005919453125e+05, 1.005782421875e+05, 1.00560984375e+05, 1.0053965625e+05, 1.00513734375e+05, 1.00482703125e+05, 1.0044603125e+05, 1.00403203125e+05, 1.003420625e+05, 1.002383359375e+05, 1.000933046875e+05, 9.9909125e+04, 9.9687953125e+04, 9.94319375e+04, 9.914325e+04, 9.88240390625e+04, 9.847646875e+04, 9.81026875e+04, 9.77048671875e+04, 9.72851484375e+04, 9.684453125e+04, 9.63805546875e+04, 9.58906484375e+04, 9.5372265625e+04, 9.48228359375e+04, 9.42398203125e+04, 9.36206484375e+04, 9.29627734375e+04, 9.22636328125e+04, 9.15206796875e+04, 9.0731359375e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04]
+forcedPump2.dp=[7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.834778125e+04, 7.8338484375e+04, 7.83288046875e+04, 7.8318890625e+04, 7.830890625e+04, 7.82989921875e+04, 7.82893203125e+04, 7.82800390625e+04, 7.82713046875e+04, 7.8263265625e+04, 7.8256078125e+04, 7.824990625e+04, 7.82448984375e+04, 7.82411015625e+04, 7.82380078125e+04, 7.8235e+04, 7.82315e+04, 7.8226921875e+04, 7.822065625e+04, 7.8212125e+04, 7.8200734375e+04, 7.8185890625e+04, 7.8167e+04, 7.8143484375e+04, 7.8114734375e+04, 7.8080171875e+04, 7.80368125e+04, 7.795728125e+04, 7.783590625e+04, 7.76751328125e+04, 7.74773984375e+04, 7.72451640625e+04, 7.69808671875e+04, 7.66869609375e+04, 7.6365890625e+04, 7.60201015625e+04, 7.565203125e+04, 7.5262984375e+04, 7.485034375e+04, 7.4411203125e+04, 7.39426640625e+04, 7.34418203125e+04, 7.290578125e+04, 7.2331640625e+04, 7.17165078125e+04, 7.10574765625e+04, 7.03515234375e+04, 6.95920390625e+04, 6.87781953125e+04, 6.7912140625e+04, 6.699603125e+04, 6.6032015625e+04, 6.502226953125e+04, 6.39689375e+04, 6.287247265625e+04, 6.172816796875e+04, 6.053309375e+04, 5.92844609375e+04, 5.79795e+04, 5.66154375e+04, 5.518957421875e+04, 5.370572265625e+04, 5.21628984375e+04, 5.055498828125e+04, 4.887588671875e+04, 4.711948046875e+04, 4.527930078125e+04, 4.33309765625e+04, 4.128295703125e+04, 3.9163765625e+04, 3.700192578125e+04, 3.482595703125e+04, 3.266437890625e+04, 3.1881041015625e+04, 3.1881046875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04]
+forcedPump3.dp=[7.83562578125e+04, 4.284637890625e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.28393125e+04, 4.283222265625e+04, 4.282485546875e+04, 4.281741796875e+04, 4.2810125e+04, 4.28031796875e+04, 4.2796796875e+04, 4.279118359375e+04, 4.27865546875e+04, 4.278310546875e+04, 4.278062890625e+04, 4.277833203125e+04, 4.277541015625e+04, 4.27710625e+04, 4.276449609375e+04, 4.275490625e+04, 4.274149609375e+04, 4.272346484375e+04, 4.270001171875e+04, 4.266876171875e+04, 4.26032734375e+04, 4.2496890625e+04, 4.23529140625e+04, 4.217465625e+04, 4.19654296875e+04, 4.172853515625e+04, 4.14672890625e+04, 4.118459375e+04, 4.087878125e+04, 4.05458671875e+04, 4.018193359375e+04, 3.97830625e+04, 3.934533203125e+04, 3.88648203125e+04, 3.83371171875e+04, 3.77553671875e+04, 3.712069921875e+04, 3.643602734375e+04, 3.57042734375e+04, 3.49283515625e+04, 3.41085546875e+04, 3.323959765625e+04, 3.23176796875e+04, 3.1339048828125e+04, 3.029994921875e+04, 2.92016875e+04, 2.804325e+04, 2.68163828125e+04, 2.5512822265625e+04, 2.4119146484375e+04, 2.261972265625e+04, 2.104790625e+04, 1.9442265625e+04, 1.88526796875e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04]
+forcedPump4.dp=[7.83562578125e+04, 1.25260703125e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.252517578125e+05, 1.2524025e+05, 1.252282890625e+05, 1.252160078125e+05, 1.25203515625e+05, 1.251909453125e+05, 1.251784140625e+05, 1.251660546875e+05, 1.251539765625e+05, 1.251423046875e+05, 1.251311640625e+05, 1.251206796875e+05, 1.251109765625e+05, 1.25102171875e+05, 1.250943828125e+05, 1.2508775e+05, 1.250823671875e+05, 1.250780390625e+05, 1.250742578125e+05, 1.25070546875e+05, 1.250664453125e+05, 1.250614765625e+05, 1.250551875e+05, 1.25047109375e+05, 1.250367578125e+05, 1.250236796875e+05, 1.2500740625e+05, 1.2498746875e+05, 1.249633984375e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05]
+forcedPump5.dp=[7.83562578125e+04, 3.4825e+04, 9.395697265625e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3138193359375e+03, 9.310248046875e+03, 9.30687109375e+03, 9.30413671875e+03, 9.302455078125e+03, 9.3011689453125e+03, 9.2985986328125e+03, 9.29302734375e+03, 9.2827412109375e+03, 9.2547724609375e+03, 9.1881064453125e+03, 9.088982421875e+03, 8.964458984375e+03, 8.8164755859375e+03, 8.6375361328125e+03, 8.4192333984375e+03, 8.15186376953125e+03, 7.832908203125e+03, 7.46828173828125e+03, 7.05598486328125e+03, 6.58753466796875e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03]
+pump1.P=[4.36944091796875e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.514600219726562e+02, 6.657927856445312e+02, 6.799238891601562e+02, 6.939187622070312e+02, 7.078427124023438e+02, 7.2176123046875e+02, 7.3573974609375e+02, 7.498436279296875e+02, 7.641382446289062e+02, 7.786890869140625e+02, 7.935614624023438e+02, 8.088208618164062e+02, 8.2453271484375e+02, 8.407623291015625e+02, 8.575751953125e+02, 8.750853271484375e+02, 8.933262939453125e+02, 9.122001953125e+02, 9.316085205078125e+02, 9.514527587890625e+02, 9.716343994140625e+02, 9.920549926757812e+02, 1.012615905761719e+03, 1.03321875e+03, 1.053765014648438e+03, 1.074156127929688e+03, 1.094293579101562e+03, 1.114078857421875e+03, 1.133413452148438e+03, 1.152198974609375e+03, 1.1704580078125e+03, 1.18841845703125e+03, 1.206111083984375e+03, 1.223558349609375e+03, 1.240782958984375e+03, 1.257807495117188e+03, 1.274654418945312e+03, 1.2913466796875e+03, 1.307906494140625e+03, 1.324356689453125e+03, 1.340719848632812e+03, 1.3570185546875e+03, 1.373308349609375e+03, 1.3896171875e+03, 1.405888427734375e+03, 1.422064331054688e+03, 1.43808740234375e+03, 1.453900024414062e+03, 1.469444580078125e+03, 1.48466357421875e+03, 1.499499389648438e+03, 1.513894409179688e+03, 1.527791015625e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03]
+pump2.P=[4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.478989868164062e+02, 4.590083923339844e+02, 4.699552001953125e+02, 4.808047790527344e+02, 4.9162255859375e+02, 5.024739685058594e+02, 5.134243774414062e+02, 5.245392456054688e+02, 5.358839111328125e+02, 5.475238037109375e+02, 5.595243530273438e+02, 5.719509887695312e+02, 5.848690185546875e+02, 5.983701782226562e+02, 6.1251953125e+02, 6.272263793945312e+02, 6.423922119140625e+02, 6.579185180664062e+02, 6.73706787109375e+02, 6.89658447265625e+02, 7.056751098632812e+02, 7.21658203125e+02, 7.375092163085938e+02, 7.531296997070312e+02, 7.684210205078125e+02, 7.832847900390625e+02, 7.976433715820312e+02, 8.116773681640625e+02, 8.2547021484375e+02, 8.3904443359375e+02, 8.524226684570312e+02, 8.656275634765625e+02, 8.78681640625e+02, 8.916075439453125e+02, 9.044279174804688e+02, 9.17165283203125e+02, 9.2984228515625e+02, 9.4250830078125e+02, 9.551861572265625e+02, 9.678193359375e+02, 9.803502807617188e+02, 9.927213745117188e+02, 1.004875061035156e+03, 1.016753723144531e+03, 1.0282998046875e+03, 1.03945556640625e+03, 1.050165893554688e+03, 1.060462646484375e+03, 1.070370727539062e+03, 1.079881103515625e+03, 1.088984985351562e+03, 1.097673217773438e+03, 1.10593701171875e+03, 1.113767211914062e+03, 1.121146850585938e+03, 1.128050903320312e+03, 1.134478637695312e+03, 1.140430297851562e+03, 1.14590625e+03, 1.150906982421875e+03, 1.155432861328125e+03, 1.159482421875e+03, 1.163032470703125e+03, 1.166053466796875e+03, 1.168515747070312e+03, 1.1703896484375e+03, 1.171642456054688e+03, 1.172079223632812e+03, 1.171753662109375e+03, 1.170884399414062e+03, 1.169689697265625e+03, 1.168388305664062e+03, 1.167198608398438e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03]
+pump3.P=[4.36944091796875e+02, 1.766796722412109e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.826439666748047e+02, 1.886694946289062e+02, 1.946082763671875e+02, 2.005257263183594e+02, 2.064872741699219e+02, 2.125583038330078e+02, 2.188042297363281e+02, 2.252904510498047e+02, 2.320823974609375e+02, 2.392465972900391e+02, 2.4687548828125e+02, 2.54926513671875e+02, 2.633011779785156e+02, 2.719010009765625e+02, 2.8062744140625e+02, 2.893820190429688e+02, 2.980661926269531e+02, 3.065814819335938e+02, 3.148293762207031e+02, 3.227215881347656e+02, 3.303670349121094e+02, 3.378406066894531e+02, 3.451648864746094e+02, 3.523625183105469e+02, 3.594560546875e+02, 3.664681396484375e+02, 3.734213562011719e+02, 3.803461303710938e+02, 3.872771301269531e+02, 3.941662902832031e+02, 4.009560852050781e+02, 4.075889282226562e+02, 4.140072021484375e+02, 4.201533203125e+02, 4.259762573242188e+02, 4.315016174316406e+02, 4.36735107421875e+02, 4.416677856445312e+02, 4.462906188964844e+02, 4.505947265625e+02, 4.545632019042969e+02, 4.581794738769531e+02, 4.614436645507812e+02, 4.64356201171875e+02, 4.669174194335938e+02, 4.691260070800781e+02, 4.709609985351562e+02, 4.723927612304688e+02, 4.733916625976562e+02, 4.738945007324219e+02, 4.738016967773438e+02, 4.732998657226562e+02, 4.726074523925781e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02]
+pump4.P=[4.36944091796875e+02, 8.83156494140625e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 9.0072607421875e+02, 9.185848999023438e+02, 9.362041015625e+02, 9.536491088867188e+02, 9.709853515625e+02, 9.882781372070312e+02, 1.005593017578125e+03, 1.022995300292969e+03, 1.040550415039062e+03, 1.05832373046875e+03, 1.076380737304688e+03, 1.094786865234375e+03, 1.113607299804688e+03, 1.13290771484375e+03, 1.15275341796875e+03, 1.173209716796875e+03, 1.19434521484375e+03, 1.216301147460938e+03, 1.239056274414062e+03, 1.262511962890625e+03, 1.286569702148438e+03, 1.311131103515625e+03, 1.336097534179688e+03, 1.36137060546875e+03, 1.386851684570312e+03, 1.4124423828125e+03, 1.438044067382812e+03, 1.463558227539062e+03, 1.488886474609375e+03, 1.498107543945312e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03]
+pump5.P=[4.36944091796875e+02, 1.294649200439453e+02, 1.814299201965332e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.91961784362793e+01, 2.048503494262695e+01, 2.180209541320801e+01, 2.321276664733887e+01, 2.478469085693359e+01, 2.655229949951172e+01, 2.843277168273926e+01, 3.032760047912598e+01, 3.213827514648438e+01, 3.381046295166016e+01, 3.54045524597168e+01, 3.694537734985352e+01, 3.845595169067383e+01, 3.995902633666992e+01, 4.141618347167969e+01, 4.276983642578125e+01, 4.398120880126953e+01, 4.505424118041992e+01, 4.59800910949707e+01, 4.674514770507812e+01, 4.734618377685547e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01]
From a1121d6ff7466f6c3c3f31e7a8a50e5461310eb7 Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Tue, 27 Aug 2024 18:13:40 -0700
Subject: [PATCH 14/47] Updated comments
---
IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo | 2 +-
IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo | 4 ++--
IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
index 73d94de02d..321589748d 100644
--- a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
+++ b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
@@ -5,7 +5,7 @@ model ActuatorSignal
constant Integer order(min=1) = 2 "Order of filter";
parameter Boolean use_inputFilter=true
- "= true, if opening is filtered with a 2nd order CriticalDamping filter"
+ "= true, if opening is filtered to avoid a step change in actuator position"
annotation(Dialog(tab="Dynamics", group="Filtered opening"));
parameter Boolean use_linearDynamics = true
diff --git a/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
index 5203c5ee20..3dd468fa33 100644
--- a/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
+++ b/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
@@ -50,11 +50,11 @@ partial model PartialFlowMachine
// Classes used to implement the filtered speed
parameter Boolean use_inputFilter=true
- "= true, if speed is filtered with a 2nd order CriticalDamping filter"
+ "= true, if speed is filtered to avoid a step change in motor speed"
annotation(Dialog(tab="Dynamics", group="Filtered speed"));
parameter Boolean use_linearDynamics = true
- "Set to true to use an actuator dynamics that models the change in actuator position linear in time"
+ "Set to true to use an motor dynamics that models the change in motor speed linear in time"
annotation(Dialog(tab="Dynamics", group="Filtered speed"));
parameter Modelica.Units.SI.Time riseTime=30
diff --git a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
index 8521e6e7de..27b3235b0e 100644
--- a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
+++ b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
@@ -51,7 +51,7 @@ partial model PartialFlowMachine
// Classes used to implement the filtered speed
parameter Boolean use_inputFilter=true
- "= true, if speed is filtered with a 2nd order CriticalDamping filter"
+ "= true, if speed is filtered to avoid a step change in motor speed"
annotation(Dialog(tab="Dynamics", group="Filtered speed"));
parameter Modelica.Units.SI.Time riseTime=30
"Rise time of the filter (time to reach 99.6 % of the speed)" annotation (
From 6030bf8fdd365a5bab8fe0fd4970bad4d8b26566 Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Tue, 27 Aug 2024 18:30:57 -0700
Subject: [PATCH 15/47] Reverted change in obsolete file
---
IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
index 27b3235b0e..8521e6e7de 100644
--- a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
+++ b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
@@ -51,7 +51,7 @@ partial model PartialFlowMachine
// Classes used to implement the filtered speed
parameter Boolean use_inputFilter=true
- "= true, if speed is filtered to avoid a step change in motor speed"
+ "= true, if speed is filtered with a 2nd order CriticalDamping filter"
annotation(Dialog(tab="Dynamics", group="Filtered speed"));
parameter Modelica.Units.SI.Time riseTime=30
"Rise time of the filter (time to reach 99.6 % of the speed)" annotation (
From 5bc0c34749fc832e69ca0e0667e37b186c2f7961 Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Wed, 28 Aug 2024 09:50:58 -0700
Subject: [PATCH 16/47] deleted Nrpm models from Obsolete
---
.../Movers/BaseClasses/PartialFlowMachine.mo | 815 ------------------
.../Fluid/Movers/BaseClasses/package.mo | 11 -
.../Fluid/Movers/BaseClasses/package.order | 1 -
IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo | 300 -------
.../Data/Pumps/Wilo/Stratos25slash1to4.mo | 69 --
.../Data/Pumps/Wilo/Stratos32slash1to12.mo | 68 --
.../Fluid/Movers/Data/Pumps/Wilo/package.mo | 10 -
.../Movers/Data/Pumps/Wilo/package.order | 2 -
.../Fluid/Movers/Data/Pumps/package.mo | 15 -
.../Fluid/Movers/Data/Pumps/package.order | 1 -
IBPSA/Obsolete/Fluid/Movers/Data/package.mo | 15 -
.../Obsolete/Fluid/Movers/Data/package.order | 2 -
.../Fluid/Movers/Examples/MoverContinuous.mo | 58 --
.../Fluid/Movers/Examples/MoverParameter.mo | 126 ---
.../Fluid/Movers/Examples/MoverStages.mo | 68 --
.../Obsolete/Fluid/Movers/Examples/package.mo | 9 -
.../Fluid/Movers/Examples/package.order | 3 -
.../Preconfigured/SpeedControlled_Nrpm.mo | 61 --
.../ControlledFlowMachinePreconfigured.mo | 63 --
.../Preconfigured/Validation/package.mo | 20 -
.../Preconfigured/Validation/package.order | 1 -
.../Fluid/Movers/Preconfigured/package.mo | 13 -
.../Fluid/Movers/Preconfigured/package.order | 2 -
.../Fluid/Movers/SpeedControlled_Nrpm.mo | 197 -----
.../BaseClasses/ControlledFlowMachine.mo | 226 -----
.../Movers/Validation/BaseClasses/package.mo | 9 -
.../Validation/BaseClasses/package.order | 1 -
.../Validation/ControlledFlowMachine.mo | 37 -
.../ControlledFlowMachineDynamic.mo | 30 -
.../Movers/Validation/SpeedControlled_Nrpm.mo | 58 --
.../Fluid/Movers/Validation/package.order | 4 -
IBPSA/Obsolete/Fluid/Movers/package.order | 5 -
32 files changed, 2300 deletions(-)
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.order
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos25slash1to4.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos32slash1to12.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.order
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.order
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/package.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Data/package.order
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/MoverContinuous.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/MoverParameter.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/MoverStages.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/package.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Examples/package.order
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/SpeedControlled_Nrpm.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.order
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.order
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/SpeedControlled_Nrpm.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.order
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mo
delete mode 100644 IBPSA/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mo
diff --git a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
deleted file mode 100644
index 8521e6e7de..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
+++ /dev/null
@@ -1,815 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.BaseClasses;
-partial model PartialFlowMachine
- "Partial model to interface fan or pump models with the medium"
- extends IBPSA.Obsolete.BaseClasses.ObsoleteModel;
- extends IBPSA.Fluid.Interfaces.LumpedVolumeDeclarations(
- final massDynamics=energyDynamics,
- final mSenFac=1);
- extends IBPSA.Fluid.Interfaces.PartialTwoPort(
- port_a(
- p(start=Medium.p_default),
- h_outflow(start=h_outflow_start)),
- port_b(
- p(start=p_start),
- h_outflow(start=h_outflow_start)));
-
- replaceable parameter IBPSA.Obsolete.Fluid.Movers.Data.Generic per
- constrainedby IBPSA.Obsolete.Fluid.Movers.Data.Generic
- "Record with performance data"
- annotation (choicesAllMatching=true,
- Placement(transformation(extent={{52,60},{72,80}})));
-
- parameter IBPSA.Fluid.Types.InputType inputType = IBPSA.Fluid.Types.InputType.Continuous
- "Control input type"
- annotation(Dialog(
- group="Control"));
- parameter Real constInput = 0 "Constant input set point"
- annotation(Dialog(
- group="Control",
- enable=inputType == IBPSA.Fluid.Types.InputType.Constant));
- parameter Real stageInputs[:]
- "Vector of input set points corresponding to stages"
- annotation(Dialog(
- group="Control",
- enable=inputType == IBPSA.Fluid.Types.InputType.Stages));
-
- parameter Boolean computePowerUsingSimilarityLaws
- "= true, compute power exactly, using similarity laws. Otherwise approximate.";
-
- parameter Boolean addPowerToMedium=true
- "Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)";
-
- parameter Boolean nominalValuesDefineDefaultPressureCurve = false
- "Set to true to avoid warning if m_flow_nominal and dp_nominal are used to construct the default pressure curve";
-
- parameter Modelica.Units.SI.Time tau=1
- "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
- annotation (Dialog(
- tab="Dynamics",
- group="Nominal condition",
- enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
-
- // Classes used to implement the filtered speed
- parameter Boolean use_inputFilter=true
- "= true, if speed is filtered with a 2nd order CriticalDamping filter"
- annotation(Dialog(tab="Dynamics", group="Filtered speed"));
- parameter Modelica.Units.SI.Time riseTime=30
- "Rise time of the filter (time to reach 99.6 % of the speed)" annotation (
- Dialog(
- tab="Dynamics",
- group="Filtered speed",
- enable=use_inputFilter));
- parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
- "Type of initialization (no init/steady state/initial state/initial output)"
- annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter));
-
- // Connectors and ports
- Modelica.Blocks.Interfaces.IntegerInput stage
- if inputType == IBPSA.Fluid.Types.InputType.Stages
- "Stage input signal for the pressure head"
- annotation (Placement(
- transformation(
- extent={{-20,-20},{20,20}},
- rotation=270,
- origin={0,120})));
-
- Modelica.Blocks.Interfaces.RealOutput y_actual(
- final unit="1")
- "Actual normalised fan or pump speed that is used for computations"
- annotation (Placement(transformation(extent={{100,60},{120,80}}),
- iconTransformation(extent={{100,60},{120,80}})));
-
- Modelica.Blocks.Interfaces.RealOutput P(
- quantity="Power",
- final unit="W") "Electrical power consumed"
- annotation (Placement(transformation(extent={{100,80},{120,100}}),
- iconTransformation(extent={{100,80},{120,100}})));
-
- Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort
- "Heat dissipation to environment"
- annotation (Placement(transformation(extent={{-70,-110},{-50,-90}}),
- iconTransformation(extent={{-10,-78},{10,-58}})));
-
- // Variables
- Modelica.Units.SI.VolumeFlowRate VMachine_flow(start=_VMachine_flow) = eff.V_flow
- "Volume flow rate";
- Modelica.Units.SI.PressureDifference dpMachine(displayUnit="Pa") = -preSou.dp
- "Pressure difference";
-
- Real eta(unit="1", final quantity="Efficiency") = eff.eta "Global efficiency";
- Real etaHyd(unit="1", final quantity="Efficiency") = eff.etaHyd "Hydraulic efficiency";
- Real etaMot(unit="1", final quantity="Efficiency") = eff.etaMot "Motor efficiency";
-
- // Quantity to control
-
- // Copied from Fluid.Interfaces.PartialTwoPortInterface
- parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(
- _m_flow_nominal) "Small mass flow rate for regularization of zero flow"
- annotation (Dialog(tab="Advanced"));
- // Diagnostics
- parameter Boolean show_T = false
- "= true, if actual temperature at port is computed"
- annotation (
- Dialog(tab="Advanced", group="Diagnostics"),
- HideResult=true);
-
- Modelica.Units.SI.MassFlowRate m_flow(start=_m_flow_start) = port_a.m_flow
- "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)";
-
- Modelica.Units.SI.PressureDifference dp(
- start=_dp_start,
- displayUnit="Pa") = port_a.p - port_b.p
- "Pressure difference between port_a and port_b";
-
- Medium.ThermodynamicState sta_a=
- if allowFlowReversal then
- Medium.setState_phX(port_a.p,
- noEvent(actualStream(port_a.h_outflow)),
- noEvent(actualStream(port_a.Xi_outflow)))
- else
- Medium.setState_phX(port_a.p,
- noEvent(inStream(port_a.h_outflow)),
- noEvent(inStream(port_a.Xi_outflow)))
- if show_T "Medium properties in port_a";
-
- Medium.ThermodynamicState sta_b=
- if allowFlowReversal then
- Medium.setState_phX(port_b.p,
- noEvent(actualStream(port_b.h_outflow)),
- noEvent(actualStream(port_b.Xi_outflow)))
- else
- Medium.setState_phX(port_b.p,
- noEvent(port_b.h_outflow),
- noEvent(port_b.Xi_outflow))
- if show_T "Medium properties in port_b";
- // - Copy continues in protected section
-
-protected
- parameter Modelica.Units.SI.MassFlowRate _m_flow_nominal=
- max(eff.per.pressure.V_flow)*rho_default
- "Nominal mass flow rate";
-
- // Copied from Fluid.Interfaces.PartialTwoPortInterface
- final parameter Modelica.Units.SI.MassFlowRate _m_flow_start=0
- "Start value for m_flow, used to avoid a warning if not set in m_flow, and to avoid m_flow.start in parameter window";
- final parameter Modelica.Units.SI.PressureDifference _dp_start(displayUnit=
- "Pa") = 0
- "Start value for dp, used to avoid a warning if not set in dp, and to avoid dp.start in parameter window";
- // - End of copy
-
- final parameter Modelica.Units.SI.VolumeFlowRate _VMachine_flow=0
- "Start value for VMachine_flow, used to avoid a warning if not specified";
-
- parameter IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable preVar "Type of prescribed variable";
-
- // The parameter speedIsInput is required to conditionally remove the instance gain.
- // If the conditional removal of this instance where to use the test
- // preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed,
- // then OpenModelica fails to translate the model with the message
- // .../PartialFlowMachine.mo:185:3-189:70:writable]
- // Error: Variable Types.PrescribedVariable.Speed not found in scope
- // IBPSA.Fluid.Movers.SpeedControlled_y$floMac1.
- final parameter Boolean speedIsInput=
- (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed)
- "Parameter that is true if speed is the controlled variables";
-
- final parameter Integer nOri = size(per.pressure.V_flow, 1)
- "Number of data points for pressure curve"
- annotation(Evaluate=true);
-
- final parameter Boolean haveVMax = eff.haveVMax
- "Flag, true if user specified data that contain V_flow_max";
-
- final parameter Modelica.Units.SI.VolumeFlowRate V_flow_max=eff.V_flow_max;
- final parameter Modelica.Units.SI.Density rho_default=
- Medium.density_pTX(
- p=Medium.p_default,
- T=Medium.T_default,
- X=Medium.X_default) "Default medium density";
-
- final parameter Medium.ThermodynamicState sta_start=Medium.setState_pTX(
- T=T_start,
- p=p_start,
- X=X_start) "Medium state at start values";
-
- final parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start=
- Medium.specificEnthalpy(sta_start) "Start value for outflowing enthalpy";
-
- final parameter Modelica.Units.SI.Frequency fCut=5/(2*Modelica.Constants.pi*
- riseTime) "Cut-off frequency of filter";
-
- Modelica.Blocks.Sources.Constant[size(stageInputs, 1)] stageValues(
- final k=stageInputs)
- if inputType == IBPSA.Fluid.Types.InputType.Stages "Stage input values"
- annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
- Modelica.Blocks.Sources.Constant setConst(
- final k=constInput)
- if inputType == IBPSA.Fluid.Types.InputType.Constant
- "Constant input set point"
- annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-
- Extractor extractor(final nin=size(stageInputs,1))
- if inputType == IBPSA.Fluid.Types.InputType.Stages "Stage input extractor"
- annotation (Placement(transformation(extent={{-50,60},{-30,40}})));
-
- Modelica.Blocks.Routing.RealPassThrough inputSwitch
- "Dummy connection for easy connection of input options"
- annotation (
- Placement(transformation(
- extent={{-10,-10},{10,10}},
- origin={-10,50})));
-
- IBPSA.Fluid.Delays.DelayFirstOrder vol(
- redeclare final package Medium = Medium,
- final tau=tau,
- final energyDynamics=energyDynamics,
- final T_start=T_start,
- final X_start=X_start,
- final C_start=C_start,
- final m_flow_nominal=_m_flow_nominal,
- final m_flow_small=m_flow_small,
- final p_start=p_start,
- final prescribedHeatFlowRate=true,
- final allowFlowReversal=allowFlowReversal,
- nPorts=2) "Fluid volume for dynamic model"
- annotation (Placement(transformation(extent={{-70,0},{-90,20}})));
-
- IBPSA.Fluid.BaseClasses.ActuatorFilter filter(
- final n=2,
- final f=fCut,
- final normalized=true,
- final initType=init) if use_inputFilter
- "Second order filter to approximate dynamics of the fan or pump's speed, and to improve numerics"
- annotation (Placement(transformation(extent={{20,61},{40,80}})));
-
- Modelica.Blocks.Math.Gain gaiSpe(y(final unit="1"))
- if inputType == IBPSA.Fluid.Types.InputType.Continuous and
- speedIsInput
- "Gain to normalized speed using speed_nominal or speed_rpm_nominal"
- annotation (Placement(transformation(extent={{-4,74},{-16,86}})));
-
- IBPSA.Fluid.Movers.BaseClasses.IdealSource preSou(
- redeclare final package Medium = Medium,
- final m_flow_small=m_flow_small,
- final allowFlowReversal=allowFlowReversal,
- final control_m_flow= (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.FlowRate))
- "Pressure source"
- annotation (Placement(transformation(extent={{40,-10},{60,10}})));
-
- IBPSA.Fluid.Movers.BaseClasses.PowerInterface heaDis(
- final motorCooledByFluid=per.motorCooledByFluid,
- final delta_V_flow=1E-3*V_flow_max)
- if addPowerToMedium "Heat dissipation into medium"
- annotation (Placement(transformation(extent={{20,-80},{40,-60}})));
-
- Modelica.Blocks.Math.Add PToMed(final k1=1, final k2=1)
- if addPowerToMedium "Heat and work input into medium"
- annotation (Placement(transformation(extent={{50,-90},{70,-70}})));
-
- Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow prePow(
- final alpha=0)
- if addPowerToMedium
- "Prescribed power (=heat and flow work) flow for dynamic model"
- annotation (Placement(transformation(extent={{-14,-104},{-34,-84}})));
-
- Modelica.Blocks.Sources.RealExpression rho_inlet(y=
- Medium.density(
- Medium.setState_phX(port_a.p,
- inStream(port_a.h_outflow),
- inStream(port_a.Xi_outflow))))
- "Density of the inflowing fluid"
- annotation (Placement(transformation(extent={{-90,-74},{-70,-54}})));
-
- IBPSA.Fluid.Sensors.MassFlowRate senMasFlo(
- redeclare final package Medium = Medium) "Mass flow rate sensor"
- annotation (Placement(transformation(extent={{-50,10},{-30,-10}})));
-
- IBPSA.Fluid.Sensors.RelativePressure senRelPre(
- redeclare final package Medium = Medium) "Head of mover"
- annotation (Placement(transformation(extent={{58,-27},{43,-14}})));
-
- // Because the speed data are not used by FlowMachineInterface, we set them
- // to zero.
- IBPSA.Fluid.Movers.BaseClasses.FlowMachineInterface eff(
- per(
- final powerOrEfficiencyIsHydraulic = per.powerOrEfficiencyIsHydraulic,
- final efficiency = per.efficiency,
- final motorEfficiency = per.motorEfficiency,
- final motorEfficiency_yMot = per.motorEfficiency_yMot,
- final motorCooledByFluid = per.motorCooledByFluid,
- final speed_nominal = 0,
- final constantSpeed = 0,
- final speeds = {0},
- final power = per.power,
- final peak = per.peak),
- final nOri = nOri,
- final rho_default=rho_default,
- final computePowerUsingSimilarityLaws=computePowerUsingSimilarityLaws,
- r_V(start=_m_flow_nominal/rho_default),
- final preVar=preVar) "Flow machine"
- annotation (Placement(transformation(extent={{-32,-68},{-12,-48}})));
-
-protected
- block Extractor
- "Extract scalar signal out of signal vector dependent on IntegerRealInput index"
- extends Modelica.Blocks.Interfaces.MISO;
-
- Modelica.Blocks.Interfaces.IntegerInput index "Integer input for control input"
- annotation (Placement(
- transformation(
- origin={0,-120},
- extent={{-20,-20},{20,20}},
- rotation=90)));
- equation
- y = sum({if index == i then u[i] else 0 for i in 1:nin});
-
- annotation (Icon(graphics={
- Rectangle(
- extent={{-80,50},{-40,-50}},
- lineColor={0,0,127},
- fillColor={255,255,255},
- fillPattern=FillPattern.Solid),
- Polygon(
- points={{-84.4104,1.9079},{-84.4104,-2.09208},{-80.4104,-0.09208},{
- -84.4104,1.9079}},
- lineColor={0,0,127},
- fillColor={0,0,0},
- fillPattern=FillPattern.Solid),
- Line(points={{-62,2},{-50.1395,12.907},{-39.1395,12.907}}, color={0,0,
- 127}),
- Line(points={{-63,4},{-49,40},{-39,40}}, color={0,0,127}),
- Line(points={{-102,0},{-65.0373,-0.01802}}, color={0,0,127}),
- Ellipse(
- extent={{-70.0437,4.5925},{-60.0437,-4.90745}},
- lineColor={0,0,127},
- fillColor={0,0,127},
- fillPattern=FillPattern.Solid),
- Line(points={{-63,-5},{-50,-40},{-39,-40}}, color={0,0,127}),
- Line(points={{-62,-2},{-50.0698,-12.907},{-39.0698,-12.907}}, color={
- 0,0,127}),
- Polygon(
- points={{-38.8808,-11},{-38.8808,-15},{-34.8808,-13},{-38.8808,-11}},
- lineColor={0,0,127},
- fillColor={255,255,255},
- fillPattern=FillPattern.Solid),
- Polygon(
- points={{-39,42},{-39,38},{-35,40},{-39,42}},
- lineColor={0,0,127},
- fillColor={255,255,255},
- fillPattern=FillPattern.Solid),
- Polygon(
- points={{-38.8728,-38.0295},{-38.8728,-42.0295},{-34.8728,-40.0295},
- {-38.8728,-38.0295}},
- lineColor={0,0,127},
- fillColor={255,255,255},
- fillPattern=FillPattern.Solid),
- Polygon(
- points={{-38.9983,14.8801},{-38.9983,10.8801},{-34.9983,12.8801},{-38.9983,
- 14.8801}},
- lineColor={0,0,127},
- fillColor={255,255,255},
- fillPattern=FillPattern.Solid),
- Rectangle(
- extent={{-30,50},{30,-50}},
- fillColor={235,235,235},
- fillPattern=FillPattern.Solid,
- lineColor={0,0,127}),
- Line(points={{100,0},{0,0}}, color={0,0,127}),
- Line(points={{0,2},{0,-104}}, color={255,128,0}),
- Line(points={{-35,40},{-20,40}}, color={0,0,127}),
- Line(points={{-35,13},{-20,13}}, color={0,0,127}),
- Line(points={{-35,-13},{-20,-13}}, color={0,0,127}),
- Line(points={{-35,-40},{-20,-40}}, color={0,0,127}),
- Polygon(points={{0,0},{-20,13},{-20,13},{0,0},{0,0}}, lineColor={0,0,
- 127}),
- Ellipse(
- extent={{-6,6},{6,-6}},
- lineColor={255,128,0},
- fillColor={255,128,0},
- fillPattern=FillPattern.Solid)}));
- end Extractor;
-
-initial algorithm
- // The control signal is dp or m_flow but the user did not provide a fan or pump curve.
- // Hence, the speed is computed using default values, which likely are wrong.
- // Therefore, scaling the power using the speed is inaccurate.
- assert(nominalValuesDefineDefaultPressureCurve or
- per.havePressureCurve or
- (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed),
-"*** Warning: You are using a flow or pressure controlled mover with the
- default pressure curve.
- This leads to approximate calculations of the electrical power
- consumption. Add the correct pressure curve in the record per
- to obtain an accurate computation.
- Setting nominalValuesDefineDefaultPressureCurve=true will suppress this warning.",
- level=AssertionLevel.warning);
-
- // The control signal is dp or m_flow but the user did not provide a fan or pump curve.
- // Hence, the speed is computed using default values, which likely are wrong.
- // In addition, the user wants to use (V_flow, P) to compute the power.
- // This can lead to using a power that is less than the flow work. We avoid
- // this by ignoring the setting of per.etaHydMet.
- // The comment is split into two parts since otherwise the JModelica C-compiler
- // throws warnings.
- assert(nominalValuesDefineDefaultPressureCurve or
- (per.havePressureCurve or
- (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed)) or
- per.etaHydMet<>
- IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate,
-"*** Warning: You are using a flow or pressure controlled mover with the
- default pressure curve with per.etaHydMet set to
- IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate.
- Since this can cause wrong power consumption, the model will overwrite
- this setting and use instead
- IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided." +
- "See the user guide to see what assumptions are made in this setting
- or provide other information to the model.
- Setting nominalValuesDefineDefaultPressureCurve=true will suppress this warning.",
- level=AssertionLevel.warning);
-
- assert(per.havePressureCurve or
- not (per.etaHydMet ==
- IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate
- or per.etaHydMet ==
- IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber),
-"*** Warning in "+ getInstanceName()+
- ": per.etaHydMet is set to .Power_VolumeFlowRate or .EulerNumber.
- This requires that per.pressure be provided.
- Because it is not,
- the model will override this setting and use .NotProvided instead.",
- level=AssertionLevel.warning);
-
- assert(per.havePressureCurve or per.haveWMot_nominal or
- not (per.etaMotMet ==
- IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
- or per.etaMotMet ==
- IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve),
-"*** Warning in "+ getInstanceName()+
- ": per.etaMotMet is set to .Efficiency_MotorPartLoadRatio
- or .GenericCurve. This requires that per.WMot_nominal be provided
- or at least per.pressure be provided so that per.WMot_nominal can
- be estimated. Because neither is provided,
- the model will override this setting and use .NotProvided instead.",
- level=AssertionLevel.warning);
-
- assert(per.powerOrEfficiencyIsHydraulic or
- not (per.etaMotMet ==
- IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
- or per.etaMotMet ==
- IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve),
-"*** Warning in "+ getInstanceName()+
- ": per.etaMotMet is set to .Efficiency_MotorPartLoadRatio
- or .GenericCurve while information is provided for total electric
- power instead of hydraulic power. This forms an algebraic loop
- and may cause the simulation to not converge
- (see the \"Motor efficiency\" section in usersguide).",
- level=AssertionLevel.warning);
-
-equation
- connect(prePow.port, vol.heatPort) annotation (Line(
- points={{-34,-94},{-60,-94},{-60,10},{-70,10}},
- color={191,0,0}));
-
- connect(vol.heatPort, heatPort) annotation (Line(
- points={{-70,10},{-70,10},{-60,10},{-60,-100}},
- color={191,0,0}));
- connect(preSou.port_b, port_b) annotation (Line(
- points={{60,0},{100,0}},
- color={0,127,255},
- smooth=Smooth.None));
- connect(stageValues.y, extractor.u) annotation (Line(
- points={{-59,50},{-52,50}},
- color={0,0,127},
- smooth=Smooth.None));
- connect(extractor.y, inputSwitch.u) annotation (Line(
- points={{-29,50},{-22,50}},
- color={0,0,127},
- smooth=Smooth.None));
- connect(setConst.y, inputSwitch.u) annotation (Line(
- points={{-59,80},{-26,80},{-26,50},{-22,50}},
- color={0,0,127},
- smooth=Smooth.None));
- connect(extractor.index, stage) annotation (Line(
- points={{-40,62},{-40,90},{0,90},{0,120}},
- color={255,127,0},
- smooth=Smooth.None));
-
- connect(PToMed.y, prePow.Q_flow) annotation (Line(points={{71,-80},{80,-80},{80,
- -94},{-14,-94}}, color={0,0,127}));
- connect(PToMed.u1, heaDis.Q_flow) annotation (Line(points={{48,-74},{44,-74},{
- 44,-72},{44,-70},{41,-70}},
- color={0,0,127}));
-
- connect(senRelPre.port_b, preSou.port_a) annotation (Line(points={{43,-20.5},{
- 20,-20.5},{20,0},{40,0}},
- color={0,127,255}));
- connect(senRelPre.port_a, preSou.port_b) annotation (Line(points={{58,-20.5},{
- 80,-20.5},{80,0},{60,0}},
- color={0,127,255}));
- connect(heaDis.V_flow,eff. V_flow) annotation (Line(points={{18,-60},{14,-60},
- {14,-52},{-11,-52}}, color={0,0,127}));
- connect(eff.PEle, heaDis.PEle) annotation (Line(points={{-11,-60},{0,-60},{0,
- -80},{18,-80}}, color={0,0,127}));
- connect(eff.WFlo, heaDis.WFlo) annotation (Line(points={{-11,-56},{4,-56},{4,
- -66},{18,-66}}, color={0,0,127}));
- connect(rho_inlet.y,eff. rho) annotation (Line(points={{-69,-64},{-69,-64},{-34,
- -64}}, color={0,0,127}));
- connect(eff.m_flow, senMasFlo.m_flow) annotation (Line(points={{-34,-54},{-34,
- -54},{-40,-54},{-40,-11}}, color={0,0,127}));
- connect(eff.WFlo, PToMed.u2) annotation (Line(points={{-11,-56},{4,-56},{4,
- -86},{48,-86}}, color={0,0,127}));
- connect(inputSwitch.y, filter.u) annotation (Line(points={{1,50},{12,50},{12,70.5},
- {18,70.5}}, color={0,0,127}));
-
- connect(senRelPre.p_rel, eff.dp_in) annotation (Line(points={{50.5,-26.35},{50.5,
- -38},{-18,-38},{-18,-46}}, color={0,0,127}));
- connect(eff.y_out, y_actual) annotation (Line(points={{-11,-48},{92,-48},{92,
- 70},{110,70}},
- color={0,0,127}));
- connect(port_a, vol.ports[1])
- annotation (Line(points={{-100,0},{-79,0},{-79,0}}, color={0,127,255}));
- connect(vol.ports[2], senMasFlo.port_a)
- annotation (Line(points={{-81,0},{-81,0},{-50,0}}, color={0,127,255}));
- connect(senMasFlo.port_b, preSou.port_a)
- annotation (Line(points={{-30,0},{40,0},{40,0}}, color={0,127,255}));
- connect(eff.WHyd, heaDis.WHyd) annotation (Line(points={{-11,-58},{2,-58},{2,
- -74},{18,-74}}, color={0,0,127}));
- connect(eff.PEle, P) annotation (Line(points={{-11,-60},{0,-60},{0,-50},{90,
- -50},{90,90},{110,90}},
- color={0,0,127}));
- annotation(Icon(coordinateSystem(preserveAspectRatio=false,
- extent={{-100,-100},{100,100}}),
- graphics={
- Line(
- points={{0,70},{100,70}},
- color={0,0,0},
- smooth=Smooth.None),
- Line(
- points={{0,90},{100,90}},
- color={0,0,0},
- smooth=Smooth.None),
- Line(
- visible=not use_inputFilter,
- points={{0,100},{0,40}}),
- Rectangle(
- extent={{-100,16},{100,-16}},
- lineColor={0,0,0},
- fillColor={0,127,255},
- fillPattern=FillPattern.HorizontalCylinder),
- Ellipse(
- extent={{-58,58},{58,-58}},
- lineColor={0,0,0},
- fillPattern=FillPattern.Sphere,
- fillColor={0,100,199}),
- Polygon(
- points={{0,50},{0,-50},{54,0},{0,50}},
- lineColor={0,0,0},
- pattern=LinePattern.None,
- fillPattern=FillPattern.HorizontalCylinder,
- fillColor={255,255,255}),
- Ellipse(
- extent={{4,16},{36,-16}},
- lineColor={0,0,0},
- fillPattern=FillPattern.Sphere,
- visible=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState,
- fillColor={0,100,199}),
- Text(extent={{64,106},{114,92}},
- textColor={0,0,127},
- textString="P"),
- Text(extent={{42,86},{92,72}},
- textColor={0,0,127},
- textString="y_actual"),
- Line(
- points={{0,100},{0,50}},
- color={0,0,0},
- smooth=Smooth.None),
- Rectangle(
- visible=use_inputFilter,
- extent={{-32,40},{34,100}},
- lineColor={0,0,0},
- fillColor={135,135,135},
- fillPattern=FillPattern.Solid),
- Ellipse(
- visible=use_inputFilter,
- extent={{-32,100},{34,40}},
- lineColor={0,0,0},
- fillColor={135,135,135},
- fillPattern=FillPattern.Solid),
- Text(
- visible=use_inputFilter,
- extent={{-20,92},{22,46}},
- textColor={0,0,0},
- fillColor={135,135,135},
- fillPattern=FillPattern.Solid,
- textString="M",
- textStyle={TextStyle.Bold})}),
- obsolete = "Obsolete model - use IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine instead",
-Documentation(info="
-
-This is the base model for fans and pumps.
-It provides an interface
-between the equations that compute head and power consumption,
-and the implementation of the energy and pressure balance
-of the fluid.
-
-
-Optionally, the fluid volume
-is computed using a dynamic balance or a steady-state balance.
-
-
-The parameter addPowerToMedium
determines whether
-any power is added to the fluid. The default is addPowerToMedium=true
,
-and hence the outlet enthalpy is higher than the inlet enthalpy if the
-flow device is operating.
-The setting addPowerToMedium=false
is physically incorrect
-(since the flow work, the flow friction and the fan heat do not increase
-the enthalpy of the medium), but this setting does in some cases lead to simpler equations
-and more robust simulation, in particular if the mass flow is equal to zero.
-
-
-In the previous implementation, this model extends from
-
-IBPSA.Fluid.Interfaces.PartialTwoPortInterface.
-Now it copies much of the code instead.
-This is to resolve a potential circular parameter binding that occurs when
-
-IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y
-extends from
-
-IBPSA.Fluid.Movers.SpeedControlled_y.
-The former uses the nominal flow rate provided by user to construct
-the pressure curve, whilst the latter uses the user-provided pressure curve
-to determine the nominal flow rate. The new implementation removes the
-original declaration of nominal flow rate from
-
-IBPSA.Fluid.Interfaces.PartialTwoPortInterface
-and hides it (protected _m_flow_nominal
) from the user.
-This way, A higher-level model (e.g.
-
-IBPSA.Fluid.Movers.FlowControlled_dp),
-can still provide a default but not the other way around.
-See discussions in
-#1705.
-
-",
-revisions="
-
--
-March 29, 2023, by Hongxiang Fu:
-Copied this model to the Obsolete package.
-The support for rpm inputs is removed in the original model.
-This is for
-IBPSA, #1704.
-
--
-March 1, 2023, by Hongxiang Fu:
-Instead of extending
-
-IBPSA.Fluid.Interfaces.PartialTwoPortInterface,
-this model now has its code copied, then rewrote m_flow_nominal
-as protected _m_flow_nominal
.
-This is for
-#1705.
-
--
-May 6, 2022, by Hongxiang Fu:
-
--
-Moved
haveVMax
from here to
-
-IBPSA.Fluid.Movers.BaseClasses.FlowMachineInterface
-and V_flow_max
from here to
-
-IBPSA.Fluid.Movers.Data.Generic.
-
--
-Added
per.peak
, per.totalEfficiency,
,
-per.motorEfficiency_yMot
to be also passed down to eff.per
-at instantiation.
-
--
-Added an
assert()
warning when the model has to make an unreliable
-guess for efficiency computation using .EulerNumber
.
-
--
-Added an
assert()
warning when the model has to overwrite
-per.etaMotMet
.
-
-
-These are for
-#2668.
-
--
-June 17, 2021, by Michael Wetter:
-Changed implementation of the filter.
-This is for
-#1498.
-
--
-October 25, 2019, by Jianjun Hu:
-Improved icon graphics annotation. This is for
-#1225.
-
--
-January 22, 2019, by Filip Jorissen:
-Split long assert output string into two strings to avoid compiler warnings
-in JModelica.
-This is for
-#1081.
-
--
-January 8, 2019, by Filip Jorissen:
-Added assert for value of m_flow_nominal
.
-This is for
-#908.
-
--
-March 24, 2017, by Michael Wetter:
-Renamed filteredSpeed
to use_inputFilter
.
-This is for
-#665.
-
--
-December 2, 2016, by Michael Wetter:
-Removed min
attribute as otherwise numerical noise can cause
-the assertion on the limit to fail.
-This is for
-#606.
-
--
-November 3, 2016, by Michael Wetter:
-Set start value for VMachine_flow
to avoid a warning in
-
-IBPSA.Fluid.Movers.Examples.MoverContinuous.
-
--
-July 29, 2016, by Michael Wetter:
-Made Extractor
protected so that it can be removed later
-with a backwards compatible change.
-
--
-July 19, 2016, by Filip Jorissen:
-Created custom implementation for extractor.
-This is for
-#498.
-
--
-June 16, 2016, by Filip Jorissen:
-Switched position of mixing volume and mass flow rate sensor.
-This is to have a consistent operating point tuple
-of dp
and m_flow
when having
-compressible flow.
-This is for
-#458.
-
--
-February 19, 2016, by Michael Wetter and Filip Jorissen:
-Refactored model to make implementation clearer.
-This model now includes code for both speed and flow prescribed models,
-eliminating the need for an additional level of partial models.
-This is for
-#417.
-
--
-Removed the parameter
dynamicBalance
.
-This is for
-#411.
-
--
-November 19, 2015, by Michael Wetter:
-Removed assignment of parameter
-showDesignFlowDirection
in extends
statement.
-This is for
-#349.
-Removed assignment of min
and max
attributes
-of the port mass flow rate as this is already done in the base class.
-Removed import
statement.
-
--
-April 2, 2015, by Filip Jorissen:
-Added code for supporting stage input and constant input.
-Added code for displaying constant set point in symbol.
-
--
-January 24, 2015, by Michael Wetter:
-Propagated m_flow_small
of instance vol
and made
-all its parameters final.
-
--
-May 25, 2011, by Michael Wetter:
-Revised implementation of energy balance to avoid having to use conditionally removed models.
-
--
-July 29, 2010, by Michael Wetter:
-Reduced fan time constant from 10 to 1 second.
-
--
-July 27, 2010, by Michael Wetter:
-Redesigned model to fix bug in medium balance.
-
-- March 24 2010, by Michael Wetter:
-First implementation.
-
-
-"));
-end PartialFlowMachine;
diff --git a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.mo b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.mo
deleted file mode 100644
index 20dfc0e4f9..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers;
-package BaseClasses "Package with base classes for IBPSA.Obsolete.Fluid.Movers"
- extends Modelica.Icons.BasesPackage;
-annotation (preferredView="info", Documentation(info="
-
-This package contains base classes that are used to construct the models in
-
-IBPSA.Obsolete.Fluid.Movers.
-
-"));
-end BaseClasses;
diff --git a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.order b/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.order
deleted file mode 100644
index 1de5c0a7f0..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/BaseClasses/package.order
+++ /dev/null
@@ -1 +0,0 @@
-PartialFlowMachine
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo
deleted file mode 100644
index 71ba99f159..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo
+++ /dev/null
@@ -1,300 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Data;
-record Generic "Generic data record for movers"
- extends Modelica.Icons.Record;
-
- // Pressure requires default values to avoid in Dymola the message
- // Failed to expand the variable pressure.V_flow.
- parameter IBPSA.Fluid.Movers.BaseClasses.Characteristics.flowParameters pressure(
- V_flow = {0, 0},
- dp = {0, 0}) "Volume flow rate vs. total pressure rise"
- annotation(Evaluate=true,
- Dialog(group="Pressure curve"));
- parameter Modelica.Units.SI.VolumeFlowRate V_flow_max=
- if havePressureCurve
- then (pressure.V_flow[end]
- -(pressure.V_flow[end] - pressure.V_flow[end - 1])
- /(pressure.dp[end] - pressure.dp[end - 1])
- * pressure.dp[end])
- else 0
- "Volume flow rate on the curve when pressure rise is zero";
- parameter Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa")=
- if havePressureCurve
- then (pressure.dp[1]
- -(pressure.dp[1] - pressure.dp[2])
- /(pressure.V_flow[1] - pressure.V_flow[2])
- * pressure.V_flow[1])
- else 0
- "Pressure rise on the curve when flow rate is zero";
-
- // Efficiency computation choices
- parameter IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod etaHydMet=
- IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber
- "Efficiency computation method for the hydraulic efficiency etaHyd"
- annotation (Dialog(group="Power computation"));
- parameter IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod etaMotMet=
- if powerOrEfficiencyIsHydraulic
- then IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve
- else IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
- "Efficiency computation method for the motor efficiency etaMot"
- annotation (Dialog(group="Power computation"));
-
- parameter Boolean powerOrEfficiencyIsHydraulic=true
- "=true if hydraulic power or efficiency is provided, instead of total"
- annotation (Dialog(group="Power computation",
- enable=max(power.P)>Modelica.Constants.eps
- or max(efficiency.eta)>Modelica.Constants.eps));
-
- // Arrays for efficiency values
- parameter
- IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters
- efficiency(
- V_flow={0},
- eta={0.7}) "Total or hydraulic efficiency vs. volumetric flow rate"
- annotation (Dialog(group="Power computation",
- enable=etaHydMet == IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Efficiency_VolumeFlowRate));
- parameter
- IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters
- motorEfficiency(
- V_flow={0},
- eta={0.7})
- "Motor efficiency vs. volumetric flow rate"
- annotation (Dialog(group="Power computation",
- enable=etaMotMet == IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_VolumeFlowRate));
- parameter
- IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
- motorEfficiency_yMot(y={0}, eta={0.7})
- "Motor efficiency vs. part load ratio yMot, where yMot = WHyd/WMot_nominal"
- annotation (Dialog(group="Power computation", enable=etaMotMet ==
- IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio));
-
- // Power curve
- // It requires default values to suppress Dymola message
- // "Failed to expand the variable Power.V_flow"
- parameter IBPSA.Fluid.Movers.BaseClasses.Characteristics.powerParameters power(
- V_flow={0},
- P={0})
- "Power (either consumed or hydraulic) vs. volumetric flow rate"
- annotation (Dialog(group="Power computation",
- enable = etaHydMet==
- IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate));
-
- // Peak condition
- parameter IBPSA.Fluid.Movers.BaseClasses.Euler.peak peak(
- V_flow=peak_internal.V_flow,
- dp=peak_internal.dp,
- eta=peak_internal.eta)
- "Volume flow rate, pressure rise, and efficiency (either total or hydraulic) at peak condition"
- annotation (Dialog(group="Power computation",
- enable = etaHydMet==
- IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber));
- final parameter IBPSA.Fluid.Movers.BaseClasses.Euler.peak peak_internal=
- IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak(pressure=pressure,power=power)
- "Internal peak variable";
- // The getPeak() function automatically handles the estimation of peak point
- // when insufficient information is provided from the pressure curve.
-
- // Motor
- parameter Boolean motorCooledByFluid=true
- "If true, then motor heat is added to fluid stream"
- annotation(Dialog(group="Motor heat rejection"));
- parameter Modelica.Units.SI.Power WMot_nominal=
- if max(power.P)>Modelica.Constants.eps
- then
- if powerOrEfficiencyIsHydraulic
- then max(power.P)*1.2
- else max(power.P)
- else
- if havePressureCurve
- then V_flow_max/2 * dpMax/2 /0.7*1.2
- else 0
- "Rated motor power"
- annotation(Dialog(group="Power computation",
- enable= etaMotMet==
- IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
- or etaMotMet==
- IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve));
- parameter Modelica.Units.SI.Efficiency etaMot_max(max=1)= 0.7
- "Maximum motor efficiency"
- annotation (Dialog(group="Power computation", enable=etaMotMet ==
- IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve));
- final parameter
- IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot
- motorEfficiency_yMot_generic=
- IBPSA.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve(
- P_nominal=WMot_nominal,
- eta_max=etaMot_max)
- "Motor efficiency vs. part load ratio"
- annotation (Dialog(enable=false));
- final parameter Boolean haveWMot_nominal=WMot_nominal > Modelica.Constants.eps
- "= true, if the rated motor power is provided";
-
- // Speed
- parameter Real speed_nominal(
- final min=0,
- final unit="1") = 1 "Nominal rotational speed for flow characteristic"
- annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)"));
-
- parameter Real constantSpeed(final min=0, final unit="1") = constantSpeed_rpm/speed_rpm_nominal
- "Normalized speed set point, used if inputType = IBPSA.Fluid.Types.InputType.Constant"
- annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)"));
-
- parameter Real[:] speeds(each final min = 0, each final unit="1") = speeds_rpm/speed_rpm_nominal
- "Vector of normalized speed set points, used if inputType = IBPSA.Fluid.Types.InputType.Stages"
- annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)"));
-
- parameter Modelica.Units.NonSI.AngularVelocity_rpm speed_rpm_nominal=1500
- "Nominal rotational speed for flow characteristic"
- annotation (Dialog(group="Speeds in RPM"));
-
- parameter Modelica.Units.NonSI.AngularVelocity_rpm constantSpeed_rpm=
- speed_rpm_nominal
- "Speed set point, used if inputType = IBPSA.Fluid.Types.InputType.Constant"
- annotation (Dialog(group="Speeds in RPM"));
-
- parameter Modelica.Units.NonSI.AngularVelocity_rpm[:] speeds_rpm={
- speed_rpm_nominal}
- "Vector of speed set points, used if inputType = IBPSA.Fluid.Types.InputType.Stages"
- annotation (Dialog(group="Speeds in RPM"));
-
- // Set a parameter in order for
- // (a) FlowControlled_m_flow and FlowControlled_dp to be able to set a reasonable
- // default pressure curve if it is not specified here, and
- // (b) SpeedControlled_y to be able to issue an assert
- // if no pressure curve is specified.
- final parameter Boolean havePressureCurve=
- sum(pressure.V_flow) > Modelica.Constants.eps and
- sum(pressure.dp) > Modelica.Constants.eps
- "= true, if default record values are being used";
-
- annotation (
- defaultComponentPrefixes = "parameter",
- defaultComponentName = "per",
- Documentation(revisions="
-
--
-March 28, 2023, by Hongxiang Fu:
-Copied this record to the Obsolete package.
-Revised its original version to remove all rotational speed specifications.
-This is for
-IBPSA, #1704.
-
--
-March 1, 2022, by Hongxiang Fu:
-
-These are for
-#2668.
-
--
-February 19, 2016, by Filip Jorissen:
-Refactored model such that SpeedControlled_Nrpm
,
-SpeedControlled_y
and FlowControlled
-are integrated into one record.
-This is for
-#417.
-
--
-February 17, 2016, by Michael Wetter:
-Changed parameter N_nominal
to
-speed_rpm_nominal
as it is the same quantity as speeds_rmp
.
-This is for
-#396.
-
--
-January 19, 2016, by Filip Jorissen:
-Added parameter speeds_rpm
.
-This is for
-#396.
-
--
-February 13, 2015, by Michael Wetter:
-Updated documentation.
-
--
-January 6, 2015, by Michael Wetter:
-Revised record for OpenModelica.
-
--
-November 22, 2014 by Michael Wetter:
-First implementation.
-
-
-", info="
-
-Record containing parameters for pumps or fans.
-
-Typical use
-
-This record may be used to assign for example fan performance data using
-declaration such as
-
-
- IBPSA.Fluid.Movers.SpeedControlled_y fan(
- redeclare package Medium = Medium,
- per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
- dp={2*dp_nominal,dp_nominal,0}))) \"Fan\";
-
-
-This data record can be used with
-
-IBPSA.Fluid.Movers.SpeedControlled_y,
-
-IBPSA.Fluid.Movers.FlowControlled_dp,
-
-IBPSA.Fluid.Movers.FlowControlled_m_flow.
-
-
-An example that uses manufacturer data can be found in
-
-IBPSA.Fluid.Movers.Validation.Pump_y_stratos.
-
-Declaration of the peak condition
-
-The variable peak
is intentionally declared in a way that each of its
-element is declared individually. If it was delcared the same way as does
-peak_internal
, Modelica would prevent the modification of its
-specific elements with the following error message:
-
-Record has a value, and attempt to modify specific elements.
-The element modification of e.g. V_flow will be ignored.
-
-The other variable peak_internal
uses a function call to compute its
-default values. By passing them to peak
one by one, the model can
-both have default values and also allow the user to override them easily.
-See
-Modelica Specification issue #791.
-
-Parameters in RPM
-
-The parameters speed_rpm_nominal
,
-constantSpeed_rpm
and
-speeds_rpm
are used to assign the non-dimensional speeds
-
-
- parameter Real constantSpeed(final min=0, final unit=\"1\") = constantSpeed_rpm/speed_rpm_nominal;
- parameter Real[:] speeds(each final min = 0, each final unit=\"1\") = speeds_rpm/speed_rpm_nominal;
-
-
-Flow-controlled models do not these speed parameters in RPM.
-
-"));
-end Generic;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos25slash1to4.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos25slash1to4.mo
deleted file mode 100644
index aaba3f0d52..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos25slash1to4.mo
+++ /dev/null
@@ -1,69 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo;
-record Stratos25slash1to4 "Pump data for a Wilo Stratos 25/1-4 pump"
- extends Generic(
- speed_rpm_nominal=1800,
- final powerOrEfficiencyIsHydraulic=false,
- etaHydMet=IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate,
- power(V_flow={5.55555555556e-07, 0.000402190923318, 0.00052269170579,
- 0.000643192488263, 0.000752738654147, 0.000866979655712,
- 0.000973395931142, 0.00108607198748, 0.00115962441315},
- P={ 14.2085618951, 21.2596204596, 23.3573239437,
- 25.1349149442, 26.581943662, 27.9121571534,
- 28.8498841148, 29.4981726255, 29.7520982304}),
- pressure(V_flow={5.55555555556e-07, 0.000402190923318, 0.00052269170579,
- 0.000643192488263, 0.000752738654147, 0.000866979655712,
- 0.000973395931142, 0.00108607198748, 0.00115962441315},
- dp={ 17066.9518717, 16997.0053476, 16437.4331551,
- 15528.1283422, 14408.9839572, 13149.9465241,
- 11681.0695187, 9932.40641711, 8533.47593583}));
- annotation (
-defaultComponentPrefixes="parameter",
-defaultComponentName="per",
-Documentation(info="
- Data from:
-
- http://productfinder.wilo.com/en/COM/product/0000000e000379df0002003a/fc_product_datasheet
-
-
- See
-
- IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6
-
- for more information about how the data is derived.
-
- ",
- revisions="
-
--
-March 28, 2023, by Hongxiang Fu:
-Copied this record to the Obsolete package.
-Revised its original version to remove all rotational speed specifications.
-This is for
-IBPSA, #1704.
-
--
-October 14, 2021, by Hongxiang Fu:
-Rewrote the statements using use_powerCharacteristic
-to support the implementation of
-
-IBPSA.Fluid.Movers.BaseClasses.Euler
.
-This is for
-#2668.
-
--
-February 17, 2016, by Michael Wetter:
-Updated parameter names for
-#396.
-
--
-December 12, 2014, by Michael Wetter:
-Added defaultComponentPrefixes
and
-defaultComponentName
annotations.
-
-- April 17, 2014
- by Filip Jorissen:
- Initial version
-
-
-"));
-end Stratos25slash1to4;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos32slash1to12.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos32slash1to12.mo
deleted file mode 100644
index 10e5ade309..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/Stratos32slash1to12.mo
+++ /dev/null
@@ -1,68 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo;
-record Stratos32slash1to12 "Pump data for a Wilo Stratos 32/1-12 pump"
- extends Generic(
- speed_rpm_nominal=3580,
- final powerOrEfficiencyIsHydraulic=false,
- etaHydMet=IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate,
- power(V_flow={2.11830535572e-05, 0.000167865707434, 0.000700939248601,
- 0.0012450039968, 0.00177258193445, 0.00227268185452,
- 0.00272332134293, 0.00312450039968, 0.00345423661071},
- P={ 103.427852653, 110.225580543, 135.414121033,
- 162.955749719, 191.043411366, 216.051565678,
- 230.204882307, 236.346847436, 239.552825212}),
- pressure(V_flow={2.11830535572e-05, 0.000167865707434, 0.000700939248601,
- 0.0012450039968, 0.00177258193445, 0.00227268185452,
- 0.00272332134293, 0.00312450039968, 0.00345423661071},
- dp={ 59279.4925671, 59115.2927989, 59000.1476354,
- 57351.238791, 54446.2693068, 50284.7374612,
- 44865.6398104, 38328.4550274, 32066.9663984}));
- annotation (
-defaultComponentPrefixes="parameter",
-defaultComponentName="per",
-Documentation(info="
- Data from:
-
- http://productfinder.wilo.com/en/COM/product/0000000e000379df0002003a/fc_product_datasheet
-
-
- See
-
- IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6
-
- for more information about how the data is derived.
-
- ", revisions="
-
--
-March 28, 2023, by Hongxiang Fu:
-Copied this record to the Obsolete package.
-Revised its original version to remove all rotational speed specifications.
-This is for
-IBPSA, #1704.
-
--
-October 14, 2021, by Hongxiang Fu:
-Rewrote the statements using use_powerCharacteristic
-to support the implementation of
-
-IBPSA.Fluid.Movers.BaseClasses.Euler
.
-This is for
-#2668.
-
--
-February 17, 2016, by Michael Wetter:
-Updated parameter names for
-#396.
-
--
-December 12, 2014, by Michael Wetter:
-Added defaultComponentPrefixes
and
-defaultComponentName
annotations.
-
-- April 22, 2014
- by Filip Jorissen:
- Initial version
-
-
-"));
-end Stratos32slash1to12;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.mo
deleted file mode 100644
index 338fceee44..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.mo
+++ /dev/null
@@ -1,10 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Data.Pumps;
-package Wilo "Package with performance data for Wilo pumps"
- extends Modelica.Icons.Package;
-
-annotation (preferredView="info", Documentation(info="
-
-This package contains performance data for Wilo pumps.
-
-"));
-end Wilo;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.order b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.order
deleted file mode 100644
index eebe7fed12..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/Wilo/package.order
+++ /dev/null
@@ -1,2 +0,0 @@
-Stratos25slash1to4
-Stratos32slash1to12
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.mo
deleted file mode 100644
index 39a4c1c74e..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Data;
-package Pumps "Package containing data for pumps"
- extends Modelica.Icons.Package;
-
-annotation (preferredView="info", Documentation(info="
-
-This package contains data for pumps.
-
-
-See the
-
-User's Guide for more information.
-
-"));
-end Pumps;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.order b/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.order
deleted file mode 100644
index 08113d759f..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/Pumps/package.order
+++ /dev/null
@@ -1 +0,0 @@
-Wilo
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/package.mo b/IBPSA/Obsolete/Fluid/Movers/Data/package.mo
deleted file mode 100644
index 0c62b262fc..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers;
-package Data "Package containing data for real pumps/fans"
-extends Modelica.Icons.MaterialPropertiesPackage;
-
-annotation (preferredView="info", Documentation(info="
-
-This package contains data for fans and pumps.
-
-
-See the
-
-User's Guide for more information.
-
-"));
-end Data;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/package.order b/IBPSA/Obsolete/Fluid/Movers/Data/package.order
deleted file mode 100644
index 7bbde5448e..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Data/package.order
+++ /dev/null
@@ -1,2 +0,0 @@
-Generic
-Pumps
diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverContinuous.mo b/IBPSA/Obsolete/Fluid/Movers/Examples/MoverContinuous.mo
deleted file mode 100644
index 153c94c3b1..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverContinuous.mo
+++ /dev/null
@@ -1,58 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Examples;
-model MoverContinuous
- "Example model of movers using a real input for setting the stage"
- extends IBPSA.Obsolete.Fluid.Movers.Examples.MoverParameter(
- pump_Nrpm(inputType=IBPSA.Fluid.Types.InputType.Continuous),
- pump_m_flow(inputType=IBPSA.Fluid.Types.InputType.Continuous),
- pump_y(inputType=IBPSA.Fluid.Types.InputType.Continuous),
- pump_dp(inputType=IBPSA.Fluid.Types.InputType.Continuous));
- Modelica.Blocks.Sources.Ramp ramp(duration=1) "Ramp input for all movers"
- annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
- Modelica.Blocks.Math.Gain gaiNrpm(k=2000) "Nominal rpm"
- annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
- Modelica.Blocks.Math.Gain gai_m_flow(k=m_flow_nominal)
- "Nominal mass flow rate"
- annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
- Modelica.Blocks.Math.Gain gai_dp(k=dp_nominal) "Nominal pressure drop"
- annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
-equation
- connect(gaiNrpm.y, pump_Nrpm.Nrpm)
- annotation (Line(points={{-19,70},{0,70},{0,52}}, color={0,0,127}));
- connect(gai_dp.y, pump_dp.dp_in) annotation (Line(points={{-19,-60},{-10,-60},
- {0,-60},{0,-68}}, color={0,0,127}));
- connect(gai_m_flow.y, pump_m_flow.m_flow_in)
- annotation (Line(points={{-19,20},{0,20},{0,12}}, color={0,0,127}));
- connect(gaiNrpm.u, ramp.y)
- annotation (Line(points={{-42,70},{-59,70}}, color={0,0,127}));
- connect(gai_m_flow.u, ramp.y) annotation (Line(points={{-42,20},{-50,20},{-50,
- 70},{-59,70}}, color={0,0,127}));
- connect(gai_dp.u, ramp.y) annotation (Line(points={{-42,-60},{-50,-60},{-50,
- 70},{-59,70}}, color={0,0,127}));
- connect(pump_y.y, ramp.y) annotation (Line(points={{0,-28},{0,-20},{-50,-20},{
- -50,70},{-59,70}}, color={0,0,127}));
- annotation (
- Documentation(info="
-
-This example demonstrates the use of a RealInput
-connector for a mover model.
-
-", revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Copied this model to the Obsolete package.
-Revised its original version to remove the Nrpm
mover.
-This is for
-IBPSA, #1704.
-
--
-August 24, 2015, by Filip Jorissen:
-First implementation.
-
-
-"),
-experiment(Tolerance=1e-06, StopTime=1),
-__Dymola_Commands(file=
- "modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos"
- "Simulate and plot"));
-end MoverContinuous;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverParameter.mo b/IBPSA/Obsolete/Fluid/Movers/Examples/MoverParameter.mo
deleted file mode 100644
index 0a6be9225d..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverParameter.mo
+++ /dev/null
@@ -1,126 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Examples;
-model MoverParameter
- "Example model of movers using a parameter for setting the stage"
- extends Modelica.Icons.Example;
- package Medium = IBPSA.Media.Water;
-
- parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2
- "Nominal mass flow rate";
-
- IBPSA.Fluid.Movers.FlowControlled_m_flow pump_m_flow(
- redeclare package Medium = Medium,
- m_flow_nominal=m_flow_nominal,
- use_inputFilter=false,
- massFlowRates={0,0.5,1}*m_flow_nominal,
- inputType=IBPSA.Fluid.Types.InputType.Constant,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
- "Pump with m_flow input"
- annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-
- IBPSA.Fluid.Sources.Boundary_pT sou(
- redeclare package Medium = Medium,
- nPorts=4) "Fluid source"
- annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-
- IBPSA.Fluid.Sources.Boundary_pT sin(redeclare package Medium = Medium,
- nPorts=4) "Fluid sink"
- annotation (Placement(transformation(extent={{80,-10},{60,10}})));
- IBPSA.Fluid.Movers.SpeedControlled_y pump_y(
- redeclare package Medium = Medium,
- redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per(
- speeds_rpm=1800*{0,0.5,1}, constantSpeed_rpm=1800),
- use_inputFilter=false,
- inputType=IBPSA.Fluid.Types.InputType.Constant,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
- "Pump with normalised speed input"
- annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
- IBPSA.Fluid.Movers.FlowControlled_dp pump_dp(
- redeclare package Medium = Medium,
- m_flow_nominal=m_flow_nominal,
- redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per,
- use_inputFilter=false,
- heads={0,0.5,1}*dp_nominal,
- inputType=IBPSA.Fluid.Types.InputType.Constant,
- dp_nominal=dp_nominal,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
- "Pump with pressure head input"
- annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
- IBPSA.Fluid.FixedResistances.PressureDrop res(
- redeclare package Medium = Medium,
- m_flow_nominal=m_flow_nominal,
- dp_nominal=dp_nominal)
- "Pressure drop component for avoiding singular system"
- annotation (Placement(transformation(extent={{26,-90},{46,-70}})));
- IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm pump_Nrpm(
- redeclare package Medium = Medium,
- use_inputFilter=false,
- redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per(
- speeds_rpm={0,1000,2000}, constantSpeed_rpm=2000),
- inputType=IBPSA.Fluid.Types.InputType.Constant,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
- "Pump with speed input"
- annotation (Placement(transformation(extent={{-10,30},{10,50}})));
- parameter Modelica.Units.SI.PressureDifference dp_nominal=10000
- "Nominal pressure raise";
-equation
- connect(sou.ports[1], pump_m_flow.port_a) annotation (Line(
- points={{-60,-1.5},{-60,0},{-10,0}},
- color={0,127,255},
- smooth=Smooth.None));
- connect(pump_m_flow.port_b, sin.ports[1]) annotation (Line(
- points={{10,0},{60,0},{60,-1.5}},
- color={0,127,255},
- smooth=Smooth.None));
- connect(res.port_a, pump_dp.port_b)
- annotation (Line(points={{26,-80},{18,-80},{10,-80}}, color={0,127,255}));
- connect(pump_y.port_b, sin.ports[2])
- annotation (Line(points={{10,-40},{60,-40},{60,-0.5}},
- color={0,127,255}));
- connect(res.port_b, sin.ports[3])
- annotation (Line(points={{46,-80},{60,-80},{60,0.5}},color={0,127,255}));
- connect(pump_dp.port_a, sou.ports[2])
- annotation (Line(points={{-10,-80},{-60,-80},{-60,-0.5}},
- color={0,127,255}));
- connect(pump_y.port_a, sou.ports[3]) annotation (Line(points={{-10,-40},{-20,-40},
- {-60,-40},{-60,0.5}},color={0,127,255}));
- connect(sou.ports[4], pump_Nrpm.port_a) annotation (Line(points={{-60,1.5},{-60,
- 1.5},{-60,34},{-60,40},{-10,40}},color={0,127,255}));
- connect(pump_Nrpm.port_b, sin.ports[4]) annotation (Line(points={{10,40},{24,40},
- {60,40},{60,1.5}},color={0,127,255}));
- annotation (
- __Dymola_Commands(file=
- "modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos"
- "Simulate and plot"),
- Documentation(info="
-
-This example demonstrates the use of a Parameter
-set point for a mover model.
-
-", revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Copied this model to the Obsolete package.
-Revised its original version to remove the Nrpm
mover.
-This is for
-IBPSA, #1704.
-
--
-February 17, 2016, by Michael Wetter:
-Updated parameter names for
-#396.
-
--
-January 22, 2016, by Michael Wetter:
-Corrected type declaration of pressure difference.
-This is
-for #404.
-
--
-August 24, 2015, by Filip Jorissen:
-First implementation.
-
-
-"),
- experiment(Tolerance=1e-06, StopTime=1));
-end MoverParameter;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverStages.mo b/IBPSA/Obsolete/Fluid/Movers/Examples/MoverStages.mo
deleted file mode 100644
index 2c4d3bdb34..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Examples/MoverStages.mo
+++ /dev/null
@@ -1,68 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Examples;
-model MoverStages
- "Example model of movers using an integer input for setting the stage"
- extends IBPSA.Obsolete.Fluid.Movers.Examples.MoverParameter(
- pump_Nrpm(inputType=IBPSA.Fluid.Types.InputType.Stages),
- pump_m_flow(inputType=IBPSA.Fluid.Types.InputType.Stages),
- pump_y(inputType=IBPSA.Fluid.Types.InputType.Stages),
- pump_dp(inputType=IBPSA.Fluid.Types.InputType.Stages));
- package Medium = IBPSA.Media.Water;
-
- parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2
- "Nominal mass flow rate";
-
- Modelica.Blocks.Sources.IntegerTable integerTable(table=[0,1; 0.3,2; 0.6,3])
- "Integer step input, 1 is off, 2 is on"
- annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
- parameter Modelica.Units.SI.PressureDifference dp_nominal=10000
- "Nominal pressure raise";
-equation
- connect(integerTable.y, pump_Nrpm.stage)
- annotation (Line(points={{-39,80},{0,80},{0,52}}, color={255,127,0}));
- connect(integerTable.y, pump_m_flow.stage)
- annotation (Line(points={{-39,80},{-30,80},{-30,20},{-30,20},{-30,20},{0,20},
- {0,12}}, color={255,127,0}));
- connect(integerTable.y, pump_y.stage)
- annotation (Line(points={{-39,80},{-30,80},{-30,-16},{-30,-16},{-30,-20},{0,
- -20},{0,-28}}, color={255,127,0}));
- connect(integerTable.y, pump_dp.stage)
- annotation (Line(points={{-39,80},{-30,80},{-30,-60},{0,-60},{0,-68}},
- color={255,127,0}));
- annotation (
- __Dymola_Commands(file=
- "modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos"
- "Simulate and plot"),
- Documentation(info="
-
-This example demonstrates the use of the Integer
-stage connector for a mover model.
-Note that integer input 1 refers to the first stage, whereas
-input 0 switches the mover off.
-
-", revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Copied this model to the Obsolete package.
-Revised its original version to remove the Nrpm
mover.
-This is for
-IBPSA, #1704.
-
--
-January 22, 2016, by Michael Wetter:
-Corrected type declaration of pressure difference.
-This is
-for #404.
-
--
-August 24, 2015, by Filip Jorissen:
-Extended implementation with more movers.
-
--
-April 2, 2015, by Filip Jorissen:
-First implementation.
-
-
-"),
- experiment(Tolerance=1e-06, StopTime=1));
-end MoverStages;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/package.mo b/IBPSA/Obsolete/Fluid/Movers/Examples/package.mo
deleted file mode 100644
index d3218583a4..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Examples/package.mo
+++ /dev/null
@@ -1,9 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers;
-package Examples "Obsolete example models"
- extends Modelica.Icons.ExamplesPackage;
-annotation (preferredView="info", Documentation(info="
-
-This package contains obsolete example models.
-
-"));
-end Examples;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Examples/package.order b/IBPSA/Obsolete/Fluid/Movers/Examples/package.order
deleted file mode 100644
index c004b45a2e..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Examples/package.order
+++ /dev/null
@@ -1,3 +0,0 @@
-MoverContinuous
-MoverParameter
-MoverStages
diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/SpeedControlled_Nrpm.mo b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/SpeedControlled_Nrpm.mo
deleted file mode 100644
index c187a91953..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/SpeedControlled_Nrpm.mo
+++ /dev/null
@@ -1,61 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Preconfigured;
-model SpeedControlled_Nrpm "Fan or pump with ideally controlled speed Nrpm as input signal and pre-configured parameters"
- extends IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm(
- final per(
- pressure(
- V_flow=m_flow_nominal/rho_default*{0, 1, 2},
- dp=if rho_default < 500
- then dp_nominal*{1.12, 1, 0}
- else dp_nominal*{1.14, 1, 0.42}),
- powerOrEfficiencyIsHydraulic=true,
- etaHydMet=IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber,
- etaMotMet=IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve,
- speed_rpm_nominal=speed_rpm_nominal),
- final inputType=IBPSA.Fluid.Types.InputType.Continuous,
- final init=Modelica.Blocks.Types.Init.InitialOutput,
- energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial);
-
- parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(
- final min=Modelica.Constants.small)
- "Nominal mass flow rate for configuration of pressure head vs flow rate performance curve"
- annotation (Dialog(group="Nominal condition"));
- parameter Modelica.Units.SI.PressureDifference dp_nominal(
- final min=Modelica.Constants.small)
- "Nominal pressure head for configuration of pressure head vs flow rate performance curve"
- annotation(Dialog(group="Nominal condition"));
- parameter Modelica.Units.NonSI.AngularVelocity_rpm speed_rpm_nominal(
- final min=Modelica.Constants.small)
- "Nominal rotational speed for configuration of pressure head vs flow rate performance curve"
- annotation (Dialog(group="Nominal condition"));
-
-annotation (
-defaultComponentName="mov",
-obsolete = "Obsolete model - use IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y instead",
-Documentation(info="
-
-This model is the preconfigured version for
-
-IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm.
-", revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Moved this model to the Obsolete package.
-This is for
-IBPSA, #1704.
-
--
-March 1, 2023, by Hongxiang Fu:
-Refactored the model with a new declaration for
-m_flow_nominal
.
-This is for
-#1705.
-
--
-August 17, 2022, by Hongxiang Fu:
-First implementation. This is for
-#2668.
-
-
-"));
-end SpeedControlled_Nrpm;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mo b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mo
deleted file mode 100644
index 2d346d011d..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mo
+++ /dev/null
@@ -1,63 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Preconfigured.Validation;
-model ControlledFlowMachinePreconfigured
- "Preconfigured fans with different control signals"
- extends Modelica.Icons.Example;
- extends
- IBPSA.Obsolete.Fluid.Movers.Validation.BaseClasses.ControlledFlowMachine(
- redeclare IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y fan1(
- redeclare package Medium = Medium,
- m_flow_nominal=m_flow_nominal,
- dp_nominal=dp_nominal),
- redeclare IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow fan2(
- redeclare package Medium = Medium,
- m_flow_nominal=m_flow_nominal,
- dp_nominal=dp_nominal),
- redeclare IBPSA.Fluid.Movers.Preconfigured.FlowControlled_dp fan3(
- redeclare package Medium = Medium,
- m_flow_nominal=m_flow_nominal,
- dp_nominal=dp_nominal),
- redeclare IBPSA.Obsolete.Fluid.Movers.Preconfigured.SpeedControlled_Nrpm fan4(
- redeclare package Medium = Medium,
- m_flow_nominal=m_flow_nominal,
- dp_nominal=dp_nominal,
- speed_rpm_nominal=3580),
- dp1(m_flow_nominal=m_flow_nominal, dp_nominal=dp_nominal),
- dp4(m_flow_nominal=m_flow_nominal, dp_nominal=dp_nominal),
- dp2(m_flow_nominal=m_flow_nominal, dp_nominal=dp_nominal),
- dp3(m_flow_nominal=m_flow_nominal, dp_nominal=dp_nominal));
-
- parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2
- "Nominal mass flow rate for each fan";
- parameter Modelica.Units.SI.PressureDifference dp_nominal=500
- "Nominal pressure head for each fan";
-
- annotation (
-experiment(Tolerance=1e-6, StopTime=600),
-__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos"
- "Simulate and plot"),
- Documentation(info="
-
-This model validates the preconfigured mover models.
-It is based on
-
-IBPSA.Obsolete.Fluid.Movers.Validation.ControlledFlowMachineDynamic.
-
-", revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Copied this model to the Obsolete package.
-Revised its original version to remove the Nrpm
mover.
-This is for
-IBPSA, #1704.
-
--
-August 17, 2022, by Hongxiang Fu:
-First implementation. This is for
-#2668.
-
-
-"),
- Diagram(coordinateSystem(extent={{-160,-80},{160,160}})),
- Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
-end ControlledFlowMachinePreconfigured;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.mo b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.mo
deleted file mode 100644
index fedc7c9296..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.mo
+++ /dev/null
@@ -1,20 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Preconfigured;
-package Validation "Collection of validation models"
- extends Modelica.Icons.ExamplesPackage;
-
-annotation (preferredView="info", Documentation(info="
-
-This package contains validation models for the classes in
-
-IBPSA.Obsolete.Fluid.Movers.Preconfigured.
-
-
-Note that most validation models contain simple input data
-which may not be realistic, but for which the correct
-output can be obtained through an analytic solution.
-The examples plot various outputs, which have been verified against these
-solutions. These model outputs are stored as reference data and
-used for continuous validation whenever models in the library change.
-
-"));
-end Validation;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.order b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.order
deleted file mode 100644
index 799d7b6441..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/Validation/package.order
+++ /dev/null
@@ -1 +0,0 @@
-ControlledFlowMachinePreconfigured
diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.mo b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.mo
deleted file mode 100644
index b0ea06704a..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers;
-package Preconfigured "Obsolete preconfigured models"
- extends Modelica.Icons.Package;
-annotation (preferredView="info", Documentation(info="
-
-This package contains obsolete preconfigured mover models.
-
-"),
-Icon(graphics={ Line(
- points={{-60,0},{-20,-40},{60,40}},
- color={0,140,72},
- thickness=10)}));
-end Preconfigured;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.order b/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.order
deleted file mode 100644
index c30661570d..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Preconfigured/package.order
+++ /dev/null
@@ -1,2 +0,0 @@
-SpeedControlled_Nrpm
-Validation
diff --git a/IBPSA/Obsolete/Fluid/Movers/SpeedControlled_Nrpm.mo b/IBPSA/Obsolete/Fluid/Movers/SpeedControlled_Nrpm.mo
deleted file mode 100644
index 76ac0f30b4..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/SpeedControlled_Nrpm.mo
+++ /dev/null
@@ -1,197 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers;
-model SpeedControlled_Nrpm
- "Fan or pump with ideally controlled speed Nrpm as input signal"
- extends IBPSA.Obsolete.Fluid.Movers.BaseClasses.PartialFlowMachine(
- final preVar=IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed,
- final nominalValuesDefineDefaultPressureCurve=false,
- final computePowerUsingSimilarityLaws=true,
- final stageInputs(each final unit="1") = per.speeds,
- final constInput(final unit="1") = per.constantSpeed,
- filter(
- final y_start=y_start,
- u(final unit="1"),
- y(final unit="1")),
- eff(
- per(final pressure = per.pressure,
- final etaHydMet = per.etaHydMet,
- final etaMotMet = per.etaMotMet),
- r_N(start=y_start)),
- gaiSpe(u(final unit="rev/min"),
- final k=1/per.speed_rpm_nominal));
-
- parameter Real y_start(min=0, max=1, unit="1")=0 "Initial value of speed"
- annotation(Dialog(tab="Dynamics", group="Filtered speed", enable=use_inputFilter));
-
- Modelica.Blocks.Interfaces.RealInput Nrpm(final unit="rev/min")
- if inputType == IBPSA.Fluid.Types.InputType.Continuous
- "Prescribed rotational speed"
- annotation (Placement(transformation(
- extent={{-20,-20},{20,20}},
- rotation=-90,
- origin={0,120}), iconTransformation(
- extent={{-20,-20},{20,20}},
- rotation=-90,
- origin={0,120})));
-
-protected
- Modelica.Blocks.Math.Gain gain(final k=-1) "Pressure gain"
- annotation (Placement(transformation(extent={{10,-10},{-10,10}},
- rotation=270,
- origin={-10,-20})));
-initial equation
- assert(per.havePressureCurve,
- "SpeedControlled_Nrpm model requires to set the pressure vs. flow rate curve in record 'per'.");
-
-equation
- connect(Nrpm, gaiSpe.u)
- annotation (Line(points={{0,120},{0,80},{-2.8,80}}, color={0,0,127}));
- connect(gaiSpe.y, inputSwitch.u) annotation (Line(points={{-16.6,80},{-26,80},
- {-26,50},{-22,50}}, color={0,0,127}));
- connect(eff.dp, gain.u) annotation (Line(points={{-11,-50},{-6,-50},{-6,-42},
- {-10,-42},{-10,-32}},
- color={0,0,127}));
- connect(gain.y, preSou.dp_in)
- annotation (Line(points={{-10,-9},{-10,14},{56,14},{56,8}},
- color={0,0,127}));
- if use_inputFilter then
- connect(filter.y, eff.y_in) annotation (Line(points={{41,70.5},{44,70.5},{44,
- 26},{-26,26},{-26,-46}}, color={0,0,127}));
- else
- connect(inputSwitch.y, eff.y_in) annotation (Line(points={{1,50},{44,50},{44,
- 26},{-26,26},{-26,-46}},
- color={0,0,127}));
- end if;
- annotation (defaultComponentName="mov",
- Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
- 100}}),
- graphics={
- Text(
- extent={{-40,126},{-160,76}},
- textColor={0,0,127},
- visible=inputType == IBPSA.Fluid.Types.InputType.Continuous or inputType == IBPSA.Fluid.Types.InputType.Stages,
- textString=DynamicSelect("Nrpm", if inputType == IBPSA.Fluid.Types.InputType.Continuous then String(Nrpm, format=".0f") else String(stage)))}),
- obsolete = "Obsolete model - use IBPSA.Fluid.Movers.SpeedControlled_y instead",
- Documentation(info="
-
-This model describes a fan or pump with prescribed speed in revolutions per minute.
-The head is computed based on the performance curve that take as an argument
-the actual volume flow rate divided by the maximum flow rate and the relative
-speed of the fan.
-
-
-
-See the
-
-User's Guide for more information.
-
-",
- revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Moved this model to the Obsolete package.
-This is for
-IBPSA, #1704.
-
--
-March 1, 2023, by Hongxiang Fu:
-Removed the modification of m_flow_nominal
.
-This is for
-#1705.
-
--
-March 8, 2022, by Hongxiang Fu:
-Refactored the model by replacing not use_powerCharacteristic
-with the enumeration
-
-IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.
-This is for
-#2668.
-March 7, 2022, by Michael Wetter:
-Set final massDynamics=energyDynamics
.
-This is for
-#1542.
-
--
-January 5, 2022, by Jianjun Hu:
-Changed the rotational speed unit to be consistent with the one in the Modelica Standard Library.
-This is for
-#1570.
-
--
-June 17, 2021, by Michael Wetter:
-Changed implementation of the filter.
-This is for
-#1498.
-
--
-February 21, 2020, by Michael Wetter:
-Changed icon to display its operating stage.
-This is for
-#1294.
-
--
-March 24, 2017, by Michael Wetter:
-Renamed filteredSpeed
to use_inputFilter
.
-This is for
-#665.
-
--
-March 2, 2016, by Filip Jorissen:
-Refactored model such that it directly extends PartialFlowMachine
.
-This is for
-#417.
-
--
-February 17, 2016, by Michael Wetter:
-Updated parameter names for
-#396.
-
--
-January 19, 2016, by Filip Jorissen:
-Set default value of parameter: speeds=per.speeds
.
-This is for
-#396.
-
--
-April 2, 2015, by Filip Jorissen:
-Added code for supporting stage input and constant input.
-
--
-March 6, 2015, by Michael Wetter
-Made performance record per
replaceable
-as for the other models.
-
--
-January 6, 2015, by Michael Wetter:
-Revised model for OpenModelica.
-
--
-April 17, 2014, by Filip Jorissen:
-Implemented records for supplying pump/fan parameters
-
--
-February 14, 2012, by Michael Wetter:
-Added filter for start-up and shut-down transient.
-
--
-May 25, 2011, by Michael Wetter:
-Revised implementation of energy balance to avoid having to use conditionally removed models.
-
--
-July 27, 2010, by Michael Wetter:
-Redesigned model to fix bug in medium balance.
-
-- March 24, 2010, by Michael Wetter:
-Revised implementation to allow zero flow rate.
-
-- October 1, 2009,
- by Michael Wetter:
- Model added to the IBPSA library.
-
-- 31 Oct 2005
- by Francesco Casella:
- Model added to the Fluid library
-
-"));
-end SpeedControlled_Nrpm;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
deleted file mode 100644
index fc4fff8f97..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
+++ /dev/null
@@ -1,226 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Validation.BaseClasses;
-model ControlledFlowMachine
-
- package Medium = IBPSA.Media.Air "Medium model";
-
- Modelica.Blocks.Sources.Pulse y(
- startTime=0,
- offset=0,
- amplitude=1,
- period=120,
- width=50) annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
- IBPSA.Fluid.Sources.Boundary_pT sou(
- redeclare package Medium = Medium,
- use_p_in=false,
- p=101325,
- T=293.15,
- nPorts=4) annotation (Placement(transformation(extent={{-90,20},{-70,40}})));
-
- IBPSA.Fluid.Sensors.MassFlowRate masFloRat1(redeclare package Medium =
- Medium)
- annotation (Placement(transformation(extent={{60,50},{80,70}})));
- IBPSA.Fluid.Sensors.RelativePressure relPre(redeclare package Medium =
- Medium) annotation (Placement(transformation(
- extent={{10,-10},{-10,10}},
- origin={-10,32})));
- replaceable
- IBPSA.Fluid.Movers.SpeedControlled_y fan1(
- redeclare package Medium = Medium,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12 per)
- constrainedby IBPSA.Fluid.Movers.SpeedControlled_y
- "Fan with normalized control input between 0 and 1"
- annotation (Placement(transformation(extent={{-20,50},{0,70}})));
- IBPSA.Fluid.FixedResistances.PressureDrop dp1(
- redeclare package Medium = Medium,
- from_dp=true,
- m_flow_nominal=0.006,
- dp_nominal=50000) "Pressure drop"
- annotation (Placement(transformation(extent={{16,50},{36,70}})));
- IBPSA.Fluid.FixedResistances.PressureDrop dp2(
- redeclare package Medium = Medium,
- from_dp=true,
- m_flow_nominal=0.006,
- dp_nominal=50000) "Pressure drop"
- annotation (Placement(transformation(extent={{16,-30},{36,-10}})));
- IBPSA.Fluid.Sensors.MassFlowRate masFloRat2(
- redeclare package Medium = Medium)
- annotation (Placement(transformation(extent={{60,-30},{80,-10}})));
- IBPSA.Fluid.FixedResistances.PressureDrop dp3(
- redeclare package Medium = Medium,
- from_dp=true,
- m_flow_nominal=0.006,
- dp_nominal=50000) "Pressure drop"
- annotation (Placement(transformation(extent={{16,-70},{36,-50}})));
- IBPSA.Fluid.Sensors.MassFlowRate masFloRat3(
- redeclare package Medium = Medium)
- annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
- replaceable
- IBPSA.Fluid.Movers.FlowControlled_dp fan3(
- redeclare package Medium = Medium,
- m_flow_nominal=6000/3600*1.2,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12 per)
- constrainedby IBPSA.Fluid.Movers.FlowControlled_dp
- "Fan with head as input"
- annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
- replaceable
- IBPSA.Fluid.Movers.FlowControlled_m_flow fan2(
- redeclare package Medium = Medium,
- m_flow_nominal=6000/3600*1.2,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12 per)
- constrainedby IBPSA.Fluid.Movers.FlowControlled_m_flow
- "Fan with mass flow rate as input"
- annotation (Placement(transformation(extent={{-20,-30},{0,-10}})));
- IBPSA.Fluid.FixedResistances.PressureDrop dp4(
- redeclare package Medium = Medium,
- from_dp=true,
- m_flow_nominal=0.006,
- dp_nominal=50000) "Pressure drop"
- annotation (Placement(transformation(extent={{16,100},{36,120}})));
- IBPSA.Fluid.Sensors.MassFlowRate masFloRat4(
- redeclare package Medium = Medium)
- annotation (Placement(transformation(extent={{60,100},{80,120}})));
- replaceable
- IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm fan4(
- redeclare package Medium = Medium,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- redeclare IBPSA.Obsolete.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12 per)
- constrainedby IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm
- "Fan with RPM as control input"
- annotation (Placement(transformation(extent={{-20,100},{0,120}})));
- Modelica.Blocks.Math.Gain gain(k=3580) "Converts y to nominal rpm"
- annotation (Placement(transformation(extent={{-60,130},{-40,150}})));
- IBPSA.Fluid.FixedResistances.PressureDrop dp5(
- m_flow_nominal=6000/3600*1.2,
- redeclare package Medium = Medium,
- dp_nominal=300,
- from_dp=true) "Pressure drop"
- annotation (Placement(transformation(extent={{-52,50},{-32,70}})));
- IBPSA.Fluid.FixedResistances.PressureDrop dp6(
- m_flow_nominal=6000/3600*1.2,
- redeclare package Medium = Medium,
- dp_nominal=300,
- from_dp=true) "Pressure drop"
- annotation (Placement(transformation(extent={{-52,-30},{-32,-10}})));
- IBPSA.Fluid.FixedResistances.PressureDrop dp7(
- m_flow_nominal=6000/3600*1.2,
- redeclare package Medium = Medium,
- dp_nominal=300,
- from_dp=true) "Pressure drop"
- annotation (Placement(transformation(extent={{-52,-70},{-32,-50}})));
- IBPSA.Fluid.FixedResistances.PressureDrop dp8(
- m_flow_nominal=6000/3600*1.2,
- redeclare package Medium = Medium,
- dp_nominal=300,
- from_dp=true) "Pressure drop"
- annotation (Placement(transformation(extent={{-52,100},{-32,120}})));
- IBPSA.Fluid.Sources.Boundary_pT sin(
- redeclare package Medium = Medium,
- use_p_in=false,
- p=101325,
- T=293.15,
- nPorts=4) annotation (Placement(transformation(extent={{142,20},{122,40}})));
-equation
-
- connect(fan1.port_a, relPre.port_b) annotation (Line(
- points={{-20,60},{-20,32}},
- color={0,127,255}));
- connect(fan1.port_b, relPre.port_a) annotation (Line(
- points={{5.55112e-16,60},{5.55112e-16,46},{0,32},{5.55112e-16,32}},
- color={0,127,255}));
- connect(fan1.port_b, dp1.port_a) annotation (Line(
- points={{5.55112e-16,60},{16,60}},
- color={0,127,255}));
- connect(fan2.port_b, dp2.port_a) annotation (Line(
- points={{5.55112e-16,-20},{16,-20}},
- color={0,127,255}));
- connect(fan3.port_b, dp3.port_a) annotation (Line(
- points={{5.55112e-16,-60},{16,-60}},
- color={0,127,255}));
- connect(fan4.port_b, dp4.port_a) annotation (Line(
- points={{5.55112e-16,110},{16,110}},
- color={0,127,255}));
- connect(gain.y, fan4.Nrpm) annotation (Line(
- points={{-39,140},{-10,140},{-10,122}},
- color={0,0,127}));
- connect(masFloRat1.m_flow, fan2.m_flow_in) annotation (Line(
- points={{70,71},{70,86},{42,86},{42,4},{-10,4},{-10,-8}},
- color={0,0,127}));
- connect(relPre.p_rel, fan3.dp_in) annotation (Line(
- points={{-10,23},{-10,8},{-24,8},{-24,-40},{-10,-40},{-10,-48}},
- color={0,0,127}));
- connect(dp8.port_b, fan4.port_a) annotation (Line(
- points={{-32,110},{-20,110}},
- color={0,127,255}));
- connect(dp5.port_b, fan1.port_a) annotation (Line(
- points={{-32,60},{-20,60}},
- color={0,127,255}));
- connect(dp6.port_b, fan2.port_a) annotation (Line(
- points={{-32,-20},{-20,-20}},
- color={0,127,255}));
- connect(dp7.port_b, fan3.port_a) annotation (Line(
- points={{-32,-60},{-20,-60}},
- color={0,127,255}));
- connect(y.y, fan1.y) annotation (Line(
- points={{-119,80},{-10,80},{-10,72}},
- color={0,0,127}));
- connect(y.y, gain.u) annotation (Line(
- points={{-119,80},{-80,80},{-80,140},{-62,140}},
- color={0,0,127}));
- connect(dp8.port_a, sou.ports[1]) annotation (Line(
- points={{-52,110},{-62,110},{-62,28.5},{-70,28.5}},
- color={0,127,255}));
- connect(dp5.port_a, sou.ports[2]) annotation (Line(
- points={{-52,60},{-60,60},{-60,29.5},{-70,29.5}},
- color={0,127,255}));
- connect(dp6.port_a, sou.ports[3]) annotation (Line(
- points={{-52,-20},{-60,-20},{-60,30.5},{-70,30.5}},
- color={0,127,255}));
- connect(dp7.port_a, sou.ports[4]) annotation (Line(
- points={{-52,-60},{-62,-60},{-62,31.5},{-70,31.5}},
- color={0,127,255}));
- connect(dp4.port_b, masFloRat4.port_a) annotation (Line(
- points={{36,110},{60,110}},
- color={0,127,255}));
- connect(dp1.port_b, masFloRat1.port_a) annotation (Line(
- points={{36,60},{60,60}},
- color={0,127,255}));
- connect(dp2.port_b, masFloRat2.port_a) annotation (Line(
- points={{36,-20},{60,-20}},
- color={0,127,255}));
- connect(dp3.port_b, masFloRat3.port_a) annotation (Line(
- points={{36,-60},{60,-60}},
- color={0,127,255}));
- connect(masFloRat4.port_b, sin.ports[1]) annotation (Line(
- points={{80,110},{102,110},{102,28.5},{122,28.5}},
- color={0,127,255}));
- connect(masFloRat1.port_b, sin.ports[2]) annotation (Line(
- points={{80,60},{100,60},{100,29.5},{122,29.5}},
- color={0,127,255}));
- connect(masFloRat2.port_b, sin.ports[3]) annotation (Line(
- points={{80,-20},{100,-20},{100,30.5},{122,30.5}},
- color={0,127,255}));
- connect(masFloRat3.port_b, sin.ports[4]) annotation (Line(
- points={{80,-60},{102,-60},{102,31.5},{122,31.5}},
- color={0,127,255}));
- annotation (
- Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-160,-100},{160,
- 160}})),
- Icon(coordinateSystem(preserveAspectRatio=true, extent={{-160,-100},{160,160}})),
- Documentation(info="
-This example demonstrates the use of the flow model with four different configuration.
-At steady-state, all flow models have the same mass flow rate and pressure difference.
-"), revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Copied this model to the Obsolete package.
-Revised its original version to remove the Nrpm
mover.
-This is for
-IBPSA, #1704.
-
-
-");
-end ControlledFlowMachine;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.mo
deleted file mode 100644
index 40e1f66c10..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.mo
+++ /dev/null
@@ -1,9 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Validation;
-package BaseClasses "Package with base classes for obsolete validation models"
- extends Modelica.Icons.BasesPackage;
-annotation (preferredView="info", Documentation(info="
-
-This package contains base classes for obsolete validation models.
-
-"));
-end BaseClasses;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.order b/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.order
deleted file mode 100644
index e50c2d939c..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Validation/BaseClasses/package.order
+++ /dev/null
@@ -1 +0,0 @@
-ControlledFlowMachine
diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mo
deleted file mode 100644
index 2097d009c6..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mo
+++ /dev/null
@@ -1,37 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Validation;
-model ControlledFlowMachine "Fans with different control signals as input"
- extends Modelica.Icons.Example;
- extends IBPSA.Obsolete.Fluid.Movers.Validation.BaseClasses.ControlledFlowMachine(
- fan4(addPowerToMedium=false, use_inputFilter=false,
- energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
- fan1(addPowerToMedium=false,
- energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
- fan2(addPowerToMedium=false, use_inputFilter=false,
- energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
- fan3(addPowerToMedium=false, use_inputFilter=false,
- energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial));
-
- annotation (
-experiment(Tolerance=1e-6, StopTime=600),
-__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos"
- "Simulate and plot"),
- Documentation(info="
-This example demonstrates the use of the flow model with four different configurations.
-At steady-state, all flow models have the same mass flow rate and pressure difference.
-Note that addPowerToMedium=false
since otherwise,
-Dymola computes the enthalpy change of the component as a fraction (k*m_flow+P_internal)/m_flow
-which leads to an error because of 0/0
at zero flow rate.
-", revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Copied this model to the Obsolete package.
-Revised its original version to remove the Nrpm
mover.
-This is for
-IBPSA, #1704.
-
-
-"),
- Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-160,-100},{160,
- 160}})));
-end ControlledFlowMachine;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mo
deleted file mode 100644
index 420203e7d7..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mo
+++ /dev/null
@@ -1,30 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Validation;
-model ControlledFlowMachineDynamic
- "Fans with different control signals as input and a dynamic speed signal"
- extends Modelica.Icons.Example;
- extends IBPSA.Obsolete.Fluid.Movers.Validation.BaseClasses.ControlledFlowMachine(
- fan4(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
- fan1(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
- fan2(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
- fan3(energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial));
- annotation (
-experiment(Tolerance=1e-6, StopTime=600),
-__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos"
- "Simulate and plot"),
- Documentation(info="
-This example demonstrates the use of the flow model with four different configurations.
-At steady-state, all flow models have the same mass flow rate and pressure difference.
-", revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Copied this model to the Obsolete package.
-Revised its original version to remove the Nrpm
mover.
-This is for
-IBPSA, #1704.
-
-
-"),
-Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-160,-100},{160, 160}})));
-
-end ControlledFlowMachineDynamic;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mo
deleted file mode 100644
index f170f57e6d..0000000000
--- a/IBPSA/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mo
+++ /dev/null
@@ -1,58 +0,0 @@
-within IBPSA.Obsolete.Fluid.Movers.Validation;
-model SpeedControlled_Nrpm "Fan with zero mass flow rate and speed as input"
- extends Modelica.Icons.Example;
- extends IBPSA.Fluid.Movers.Validation.BaseClasses.FlowMachine_ZeroFlow(
- gain(k=1500),
- redeclare IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm floMacSta(
- redeclare package Medium = Medium,
- per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
- dp={2*dp_nominal,dp_nominal,0})),
- use_inputFilter=false,
- energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
- redeclare IBPSA.Obsolete.Fluid.Movers.SpeedControlled_Nrpm floMacDyn(
- redeclare package Medium = Medium,
- per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
- dp={2*dp_nominal,dp_nominal,0})),
- use_inputFilter=false,
- energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial));
-
-equation
- connect(gain.y, floMacSta.Nrpm) annotation (Line(
- points={{-25,100},{30,100},{30,92}},
- color={0,0,127}));
- connect(gain.y, floMacDyn.Nrpm) annotation (Line(
- points={{-25,100},{10,100},{10,30},{30,30},{30,12}},
- color={0,0,127}));
- annotation (
- Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-100,-100},{160,
- 160}}), graphics),
-experiment(Tolerance=1e-08, StopTime=1.0),
-__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos"
- "Simulate and plot"),
- Documentation(info="
-
-This example demonstrates and tests the use of a flow machine whose mass flow rate is reduced to zero.
-
-
-The fans have been configured as steady-state models.
-This ensures that the actual speed is equal to the input signal.
-
-", revisions="
-
--
-March 21, 2023, by Hongxiang Fu:
-Moved this model to the Obsolete package.
-This is for
-IBPSA, #1704.
-
--
-February 14, 2012, by Michael Wetter:
-Added filter for start-up and shut-down transient.
-
--
-March 24 2010, by Michael Wetter:
-First implementation.
-
-
-"));
-end SpeedControlled_Nrpm;
diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/package.order b/IBPSA/Obsolete/Fluid/Movers/Validation/package.order
index b8a076a90b..efadf92aae 100644
--- a/IBPSA/Obsolete/Fluid/Movers/Validation/package.order
+++ b/IBPSA/Obsolete/Fluid/Movers/Validation/package.order
@@ -1,7 +1,3 @@
-ControlledFlowMachine
-ControlledFlowMachineDynamic
PowerEuler
PowerExact
PowerSimplified
-SpeedControlled_Nrpm
-BaseClasses
diff --git a/IBPSA/Obsolete/Fluid/Movers/package.order b/IBPSA/Obsolete/Fluid/Movers/package.order
index 02faee82ba..52aa3d53a4 100644
--- a/IBPSA/Obsolete/Fluid/Movers/package.order
+++ b/IBPSA/Obsolete/Fluid/Movers/package.order
@@ -1,6 +1 @@
-SpeedControlled_Nrpm
-Preconfigured
-Data
-Examples
Validation
-BaseClasses
From a82b0f59471f1e86b04023da8a599c0ab132d4ca Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Wed, 28 Aug 2024 09:52:37 -0700
Subject: [PATCH 17/47] removed mos files
---
.../Fluid/Movers/Examples/MoverContinuous.mos | 7 ----
.../Fluid/Movers/Examples/MoverParameter.mos | 7 ----
.../Fluid/Movers/Examples/MoverStages.mos | 7 ----
.../ControlledFlowMachinePreconfigured.mos | 24 -----------
.../Validation/ControlledFlowMachine.mos | 24 -----------
.../ControlledFlowMachineDynamic.mos | 24 -----------
.../Validation/SpeedControlled_Nrpm.mos | 40 -------------------
7 files changed, 133 deletions(-)
delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos
delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos
delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos
delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos
delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos
delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos
delete mode 100644 IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos
diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos
deleted file mode 100644
index a1c2f8f8f9..0000000000
--- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverContinuous.mos
+++ /dev/null
@@ -1,7 +0,0 @@
-simulateModel("IBPSA.Obsolete.Fluid.Movers.Examples.MoverContinuous", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverContinuousObsolete");
-createPlot(id=1,
-position={15, 10, 586, 422},
-y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"},
-range={0.0, 1.0, -0.2, 2.2},
-grid=true,
-colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos
deleted file mode 100644
index 49835b118c..0000000000
--- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverParameter.mos
+++ /dev/null
@@ -1,7 +0,0 @@
-simulateModel("IBPSA.Obsolete.Fluid.Movers.Examples.MoverParameter", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverParameterObsolete");
-createPlot(id=1,
-position={15, 10, 586, 422},
-y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"},
-range={0.0, 1.0, -0.2, 2.2},
-grid=true,
-colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos
deleted file mode 100644
index 903ae30ff8..0000000000
--- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Examples/MoverStages.mos
+++ /dev/null
@@ -1,7 +0,0 @@
-simulateModel("IBPSA.Obsolete.Fluid.Movers.Examples.MoverStages", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverStagesObsolete");
-createPlot(id=1,
-position={15, 10, 586, 422},
-y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"},
-range={0.0, 1.0, -0.2, 2.2},
-grid=true,
-colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos
deleted file mode 100644
index ecf55f1f09..0000000000
--- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Preconfigured/Validation/ControlledFlowMachinePreconfigured.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-simulateModel("IBPSA.Obsolete.Fluid.Movers.Preconfigured.Validation.ControlledFlowMachinePreconfigured", method="CVode", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachinePreconfiguredObsolete");
-createPlot(id = 3,
- position = {55, 50, 750, 480},
- y = {"fan1.m_flow", "fan2.m_flow", "fan3.m_flow", "fan4.m_flow"},
- range = {0, 600, 2.5, 0.5},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- leftTitleType = 1,
- bottomTitleType = 1);
-createPlot(id = 3,
- position = {55, 50, 750, 237},
- y = {"fan1.dp", "fan2.dp", "fan3.dp", "fan4.dp"},
- range = {0, 600, 700.0, 0},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- subPlot = 2,
- leftTitleType = 1,
- bottomTitleType = 1);
diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos
deleted file mode 100644
index 4434d84e4e..0000000000
--- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachine.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-simulateModel("IBPSA.Obsolete.Fluid.Movers.Validation.ControlledFlowMachine", method="CVode", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachineObsolete");
-createPlot(id = 3,
- position = {55, 50, 750, 480},
- y = {"fan1.m_flow", "fan2.m_flow", "fan3.m_flow", "fan4.m_flow"},
- range = {0, 600, 2.5, 0.5},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- leftTitleType = 1,
- bottomTitleType = 1);
-createPlot(id = 3,
- position = {55, 50, 750, 237},
- y = {"fan1.dp", "fan2.dp", "fan3.dp", "fan4.dp"},
- range = {0, 1, 600.0, 0},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- subPlot = 2,
- leftTitleType = 1,
- bottomTitleType = 1);
diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos
deleted file mode 100644
index dce12c1dba..0000000000
--- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-simulateModel("IBPSA.Obsolete.Fluid.Movers.Validation.ControlledFlowMachineDynamic", method="CVode", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachineDynamicObsolete");
-createPlot(id = 3,
- position = {55, 50, 750, 480},
- y = {"fan1.m_flow", "fan2.m_flow", "fan3.m_flow", "fan4.m_flow"},
- range = {0, 600, 2.5, 0.5},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- leftTitleType = 1,
- bottomTitleType = 1);
-createPlot(id = 3,
- position = {55, 50, 750, 237},
- y = {"fan1.dp", "fan2.dp", "fan3.dp", "fan4.dp"},
- range = {0, 600, 700.0, 0},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- subPlot = 2,
- leftTitleType = 1,
- bottomTitleType = 1);
diff --git a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos b/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos
deleted file mode 100644
index 7ea200808d..0000000000
--- a/IBPSA/Resources/Scripts/Dymola/Obsolete/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos
+++ /dev/null
@@ -1,40 +0,0 @@
-simulateModel("IBPSA.Obsolete.Fluid.Movers.Validation.SpeedControlled_Nrpm", method="CVode", tolerance=1e-08, stopTime=1.0, resultFile="SpeedControlled_Nrpm");
-removePlots();
-createPlot(id = 4,
- filename = "SpeedControlled_Nrpm.mat",
- position = {441, 13, 281, 255},
- y = {"gain.u"},
- range = {0, 1, 1, -0.2},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- leftTitleType = 1,
- bottomTitleType = 1);
-createPlot(id = 5,
- filename = "SpeedControlled_Nrpm.mat",
- position = {13, 10, 300, 280},
- x = "floMacSta.VMachine_flow",
- y = {"floMacSta.dpMachine", "floMacDyn.dpMachine"},
- range = {0, 0.0009, 2050.0, 1550.0},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- leftTitleType = 1,
- bottomTitleType = 1);
-createPlot(id = 6,
- filename = "SpeedControlled_Nrpm.mat",
- position = {200, 10, 400, 280},
- x = "time",
- y = {"floMacSta.VMachine_flow", "floMacDyn.VMachine_flow"},
- range = {0, 0.001, 2100.0, 1500.0},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- grid = true,
- color = true,
- leftTitleType = 1,
- bottomTitleType = 1);
From 94cd4cb7f0afe8c3c6a52e5b0e7b7ea560926cfa Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Wed, 28 Aug 2024 09:53:29 -0700
Subject: [PATCH 18/47] removed results files
---
..._Fluid_Movers_Examples_MoverContinuous.txt | 17 --------------
...e_Fluid_Movers_Examples_MoverParameter.txt | 17 --------------
...lete_Fluid_Movers_Examples_MoverStages.txt | 17 --------------
...ion_ControlledFlowMachinePreconfigured.txt | 22 -------------------
...overs_Validation_ControlledFlowMachine.txt | 22 -------------------
...alidation_ControlledFlowMachineDynamic.txt | 22 -------------------
...Movers_Validation_SpeedControlled_Nrpm.txt | 19 ----------------
7 files changed, 136 deletions(-)
delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverContinuous.txt
delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverParameter.txt
delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverStages.txt
delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachine.txt
delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
delete mode 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverContinuous.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverContinuous.txt
deleted file mode 100644
index a397a40740..0000000000
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverContinuous.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2017-12-04
-statistics-initialization=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 0, 1, 1"
-}
-statistics-simulation=
-{
- "numerical Jacobians": "0",
- "nonlinear": "1, 0, 1, 1",
- "linear": " "
-}
-pump_y.m_flow=[0e+00, 4.017464083852141e-02, 4.59699484860468e-02, 5.415536902887684e-02, 6.541527180240084e-02, 7.98371124496001e-02, 9.584896481196611e-02, 1.118608410354876e-01, 1.27872738125061e-01, 1.438846381860275e-01, 1.598965650779216e-01, 1.759084919698156e-01, 1.919204188617296e-01, 2.079323606547648e-01, 2.239442905180493e-01, 2.399562054801814e-01, 2.559681592030562e-01, 2.71980103967453e-01, 2.879920189295807e-01, 3.040039875535634e-01, 3.200159323179692e-01, 3.360278711397716e-01, 3.520398159041417e-01, 3.68051760668574e-01, 3.840637292925567e-01, 4.000756442546844e-01, 4.160876128788093e-01, 4.320995337835847e-01, 4.481115024075674e-01, 4.641234710315501e-01, 4.801353919362899e-01, 4.961473307581278e-01, 5.121592993821106e-01, 5.28171220287028e-01, 5.441831889110108e-01, 5.601951575349934e-01, 5.762070784399109e-01, 5.922190470638936e-01, 6.082310156878764e-01, 6.242429843118591e-01, 6.40254905216599e-01, 6.562668738407592e-01, 6.72278842464742e-01, 6.882907037650147e-01, 7.043026723890684e-01, 7.203146410133354e-01, 7.363265619178976e-01, 7.523385305418803e-01, 7.68350499165863e-01, 7.843624200707805e-01, 8.003743886947632e-01, 8.163863573185184e-01, 8.323983259422736e-01, 8.484102945660288e-01, 8.644221677530756e-01, 8.804341363768308e-01, 8.964461050004722e-01, 9.124580736243409e-01, 9.284700422480962e-01, 9.444820108718514e-01, 9.604938840588981e-01, 9.76505852682227e-01, 9.925178213062664e-01, 1.008529789930022e+00, 1.024541758553493e+00, 1.040553727176964e+00, 1.056565600363939e+00, 1.072577568987979e+00, 1.088589537612018e+00, 1.104601506236029e+00, 1.120613474859386e+00, 1.136625443482857e+00, 1.152637316669691e+00, 1.16864928529373e+00, 1.18466125391777e+00, 1.200673222541809e+00, 1.21668519116528e+00, 1.232697159788751e+00, 1.248709128412222e+00, 1.264721001599482e+00, 1.280732970223521e+00, 1.296744938847447e+00, 1.312756788262311e+00, 1.32876875688635e+00, 1.344780725510389e+00, 1.360792598697365e+00, 1.376804567320836e+00, 1.392816535944307e+00, 1.408828504568062e+00, 1.424840473192102e+00, 1.440852441816141e+00, 1.456864315003259e+00, 1.47287628362673e+00, 1.488888252250201e+00, 1.504900220873927e+00, 1.520912189497853e+00, 1.536924158121892e+00, 1.552936031309152e+00, 1.568947999932623e+00, 1.584959968556094e+00, 1.600971937179565e+00]
-pump_Nrpm.m_flow=[0e+00, 4.079784093759504e-02, 4.753518887752266e-02, 5.756009452662184e-02, 7.143276329812263e-02, 8.873258398540762e-02, 1.065235534328043e-01, 1.243145386042879e-01, 1.421055527551738e-01, 1.598965611013239e-01, 1.776875827027884e-01, 1.954786192054186e-01, 2.132696706092011e-01, 2.310607071118268e-01, 2.488517452602949e-01, 2.666427685076551e-01, 2.844338480678466e-01, 3.022248713151979e-01, 3.200159243647649e-01, 3.378069741227761e-01, 3.555980271723699e-01, 3.733891067326057e-01, 3.911801299799748e-01, 4.089711830295685e-01, 4.267622327875797e-01, 4.445532858371735e-01, 4.623443653975071e-01, 4.80135391936361e-01, 4.979264416943899e-01, 5.157175212547057e-01, 5.335085179912372e-01, 5.512996273538932e-01, 5.690906771119044e-01, 5.868816738488267e-01, 6.04672783211092e-01, 6.22463832969103e-01, 6.402548893102793e-01, 6.580459390682906e-01, 6.758369888263017e-01, 6.936280981889578e-01, 7.114190949254893e-01, 7.292102042880385e-01, 7.470012540461564e-01, 7.647922507826879e-01, 7.825833601453439e-01, 8.003744099033551e-01, 8.181654662445313e-01, 8.359565160025425e-01, 8.537475657605537e-01, 8.715386221017301e-01, 8.893296718597412e-01, 9.071207812218601e-01, 9.249118309799027e-01, 9.427028807376612e-01, 9.604938840586851e-01, 9.782849338164434e-01, 9.960760431787202e-01, 1.013867033332173e+00, 1.031658202298511e+00, 1.049449252055985e+00, 1.067240195773856e+00, 1.08503124553133e+00, 1.102822295288804e+00, 1.120613464255568e+00, 1.138404514013042e+00, 1.156195563771937e+00, 1.173986507488388e+00, 1.191777676454157e+00, 1.209568726212199e+00, 1.227359775970226e+00, 1.245150825728284e+00, 1.262941875486327e+00, 1.280732938410504e+00, 1.298523988168546e+00, 1.316315037926589e+00, 1.334106087684631e+00, 1.351897137442674e+00, 1.369688306408869e+00, 1.387479356166343e+00, 1.405270299884215e+00, 1.423061349641689e+00, 1.440852399399037e+00, 1.458643568365927e+00, 1.476434618123401e+00, 1.494225667880875e+00, 1.512016611598746e+00, 1.52980766135622e+00, 1.5475988303227e+00, 1.565389880080458e+00, 1.583180929837932e+00, 1.600971979596828e+00, 1.618762923313278e+00, 1.636554092279047e+00, 1.65434514203709e+00, 1.672136191795116e+00, 1.689927241553175e+00, 1.707718291311217e+00, 1.725509354235394e+00, 1.743300403993436e+00, 1.761091453752047e+00, 1.778882503509521e+00]
-pump_dp.m_flow=[0e+00, 9.328862485460804e-02, 1.838471034664851e-01, 2.691358084246098e-01, 3.469961350539961e-01, 4.158410679565265e-01, 4.748456847303785e-01, 5.241375551932522e-01, 5.649875468258587e-01, 6.000000118431602e-01, 6.324555230465049e-01, 6.633249539146034e-01, 6.928203183035077e-01, 7.211102975030332e-01, 7.483314855800669e-01, 7.745966756901084e-01, 8.000000208337813e-01, 8.246211366071936e-01, 8.485281298378653e-01, 8.717798049166876e-01, 8.944271736095353e-01, 9.165151261969088e-01, 9.380831743802622e-01, 9.591662796570509e-01, 9.797958840925274e-01, 1e+00, 1.019803900312544e+00, 1.039230445202846e+00, 1.058300492890813e+00, 1.077032939167407e+00, 1.095445134296584e+00, 1.113552923681775e+00, 1.131370914685792e+00, 1.148912526157194e+00, 1.166190379676207e+00, 1.183215985821968e+00, 1.200000023808676e+00, 1.216552488106645e+00, 1.232882865047698e+00, 1.24899961851953e+00, 1.264911046128892e+00, 1.280624872064055e+00, 1.296148201171322e+00, 1.311487663792826e+00, 1.326649907841322e+00, 1.341640847790721e+00, 1.356466042599291e+00, 1.371130945035329e+00, 1.385640636655137e+00, 1.399999962520297e+00, 1.414213538169861e+00, 1.428285731305097e+00, 1.442220595080706e+00, 1.456022063415179e+00, 1.469693869926698e+00, 1.483239634637772e+00, 1.496662971168648e+00, 1.50996685974631e+00, 1.523154638251184e+00, 1.536229167720526e+00, 1.549193351457414e+00, 1.562049966601106e+00, 1.574801558156071e+00, 1.587450748724405e+00, 1.600000041708863e+00, 1.612451582894278e+00, 1.624807683109971e+00, 1.637070516209296e+00, 1.649242273233488e+00, 1.66132474232439e+00, 1.673320069245549e+00, 1.685229922946458e+00, 1.697056259747003e+00, 1.708800770355006e+00, 1.720465052955393e+00, 1.732050776481628e+00, 1.743559609854671e+00, 1.754992864396032e+00, 1.766352209039176e+00, 1.777638888044021e+00, 1.788854347244494e+00, 1.799999949665642e+00, 1.811077006604344e+00, 1.822086710164629e+00, 1.833030252444586e+00, 1.843908880108285e+00, 1.854723676505875e+00, 1.865475768696372e+00, 1.876166348768975e+00, 1.886796251192975e+00, 1.897366668069226e+00, 1.907878371388204e+00, 1.918332559342712e+00, 1.928730122775119e+00, 1.939071896149958e+00, 1.949358833139192e+00, 1.959591768219581e+00, 1.969771475339181e+00, 1.979898910319533e+00, 1.989974846787326e+00, 2e+00]
-pump_m_flow.m_flow=[0e+00, 2e-02, 4e-02, 6e-02, 8e-02, 1e-01, 1.2e-01, 1.4e-01, 1.6e-01, 1.8e-01, 2e-01, 2.2e-01, 2.4e-01, 2.6e-01, 2.8e-01, 3e-01, 3.2e-01, 3.4e-01, 3.6e-01, 3.8e-01, 4e-01, 4.2e-01, 4.4e-01, 4.6e-01, 4.8e-01, 5e-01, 5.2e-01, 5.4e-01, 5.600000000000001e-01, 5.8e-01, 6e-01, 6.2e-01, 6.4e-01, 6.6e-01, 6.8e-01, 7e-01, 7.2e-01, 7.4e-01, 7.6e-01, 7.8e-01, 8e-01, 8.2e-01, 8.4e-01, 8.6e-01, 8.8e-01, 9e-01, 9.2e-01, 9.399999999999999e-01, 9.6e-01, 9.8e-01, 1e+00, 1.02e+00, 1.04e+00, 1.06e+00, 1.08e+00, 1.1e+00, 1.12e+00, 1.14e+00, 1.16e+00, 1.18e+00, 1.2e+00, 1.22e+00, 1.24e+00, 1.26e+00, 1.28e+00, 1.3e+00, 1.32e+00, 1.34e+00, 1.36e+00, 1.38e+00, 1.4e+00, 1.42e+00, 1.44e+00, 1.46e+00, 1.48e+00, 1.5e+00, 1.52e+00, 1.54e+00, 1.56e+00, 1.58e+00, 1.6e+00, 1.62e+00, 1.64e+00, 1.66e+00, 1.68e+00, 1.7e+00, 1.72e+00, 1.74e+00, 1.76e+00, 1.78e+00, 1.8e+00, 1.82e+00, 1.84e+00, 1.86e+00, 1.88e+00, 1.9e+00, 1.92e+00, 1.94e+00, 1.96e+00, 1.98e+00, 2e+00]
-time=[0e+00, 1e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverParameter.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverParameter.txt
deleted file mode 100644
index c83061bc8c..0000000000
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverParameter.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2020-05-26
-statistics-initialization=
-{
- "nonlinear": "0, 1, 1, 1",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": " ",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-pump_Nrpm.m_flow=[1.778882503509521e+00, 1.778882503509521e+00]
-pump_dp.m_flow=[2e+00, 2e+00]
-pump_m_flow.m_flow=[2e+00, 2e+00]
-pump_y.m_flow=[1.600971937179565e+00, 1.600971937179565e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverStages.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverStages.txt
deleted file mode 100644
index d5dab48795..0000000000
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Examples_MoverStages.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-last-generated=2018-06-24
-statistics-initialization=
-{
- "nonlinear": "1, 0, 1, 1",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 0, 1, 1",
- "numerical Jacobians": "0"
-}
-pump_y.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 8.003743886947632e-01, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00, 1.600971937179565e+00]
-pump_Nrpm.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 8.893296718597412e-01, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00, 1.778882503509521e+00]
-pump_dp.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 1.414213538169861e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
-pump_m_flow.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
-time=[0e+00, 1e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
deleted file mode 100644
index cef52adf07..0000000000
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-last-generated=2024-06-05
-statistics-initialization=
-{
- "nonlinear": "1, 1, 0, 1, 1",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 1, 0, 1, 1",
- "number of continuous time states": "20",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 1.280510067939758e+00, 1.5494384765625e+00, 1.606707096099854e+00, 1.618817329406738e+00, 1.621376872062683e+00, 1.621917366981506e+00, 1.622032761573792e+00, 1.622056722640991e+00, 1.622061610221863e+00, 1.622062683105469e+00, 8.762909770011902e-01, 2.096612751483917e-01, 1.863026805222034e-02, 1.363298273645335e-03, 9.019421122502536e-05, 5.623015113087604e-06, 3.633108462963697e-07, -7.016069503151812e-08, -1.35560185299255e-08, -8.430106390733272e-09, 7.456924319267273e-01, 1.32401978969574e+00, 1.535150408744812e+00, 1.598639130592346e+00, 1.616043090820312e+00, 1.62056040763855e+00, 1.621697425842285e+00, 1.621976017951965e+00, 1.622043251991272e+00, 1.622058033943176e+00, 8.763427734375e-01, 2.092801481485367e-01, 1.863043941557407e-02, 1.362975453957902e-03, 9.014781971927732e-05, 5.586143288383028e-06, 3.412483238207642e-07, 2.173692337237298e-08, 2.191882231272757e-10, -1.424723450327292e-08, 7.565710544586137e-01, 1.32555365562439e+00, 1.535158157348633e+00, 1.598642349243164e+00, 1.616046547889709e+00, 1.620560646057129e+00, 1.621695995330811e+00, 1.621975302696228e+00, 1.622042417526245e+00, 1.622058510780334e+00, 8.763622045516968e-01, 2.116402983665466e-01, 1.863105967640877e-02, 1.36298022698611e-03, 9.015054820338264e-05, 5.586598490481151e-06, 3.313198249088722e-07, 1.462331056245603e-08, -4.58212525700219e-08, -4.93218976771459e-09, 7.490143775939941e-01, 1.323920845985413e+00, 1.535155415534973e+00, 1.598634719848633e+00, 1.616040945053101e+00, 1.62056565284729e+00, 1.621700286865234e+00, 1.621976017951965e+00, 1.622042179107666e+00, 1.622056484222412e+00, 8.762970566749573e-01, 2.093928158283234e-01, 1.863057911396027e-02, 1.36295729316771e-03, 9.018967102747411e-05, 5.518180387298344e-06, 3.093878149229567e-07, 1.969692675629631e-08, 4.965841071680188e-10, 4.534285835688934e-09, 7.453495264053419e-01, 1.324094891548153e+00, 1.535151362419128e+00, 1.598639488220215e+00, 1.616043448448181e+00, 1.620564103126526e+00, 1.621697902679443e+00, 1.621978044509888e+00, 1.622043251991272e+00, 1.622058510780334e+00, 8.762921690940857e-01, 2.096395045518875e-01, 1.863082312047482e-02, 1.363086048513651e-03, 9.01587336556986e-05, 5.58712417841889e-06, 3.298559931863565e-07, 1.920034264912829e-08, 1.098214852390811e-09, 4.592948243953288e-11]
-fan2.m_flow=[0e+00, 3.238364160060883e-01, 9.665698409080505e-01, 1.367307186126709e+00, 1.53023374080658e+00, 1.595265626907349e+00, 1.614234685897827e+00, 1.619887828826904e+00, 1.621482372283936e+00, 1.621912360191345e+00, 1.62202525138855e+00, 1.504449725151062e+00, 1.004008531570435e+00, 4.576253592967987e-01, 1.58779069781303e-01, 4.746329411864281e-02, 1.302969083189964e-02, 3.396119689568868e-03, 8.43399204313755e-04, 2.036458172369748e-04, 4.776775676873513e-05, 9.451556950807571e-02, 5.980538725852966e-01, 1.105112195014954e+00, 1.404515147209167e+00, 1.54139244556427e+00, 1.59457004070282e+00, 1.613274931907654e+00, 1.619393944740295e+00, 1.62129819393158e+00, 1.621844530105591e+00, 1.504398107528687e+00, 1.004021048545837e+00, 4.66381847858429e-01, 1.587555855512611e-01, 4.745681211352348e-02, 1.302091125398874e-02, 3.389197867363691e-03, 8.55344464071095e-04, 2.106132305925712e-04, 4.703914964920841e-05, 9.449321031570307e-02, 5.97241222858429e-01, 1.105048894882202e+00, 1.402524948120117e+00, 1.54140293598175e+00, 1.594573616981506e+00, 1.613267779350281e+00, 1.619387626647949e+00, 1.621285915374756e+00, 1.621885776519775e+00, 1.504400610923767e+00, 1.004011988639832e+00, 4.630688428878784e-01, 1.587697267532349e-01, 4.745740443468094e-02, 1.302131731063113e-02, 3.38747282512491e-03, 8.450422319583595e-04, 1.963700487976894e-04, 4.55053523182869e-05, 9.451376646757126e-02, 5.98223865032196e-01, 1.105051755905151e+00, 1.404888272285461e+00, 1.541384816169739e+00, 1.594586253166199e+00, 1.61329448223114e+00, 1.619403958320618e+00, 1.621306180953979e+00, 1.621830463409424e+00, 1.504393696784973e+00, 1.004026770591736e+00, 4.574756622314453e-01, 1.588010787963867e-01, 4.746184498071671e-02, 1.301803253591061e-02, 3.38460342027247e-03, 8.490479085594416e-04, 2.074275689665228e-04, 4.936378536513075e-05, 9.45163071155584e-02, 5.980895161628669e-01, 1.105057597160339e+00, 1.404708504676819e+00, 1.540072917938232e+00, 1.594584941864014e+00, 1.613281488418579e+00, 1.619407534599304e+00, 1.62129271030426e+00, 1.62184727191925e+00, 1.504400014877319e+00, 1.004000067710876e+00, 4.533055126667023e-01, 1.587153524160385e-01, 4.745590314269066e-02, 1.30208944901824e-02, 3.392881713807583e-03, 8.560418500564992e-04, 2.093021903419867e-04, 4.926608016830869e-05]
-fan3.m_flow=[0e+00, 5.383297801017761e-01, 1.124705791473389e+00, 1.428618550300598e+00, 1.554775714874268e+00, 1.600537657737732e+00, 1.615597605705261e+00, 1.620223045349121e+00, 1.621562004089355e+00, 1.621930956840515e+00, 1.622029423713684e+00, 1.516015768051147e+00, 1.106585621833801e+00, 6.801723837852478e-01, 3.192040622234337e-01, 9.379150718450546e-02, 2.55405604839325e-02, 6.513927131891232e-03, 1.589839230291545e-03, 3.797657263930887e-04, 8.774844172876328e-05, 1.14462211728096e-01, 7.58853018283844e-01, 1.19597852230072e+00, 1.44085419178009e+00, 1.552851557731628e+00, 1.597818613052368e+00, 1.614128589630127e+00, 1.619606494903564e+00, 1.621341109275818e+00, 1.621854424476624e+00, 1.515962839126587e+00, 1.106562972068787e+00, 6.801590919494629e-01, 3.197629451751694e-01, 9.553485363721848e-02, 2.549540996551514e-02, 6.499024573713541e-03, 1.615358050912619e-03, 3.93242429709062e-04, 8.674356649862602e-05, 1.14452272653578e-01, 7.591243982315063e-01, 1.195974707603455e+00, 1.440623164176941e+00, 1.552858352661133e+00, 1.597821235656738e+00, 1.61412239074707e+00, 1.619601130485535e+00, 1.621333718299866e+00, 1.621858954429626e+00, 1.515962839126587e+00, 1.106560587882996e+00, 6.801605820655823e-01, 3.194526135921478e-01, 9.420029073953629e-02, 2.551787160336942e-02, 6.49541104212413e-03, 1.594017026945949e-03, 3.644828393589705e-04, 8.37457919260487e-05, 1.144639998674393e-01, 7.587964534759521e-01, 1.195972442626953e+00, 1.440652847290039e+00, 1.552847027778625e+00, 1.597827196121216e+00, 1.614140391349792e+00, 1.619610071182251e+00, 1.621334195137024e+00, 1.621846795082092e+00, 1.515959024429321e+00, 1.106562733650208e+00, 6.801615357398987e-01, 3.20422351360321e-01, 9.572827816009521e-02, 2.550799399614334e-02, 6.511997431516647e-03, 1.619197311811149e-03, 4.605636058840901e-04, 9.966395009541884e-05, 1.144630163908061e-01, 7.58838653564448e-01, 1.195973873138428e+00, 1.440539002418518e+00, 1.552058458328247e+00, 1.597827792167664e+00, 1.614132642745972e+00, 1.619617342948914e+00, 1.621342897415161e+00, 1.621858954429626e+00, 1.51596462726593e+00, 1.106569170951843e+00, 6.801608204841614e-01, 3.172318935394287e-01, 9.597036242485046e-02, 2.578061074018478e-02, 6.506970152258873e-03, 1.616829773411155e-03, 3.906660713255405e-04, 9.10558519535698e-05]
-fan4.m_flow=[0e+00, 1.28046977519989e+00, 1.5494384765625e+00, 1.606707096099854e+00, 1.618817329406738e+00, 1.621376872062683e+00, 1.621917366981506e+00, 1.622032761573792e+00, 1.622056722640991e+00, 1.622061610221863e+00, 1.622062683105469e+00, 8.762909770011902e-01, 2.096618115901947e-01, 1.863026805222034e-02, 1.363298273645335e-03, 9.01942839846015e-05, 5.623015113087604e-06, 3.633108462963697e-07, -7.016069503151812e-08, -1.35560185299255e-08, -8.429196896031499e-09, 7.456928491592407e-01, 1.324019908905029e+00, 1.535150408744812e+00, 1.598639130592346e+00, 1.616043090820312e+00, 1.62056040763855e+00, 1.621697425842285e+00, 1.621976017951965e+00, 1.622043251991272e+00, 1.622058033943176e+00, 8.763427734375e-01, 2.092804908752441e-01, 1.863043941557407e-02, 1.362975453957902e-03, 9.014781971927732e-05, 5.586143743130378e-06, 3.412487785681151e-07, 2.173692337237298e-08, 2.182787284255028e-10, -1.424723450327292e-08, 7.565706372261003e-01, 1.325553059577942e+00, 1.535158157348633e+00, 1.598642349243164e+00, 1.616046547889709e+00, 1.620560646057129e+00, 1.621695995330811e+00, 1.621975302696228e+00, 1.622042417526245e+00, 1.622058510780334e+00, 8.763622045516968e-01, 2.116403132677078e-01, 1.863105967640877e-02, 1.36298022698611e-03, 9.015054092742503e-05, 5.586598490481151e-06, 3.313198249088722e-07, 1.462331056245603e-08, -4.582216206472367e-08, -4.932644515065476e-09, 7.490143775939941e-01, 1.323920845985413e+00, 1.535155415534973e+00, 1.598634719848633e+00, 1.616040945053101e+00, 1.62056565284729e+00, 1.621700286865234e+00, 1.621976017951965e+00, 1.622042179107666e+00, 1.622056484222412e+00, 8.762970566749573e-01, 2.093928158283234e-01, 1.863057911396027e-02, 1.36295729316771e-03, 9.018967102747411e-05, 5.518180842045695e-06, 3.093878149229567e-07, 1.969738150364719e-08, 4.961293598171324e-10, 4.534285835688934e-09, 7.45349228382118e-01, 1.324094891548153e+00, 1.535151362419128e+00, 1.598639488220215e+00, 1.616043448448181e+00, 1.620564103126526e+00, 1.621697902679443e+00, 1.621978044509888e+00, 1.622043251991272e+00, 1.622058510780334e+00, 8.762921690940857e-01, 2.096348106861115e-01, 1.863082312047482e-02, 1.363086048513651e-03, 9.01587336556986e-05, 5.58712417841889e-06, 3.298555384390056e-07, 1.919943315442652e-08, 1.098214852390811e-09, 4.592948243953288e-11]
-fan1.dp=[0e+00, -3.272678833007812e+02, -4.802187805175781e+02, -5.163167114257812e+02, -5.241172485351562e+02, -5.257733154296875e+02, -5.261233520507812e+02, -5.261981201171875e+02, -5.26213623046875e+02, -5.26216796875e+02, -5.262174072265625e+02, -1.534672393798828e+02, -1.835246086120605e+01, -1.58955705165863e+00, -1.162862628698343e-01, -7.696095854043961e-03, -4.776091373059899e-04, -2.838765794876948e-05, -1.570835593156517e-06, -8.454662747681141e-08, -4.20550350099802e-09, -1.113584594726562e+02, -3.507078857421875e+02, -4.714020690917969e+02, -5.111491394042969e+02, -5.223244018554688e+02, -5.252445678710938e+02, -5.259808959960938e+02, -5.261613159179688e+02, -5.262048950195312e+02, -5.262144775390625e+02, -1.534676666259766e+02, -1.835149765014648e+01, -1.589625477790833e+00, -1.162669807672489e-01, -7.689840160310268e-03, -4.76508226711303e-04, -2.823963586706668e-05, -1.633859938010573e-06, -9.19681042432785e-08, -3.885361365973949e-09, -1.114997940063466e+02, -3.507433166503906e+02, -4.714067077636719e+02, -5.111508483886719e+02, -5.2232666015625e+02, -5.252447509765625e+02, -5.259798583984375e+02, -5.261608276367188e+02, -5.26204345703125e+02, -5.262147827148438e+02, -1.534675598144531e+02, -1.835727500915527e+01, -1.589625477790833e+00, -1.162669137120247e-01, -7.690075319260359e-03, -4.765446064993642e-04, -2.819989458657903e-05, -1.582462573423982e-06, -7.60337570682168e-08, -3.798049874603748e-09, -1.114018096923828e+02, -3.507061462402344e+02, -4.714049987792969e+02, -5.11146240234375e+02, -5.223230590820312e+02, -5.252479858398438e+02, -5.25982666015625e+02, -5.261613159179688e+02, -5.262042236328125e+02, -5.262134399414062e+02, -1.534668426513672e+02, -1.835176086425781e+01, -1.589572668075562e+00, -1.162649095058441e-01, -7.691577076911926e-03, -4.758773720823228e-04, -2.810815931297839e-05, -1.603373675607145e-06, -8.87666828930378e-08, -4.816683940589428e-09, -1.113539962768579e+02, -3.5070944213867e+02, -4.714024963378906e+02, -5.111494445800781e+02, -5.223246459960938e+02, -5.252469482421875e+02, -5.25981201171875e+02, -5.2616259765625e+02, -5.262048950195312e+02, -5.262147216796875e+02, -1.534669342041016e+02, -1.835208320617676e+01, -1.589593410491943e+00, -1.162758469581604e-01, -7.690755650401115e-03, -4.765918129123747e-04, -2.831613528542221e-05, -1.636959495954216e-06, -9.064387995749712e-08, -4.700268618762493e-09]
-fan2.dp=[0e+00, -2.523567199707031e+01, -1.877875518798828e+02, -3.73989013671875e+02, -4.704352416992188e+02, -5.089842529296875e+02, -5.211537475585938e+02, -5.24808349609375e+02, -5.2584130859375e+02, -5.261200561523438e+02, -5.261932373046875e+02, -4.52580810546875e+02, -2.015322723388672e+02, -4.345972061157227e+01, -1.023900413513181e+01, -2.872166633605957e+00, -7.837437391281128e-01, -2.041839808225626e-01, -5.070822313427925e-02, -1.224369276314974e-02, -2.872132463380694e-03, -5.830621242523193e+00, -7.150765991210938e+01, -2.443009185791016e+02, -3.947117919921875e+02, -4.7520263671875e+02, -5.085400695800781e+02, -5.205352172851562e+02, -5.24488525390625e+02, -5.257190551757812e+02, -5.260750122070312e+02, -4.525497741699219e+02, -2.015373077392578e+02, -4.392600250244141e+01, -1.023830890655512e+01, -2.871766567230225e+00, -7.832157015800476e-01, -2.037684917449951e-01, -5.142413452267647e-02, -1.266224682331085e-02, -2.828175434842706e-03, -5.829172611236492e+00, -7.143440246582031e+01, -2.442913818359375e+02, -3.942944030761719e+02, -4.752092590332031e+02, -5.085420837402344e+02, -5.2052978515625e+02, -5.244842529296875e+02, -5.2571240234375e+02, -5.260872802734375e+02, -4.5255126953125e+02, -2.015336456298828e+02, -4.374811935424805e+01, -1.023881053924561e+01, -2.871803045272827e+00, -7.832401394843969e-01, -2.036648690700561e-01, -5.080479755997658e-02, -1.180617231875658e-02, -2.735846908763051e-03, -5.830503940582275e+00, -7.152130126953125e+01, -2.442898254394531e+02, -3.94791748046875e+02, -4.7519775390625e+02, -5.085507202148438e+02, -5.205467529296875e+02, -5.244925537109375e+02, -5.257174682617188e+02, -5.260673217773438e+02, -4.525471496582031e+02, -2.015395812988281e+02, -4.345449066162109e+01, -1.024015045166016e+01, -2.872074365615845e+00, -7.83044159412384e-01, -2.034932672977448e-01, -5.104557424783707e-02, -1.247074082493782e-02, -2.967461477965117e-03, -5.830668926239264e+00, -7.151084136962777e+01, -2.442920837402344e+02, -3.947524719238281e+02, -4.748961791992188e+02, -5.085497436523438e+02, -5.20538818359375e+02, -5.244979858398438e+02, -5.257185668945312e+02, -5.260779418945312e+02, -4.525509033203125e+02, -2.015289001464844e+02, -4.323332214355469e+01, -1.023678398132324e+01, -2.871711015701294e+00, -7.832146883010864e-01, -2.039900571107864e-01, -5.146608874201775e-02, -1.258343178778887e-02, -2.961928956210613e-03]
-fan3.dp=[0e+00, -5.863901138305664e+01, -2.530508880615234e+02, -4.082392272949219e+02, -4.834882202148438e+02, -5.123521728515625e+02, -5.2203369140625e+02, -5.250252685546875e+02, -5.258929443359375e+02, -5.26132080078125e+02, -5.261959228515625e+02, -4.595790100097656e+02, -2.4483642578125e+02, -9.250585174560547e+01, -2.904174995422356e+01, -8.21247673034668e+00, -2.179995059967041e+00, -5.558165907859787e-01, -1.357142478227615e-01, -3.238045424222946e-02, -7.523603271692991e-03, -9.843368530273438e+00, -1.152174911499023e+02, -2.861305541992188e+02, -4.151333312988281e+02, -4.822903747558594e+02, -5.106131286621094e+02, -5.210851440429688e+02, -5.246259765625e+02, -5.257496337890625e+02, -5.260823974609375e+02, -4.595469055175781e+02, -2.448264007568359e+02, -9.2502197265625e+01, -2.903992271423325e+01, -8.210187911987305e+00, -2.178063869476318e+00, -5.545521974563599e-01, -1.378327012062073e-01, -3.355302661657333e-02, -7.39354221150279e-03, -9.842493057250831e+00, -1.152220153808594e+02, -2.861313171386719e+02, -4.151358337402344e+02, -4.822946166992188e+02, -5.106148376464844e+02, -5.210811767578125e+02, -5.2462255859375e+02, -5.25744873046875e+02, -5.260853271484375e+02, -4.595469055175781e+02, -2.448253479003906e+02, -9.250263214111328e+01, -2.904006767272949e+01, -8.21031665802002e+00, -2.178142070770239e+00, -5.542376637458885e-01, -1.360109597444534e-01, -3.110741078853607e-02, -7.1465028449893e-03, -9.843520164489746e+00, -1.152157287597656e+02, -2.861293029785156e+02, -4.151384887695312e+02, -4.8228759765625e+02, -5.1061865234375e+02, -5.210927124023438e+02, -5.246282958984375e+02, -5.257452392578125e+02, -5.260774536132812e+02, -4.595446472167969e+02, -2.448262634277344e+02, -9.250289916992188e+01, -2.904013824462891e+01, -8.210901260375977e+00, -2.177228689193726e+00, -5.536202192306519e-01, -1.367282718420029e-01, -3.301918506622314e-02, -7.783974520862103e-03, -9.843434333801778e+00, -1.152184753417954e+02, -2.861309204101562e+02, -4.151333923339844e+02, -4.822880554199219e+02, -5.106190490722656e+02, -5.210877685546875e+02, -5.246331787109375e+02, -5.257509155273438e+02, -5.2608544921875e+02, -4.595479736328125e+02, -2.448291473388672e+02, -9.250270843505859e+01, -2.904050445556641e+01, -8.210497856140137e+00, -2.178197145462036e+00, -5.55223286151886e-01, -1.37956902384758e-01, -3.333397954702377e-02, -7.769629824906588e-03]
-fan4.dp=[0e+00, -3.272669677734375e+02, -4.8021875e+02, -5.163167114257812e+02, -5.241172485351562e+02, -5.257733154296875e+02, -5.261233520507812e+02, -5.261981201171875e+02, -5.26213623046875e+02, -5.26216796875e+02, -5.262174072265625e+02, -1.534672393798828e+02, -1.835246276855469e+01, -1.58955705165863e+00, -1.162862628698343e-01, -7.696095854043961e-03, -4.776091373059899e-04, -2.838765794876948e-05, -1.570835593156517e-06, -8.454662747681141e-08, -4.20550350099802e-09, -1.113584671020508e+02, -3.507078857421875e+02, -4.714020690917969e+02, -5.111491394042969e+02, -5.223244018554688e+02, -5.252445678710938e+02, -5.259808959960938e+02, -5.261613159179688e+02, -5.262048950195312e+02, -5.262144775390625e+02, -1.534676666259766e+02, -1.835149955749512e+01, -1.589625477790833e+00, -1.162669807672489e-01, -7.689840160310268e-03, -4.76508226711303e-04, -2.823963586706668e-05, -1.633859938010573e-06, -9.19681042432785e-08, -3.885361365973949e-09, -1.11499786376952e+02, -3.507433166503906e+02, -4.714067077636719e+02, -5.111508483886719e+02, -5.2232666015625e+02, -5.252447509765625e+02, -5.259798583984375e+02, -5.261608276367188e+02, -5.26204345703125e+02, -5.262147827148438e+02, -1.534675598144531e+02, -1.835727500915527e+01, -1.589625477790833e+00, -1.162669137120247e-01, -7.690075319260359e-03, -4.765446064993642e-04, -2.819989458657903e-05, -1.582462573423982e-06, -7.60337570682168e-08, -3.798049874603748e-09, -1.114018096923828e+02, -3.507061462402344e+02, -4.714049987792969e+02, -5.11146240234375e+02, -5.223230590820312e+02, -5.252479858398438e+02, -5.25982666015625e+02, -5.261613159179688e+02, -5.262042236328125e+02, -5.262134399414062e+02, -1.534668426513672e+02, -1.835176086425781e+01, -1.589572668075562e+00, -1.162649095058441e-01, -7.691577076911926e-03, -4.758773720823228e-04, -2.810815931297839e-05, -1.603373675607145e-06, -8.87666828930378e-08, -4.816683940589428e-09, -1.113539886474634e+02, -3.5070944213867e+02, -4.714024963378906e+02, -5.111494445800781e+02, -5.223246459960938e+02, -5.252469482421875e+02, -5.25981201171875e+02, -5.2616259765625e+02, -5.262048950195312e+02, -5.262147216796875e+02, -1.534669342041016e+02, -1.835207176208496e+01, -1.589593410491943e+00, -1.162758469581604e-01, -7.690755650401115e-03, -4.765918129123747e-04, -2.831613528542221e-05, -1.636959495954216e-06, -9.064387995749712e-08, -4.700268618762493e-09]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachine.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachine.txt
deleted file mode 100644
index d2aa13bbc9..0000000000
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachine.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-last-generated=2021-06-17
-statistics-initialization=
-{
- "nonlinear": "1, 1, 0, 1, 1",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 1, 0, 1, 1",
- "number of continuous time states": "14",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 3.501554718241096e-03, 4.24210075289011e-03, 4.398650955408812e-03, 4.431774839758873e-03, 4.438804462552071e-03, 4.440273623913527e-03, 4.440587013959885e-03, 4.44067595526576e-03, 4.440652672201395e-03, 4.440652672201395e-03, 2.397827338427305e-03, 6.946366629563272e-04, 9.096522990148515e-05, 6.965171451156459e-06, 4.73568888992304e-07, 3.211198418284766e-08, 2.439173840684844e-08, 3.014065441675484e-09, -1.355147105641663e-10, 2.678780219866894e-08, 2.042373875156045e-03, 3.625104203820229e-03, 4.202964249998331e-03, 4.376594442874193e-03, 4.424185026437044e-03, 4.436537623405457e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397601725533605e-03, 6.946418434381485e-04, 9.100652096094564e-05, 6.934275006642497e-06, 4.693797563959379e-07, 3.242530510760844e-08, 8.574261300964281e-09, 5.601123120868579e-09, 5.618448994937353e-08, 1.968601281987503e-07, 2.042373176664103e-03, 3.625105135142803e-03, 4.202964715659618e-03, 4.376594442874193e-03, 4.424185026437044e-03, 4.436537623405457e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397601725533605e-03, 6.946418434381485e-04, 9.100651368498802e-05, 6.934275916137267e-06, 4.693797563959379e-07, 3.242530510760782e-08, 8.574261300964013e-09, 5.600668373517692e-09, 5.618130671791732e-08, 1.968596734513994e-07, 2.04237992875278e-03, 3.625104669481516e-03, 4.202964715659618e-03, 4.376594442874193e-03, 4.424185492098331e-03, 4.436537623405457e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440614022314548e-03, 2.397601725533605e-03, 6.946418434381485e-04, 9.100652096094564e-05, 6.934275916137267e-06, 4.693797563959379e-07, 3.242530510760844e-08, 8.574716048315167e-09, 5.600668373517692e-09, 5.618130671791732e-08, 1.968587639566977e-07, 2.042379230260869e-03, 3.625104669481506e-03, 4.202964715659618e-03, 4.376594442874193e-03, 4.424185492098331e-03, 4.436537623405457e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440614022314548e-03, 2.397601725533605e-03, 6.946418434381485e-04, 9.100652096094564e-05, 6.934275916137267e-06, 4.693811206379905e-07, 3.242530510760844e-08, 8.574261300964281e-09, 5.600668373517692e-09, 5.618130671791732e-08, 1.968583092093468e-07]
-fan2.m_flow=[0e+00, 3.501401515677571e-03, 4.242068622261286e-03, 4.398644436150789e-03, 4.431773442775011e-03, 4.438804462552071e-03, 4.440273623913527e-03, 4.440587013959885e-03, 4.44067595526576e-03, 4.440652672201395e-03, 4.440652672201395e-03, 2.398065524175763e-03, 6.94753834977746e-04, 9.098674490815029e-05, 6.96846063874542e-06, 4.737257768283598e-07, 3.212107912986539e-08, 2.437445800751475e-08, 3.020886651938781e-09, -1.095941115636379e-10, 2.68664734903723e-08, 2.04212311655283e-03, 3.62500362098217e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936554655112491e-06, 4.694566086982377e-07, 3.243485480197705e-08, 8.579718269174919e-09, 5.537003744393587e-09, 5.56815393792931e-08, 1.967900971067138e-07, 2.042122185230244e-03, 3.625004552304745e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936556928849313e-06, 4.694566086982377e-07, 3.243485480197644e-08, 8.579718269174652e-09, 5.537003744393587e-09, 5.568290362134576e-08, 1.967900971067138e-07, 2.042128937318921e-03, 3.625003853812814e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573044121265e-03, 4.440614022314548e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936556474101963e-06, 4.694556992035359e-07, 3.243485480197705e-08, 8.580627763876691e-09, 5.537003744393587e-09, 5.568199412664399e-08, 1.967896423593629e-07, 2.042128238827011e-03, 3.625003853812804e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440614022314548e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936555564607261e-06, 4.694561539508868e-07, 3.243485480197705e-08, 8.579263521824032e-09, 5.536094249691814e-09, 5.56815393792931e-08, 1.967900971067138e-07]
-fan3.m_flow=[0e+00, 3.501401515677571e-03, 4.242068622261286e-03, 4.398644436150789e-03, 4.431773442775011e-03, 4.438804462552071e-03, 4.440273623913527e-03, 4.440587013959885e-03, 4.44067595526576e-03, 4.440652672201395e-03, 4.440652672201395e-03, 2.398065524175763e-03, 6.94753834977746e-04, 9.098674490815029e-05, 6.968459729250719e-06, 4.737257768283598e-07, 3.212107912986539e-08, 2.437400326016387e-08, 3.020431904587895e-09, -1.086846168618649e-10, 2.68664734903723e-08, 2.04212311655283e-03, 3.62500362098217e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397839911282063e-03, 6.947556394152343e-04, 9.102959302254021e-05, 6.93655420036514e-06, 4.694566086982377e-07, 3.243485480197705e-08, 8.579718269174919e-09, 5.537003744393587e-09, 5.568381311604753e-08, 1.967905518540647e-07, 2.042122418060888e-03, 3.625004552304745e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440613556653261e-03, 2.397839911282063e-03, 6.947556394152343e-04, 9.102960029849783e-05, 6.936556019354612e-06, 4.694556992035359e-07, 3.243440005462555e-08, 8.580173016525539e-09, 5.536094249691814e-09, 5.567926564253867e-08, 1.96789187612012e-07, 2.042128937318921e-03, 3.625003853812814e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573044121265e-03, 4.440614022314548e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936556019354612e-06, 4.694556992035359e-07, 3.243440005462617e-08, 8.579718269174919e-09, 5.537003744393587e-09, 5.568062988459133e-08, 1.967900971067138e-07, 2.042128238827011e-03, 3.625003853812804e-03, 4.202932585030794e-03, 4.376585595309734e-03, 4.424182698130608e-03, 4.436536692082882e-03, 4.439647775143385e-03, 4.440412390977144e-03, 4.440573509782553e-03, 4.440614022314548e-03, 2.397839911282063e-03, 6.947556976228952e-04, 9.102960029849783e-05, 6.936556474101963e-06, 4.694566086982377e-07, 3.243485480197705e-08, 8.579718269174919e-09, 5.537003744393587e-09, 5.568199412664399e-08, 1.967900971067138e-07]
-fan4.m_flow=[0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, -1.364242052659392e-12, 0e+00, 0e+00, -9.094947017729282e-13, 0e+00, 0e+00, 0e+00, -3.637978807091713e-12, 0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, -1.364242052659392e-12, 0e+00, 0e+00, 0e+00, -9.094947017728851e-13, 0e+00, 0e+00, 1.364242052659392e-12, 4.547473508864641e-13, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, -9.094947017729282e-13, 0e+00, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00, -9.094947017729282e-13, 0e+00, 0e+00, -1.364242052659392e-12, -9.094947017729282e-13]
-fan1.dp=[0e+00, -1.703012109375e+04, -2.4994837890625e+04, -2.6873333984375e+04, -2.727879296875e+04, -2.7365400390625e+04, -2.738351953125e+04, -2.7387380859375e+04, -2.738848046875e+04, -2.738819140625e+04, -2.738819140625e+04, -7.98559619140625e+03, -1.274951049804688e+03, -1.618009185791016e+02, -1.228352355957025e+01, -8.147192597389221e-01, -5.057528614997864e-02, -3.044552169740184e-03, -1.794220152078196e-04, -1.349870581179857e-05, -1.448250259272754e-06, -5.7942861328125e+03, -1.8251892578125e+04, -2.453478515625e+04, -2.660372265625e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553699e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.04812379181385e-03, -1.782526087481529e-04, -1.708813942968845e-05, -4.110363079234958e-06, -5.794309082031195e+03, -1.8251904296875e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974781e-02, -3.048124024644602e-03, -1.782525796443224e-04, -1.708815398160368e-05, -4.110319423489273e-06, -5.79430810546875e+03, -1.825190234375e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.048124024644494e-03, -1.782525796443224e-04, -1.708815398160368e-05, -4.110319423489273e-06, -5.794308593750126e+03, -1.82519023437499e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.048124024644494e-03, -1.782525796443224e-04, -1.708816853351891e-05, -4.110319423489273e-06]
-fan2.dp=[0e+00, -1.703012109375e+04, -2.4994837890625e+04, -2.6873333984375e+04, -2.727879296875e+04, -2.7365400390625e+04, -2.738351953125e+04, -2.7387380859375e+04, -2.738848046875e+04, -2.738819140625e+04, -2.738819140625e+04, -7.98559619140625e+03, -8.403944702148438e+02, -8.571736907958984e+01, -6.477916240692107e+00, -4.296443462371826e-01, -2.667104639112949e-02, -1.605893950909368e-03, -9.466288611292839e-05, -7.117239874787629e-06, -1.171414623968303e-06, -5.7942861328125e+03, -1.8251892578125e+04, -2.453478515625e+04, -2.660372265625e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -8.403751831054688e+02, -8.572597503662109e+01, -6.47624826431268e+00, -4.294778108596802e-01, -2.666874974966049e-02, -1.607538899406791e-03, -9.408306505065411e-05, -9.845010936260223e-06, -5.142836016602814e-06, -5.794309082031193e+03, -1.8251904296875e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -8.403751831054688e+02, -8.572597503662109e+01, -6.476248264312744e+00, -4.294778108596802e-01, -2.666874974965995e-02, -1.60753901582217e-03, -9.408305049873888e-05, -9.84512735158205e-06, -5.142836016602814e-06, -5.79430810546875e+03, -1.825190234375e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -8.403751831054688e+02, -8.572597503662109e+01, -6.476248264312744e+00, -4.294778108596802e-01, -2.666874974966049e-02, -1.607539015822113e-03, -9.408306505065411e-05, -9.845098247751594e-06, -5.142821464687586e-06, -5.794308593750126e+03, -1.82519023437499e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -8.403751831054688e+02, -8.572597503662109e+01, -6.476248264312744e+00, -4.294778108596802e-01, -2.666874974966049e-02, -1.607538899406791e-03, -9.408303594682366e-05, -9.845083695836365e-06, -5.142850568518043e-06]
-fan3.dp=[0e+00, -1.703012109375e+04, -2.4994837890625e+04, -2.6873333984375e+04, -2.727879296875e+04, -2.7365400390625e+04, -2.738351953125e+04, -2.7387380859375e+04, -2.738848046875e+04, -2.738819140625e+04, -2.738819140625e+04, -7.98559619140625e+03, -1.274951049804688e+03, -1.618009185791016e+02, -1.228352355957025e+01, -8.147192597389221e-01, -5.057528614997864e-02, -3.044552169740184e-03, -1.794220152078196e-04, -1.349870581179857e-05, -1.448250259272754e-06, -5.7942861328125e+03, -1.8251892578125e+04, -2.453478515625e+04, -2.660372265625e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553699e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.04812379181385e-03, -1.782526087481529e-04, -1.708813942968845e-05, -4.110363079234958e-06, -5.794309082031195e+03, -1.8251904296875e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.7185439453125e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974781e-02, -3.048124024644602e-03, -1.782525796443224e-04, -1.708815398160368e-05, -4.110319423489273e-06, -5.79430810546875e+03, -1.825190234375e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.048124024644494e-03, -1.782525796443224e-04, -1.708815398160368e-05, -4.110319423489273e-06, -5.794308593750126e+03, -1.82519023437499e+04, -2.4534787109375e+04, -2.6603724609375e+04, -2.718544140625e+04, -2.7337455078125e+04, -2.737580078125e+04, -2.738523046875e+04, -2.7387212890625e+04, -2.7387712890625e+04, -7.98409326171875e+03, -1.274929321289062e+03, -1.618170166015625e+02, -1.228036117553711e+01, -8.144035935401917e-01, -5.057092010974884e-02, -3.048124024644494e-03, -1.782525796443224e-04, -1.708816853351891e-05, -4.110319423489273e-06]
-fan4.dp=[-2.7388189453125e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
deleted file mode 100644
index fc312ab487..0000000000
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-last-generated=2021-06-17
-statistics-initialization=
-{
- "nonlinear": "1, 1, 0, 1, 1",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 1, 0, 1, 1",
- "number of continuous time states": "20",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 3.501605708152056e-03, 4.242090508341789e-03, 4.398665856570005e-03, 4.431773908436298e-03, 4.438775591552258e-03, 4.440256860107183e-03, 4.440570715814829e-03, 4.440637305378914e-03, 4.44065174087882e-03, 4.440654534846544e-03, 2.397751668468118e-03, 6.946114008314908e-04, 9.096450230572373e-05, 6.906901944603271e-06, 4.597268343786709e-07, 2.871729520848021e-08, 1.793523551896206e-09, 9.868017514236271e-11, 5.002220859751105e-12, 4.547473508864641e-13, 2.042543608695269e-03, 3.62505903467536e-03, 4.20296797528863e-03, 4.376600496470928e-03, 4.424193408340216e-03, 4.436556715518236e-03, 4.439655691385269e-03, 4.440415650606155e-03, 4.440598655492067e-03, 4.4406414963305e-03, 2.397749107331038e-03, 6.946109933778644e-04, 9.096309804590419e-05, 6.906884664203904e-06, 4.581775101542007e-07, 2.864499037968926e-08, 1.757598511176184e-09, 9.640643838793039e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.042540814727534e-03, 3.625059733167291e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.424192477017641e-03, 4.436556249856949e-03, 4.439655225723982e-03, 4.440415184944868e-03, 4.440598655492067e-03, 4.440641961991787e-03, 2.397749340161681e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906884664203972e-06, 4.581775101542007e-07, 2.864408088498691e-08, 1.757598511176246e-09, 9.731593308970332e-11, 6.366462912410498e-12, 4.547473508864641e-13, 2.042529406026006e-03, 3.625063691288233e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.42419433966279e-03, 4.436557646840811e-03, 4.439658019691706e-03, 4.440417047590017e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397749572992325e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906885573698673e-06, 4.581775101542007e-07, 2.864499037968926e-08, 1.758508005877957e-09, 9.595169103704393e-11, 5.002220859751105e-12, 4.547473508864641e-13, 2.042529173195382e-03, 3.625062759965648e-03, 4.202965646982193e-03, 4.376600962132215e-03, 4.424190614372492e-03, 4.436555318534374e-03, 4.439657554030418e-03, 4.44041658192873e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397749572992325e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906885573698673e-06, 4.581779649015516e-07, 2.864544512704015e-08, 1.757598511176184e-09, 9.640643838793039e-11, 5.002220859751105e-12, 4.547473508864641e-13]
-fan2.m_flow=[0e+00, 8.949422626756132e-04, 2.65989825129509e-03, 3.74473980627954e-03, 4.204541444778442e-03, 4.367383196949959e-03, 4.419260192662477e-03, 4.434677306562662e-03, 4.439040087163448e-03, 4.440230317413807e-03, 4.440546035766602e-03, 4.118424374610186e-03, 2.755261026322842e-03, 1.314262044616044e-03, 4.79495764011516e-04, 1.478799385949969e-04, 4.13616253354121e-05, 1.089719989977308e-05, 2.760303686955012e-06, 6.805807970522437e-07, 1.645253178139683e-07, 2.817388158291578e-04, 1.649767975322902e-03, 3.029945539310575e-03, 3.847505198791623e-03, 4.220185335725546e-03, 4.365534987300634e-03, 4.416648298501968e-03, 4.433348309248686e-03, 4.438514821231365e-03, 4.440039396286011e-03, 4.11828001961112e-03, 2.755221212282777e-03, 1.314251101575792e-03, 4.794951237272448e-04, 1.478827762184665e-04, 4.136259667575359e-05, 1.089728357328568e-05, 2.760236839094432e-06, 6.80599896440981e-07, 1.64478478836827e-07, 2.817427739500964e-04, 1.649768673814833e-03, 3.029946470633149e-03, 3.847502404823899e-03, 4.220187664031982e-03, 4.365534987300634e-03, 4.416648764163256e-03, 4.433346446603537e-03, 4.438513424247503e-03, 4.440045915544033e-03, 4.118282347917557e-03, 2.755221910774708e-03, 1.314251334406435e-03, 4.79495181934908e-04, 1.478828053222969e-04, 4.136260395171075e-05, 1.089728539227524e-05, 2.760237293841783e-06, 6.806008059356827e-07, 1.64478478836827e-07, 2.817578497342765e-04, 1.649771351367235e-03, 3.029948333278298e-03, 3.847502637654543e-03, 4.220183938741684e-03, 4.365534521639347e-03, 4.41665155813098e-03, 4.433353431522846e-03, 4.438521340489388e-03, 4.44005336612463e-03, 4.118285141885281e-03, 2.755222842097282e-03, 1.314251683652401e-03, 4.794952692463994e-04, 1.478828198742121e-04, 4.136260758969001e-05, 1.089728630176978e-05, 2.760236839094432e-06, 6.806008059356827e-07, 1.64478478836827e-07, 2.817578206304559e-04, 1.649774610996232e-03, 3.029948798939586e-03, 3.847504733130336e-03, 4.220192786306143e-03, 4.365536384284496e-03, 4.416650161147118e-03, 4.433352034538984e-03, 4.438518080860376e-03, 4.440049175173044e-03, 4.118283744901419e-03, 2.755222376435995e-03, 1.314251567237079e-03, 4.794952401425689e-04, 1.478828053222969e-04, 4.136260395171121e-05, 1.089728539227508e-05, 2.760237293841783e-06, 6.806008059356827e-07, 1.64478478836827e-07]
-fan3.m_flow=[0e+00, 1.450155745260417e-03, 3.080698428675532e-03, 3.911586478352547e-03, 4.25664009526372e-03, 4.381790291517973e-03, 4.422961268573999e-03, 4.435586743056774e-03, 4.439257550984621e-03, 4.440281074494123e-03, 4.440558608621359e-03, 4.14996175095439e-03, 3.034239402040839e-03, 1.893000560812652e-03, 8.640975574962774e-04, 2.621321473270655e-04, 7.091530278557912e-05, 1.824597347876983e-05, 4.546242053038441e-06, 1.10757628135616e-06, 2.653250703588128e-07, 3.240198420826346e-04, 2.085372572764754e-03, 3.275953233242035e-03, 3.944502212107182e-03, 4.251319915056229e-03, 4.374356009066105e-03, 4.418967757374048e-03, 4.433930851519108e-03, 4.438656847923994e-03, 4.440073855221272e-03, 4.149814136326313e-03, 3.034184454008937e-03, 1.892974833026528e-03, 8.640866726636846e-04, 2.621267340146005e-04, 7.091510633472353e-05, 1.824564242269844e-05, 4.54595419796533e-06, 1.107565367419738e-06, 2.652291186677758e-07, 3.240197838749693e-04, 2.087092027068138e-03, 3.275977913290262e-03, 3.944502212107182e-03, 4.251324106007814e-03, 4.37435694038868e-03, 4.418968688696623e-03, 4.433928988873959e-03, 4.438655450940132e-03, 4.440079908818007e-03, 4.149815998971462e-03, 3.034185385331511e-03, 1.892975182272494e-03, 8.640870219096541e-04, 2.621268213260919e-04, 7.091512816259559e-05, 1.824564787966692e-05, 4.545955562207382e-06, 1.107564912672387e-06, 2.652291186677758e-07, 3.240121877752244e-04, 2.086082473397255e-03, 3.275980474427342e-03, 3.944501746445894e-03, 4.251320846378803e-03, 4.374354612082243e-03, 4.418967291712761e-03, 4.433933645486832e-03, 4.438662435859442e-03, 4.440086893737316e-03, 4.149818327277899e-03, 3.03418654948473e-03, 1.892975764349103e-03, 8.640873129479587e-04, 2.621269086375833e-04, 7.091514999046922e-05, 1.824565333663486e-05, 4.545956471702084e-06, 1.107564912672387e-06, 2.652291186677758e-07, 3.240103833377504e-04, 2.085328334942446e-03, 3.275912255048752e-03, 3.944504540413618e-03, 4.251478239893913e-03, 4.374353215098381e-03, 4.418969620019197e-03, 4.433930851519108e-03, 4.438659641891718e-03, 4.440083168447018e-03, 4.149817395955324e-03, 3.034185850992799e-03, 1.892975531518459e-03, 8.64087138324976e-04, 2.621268504299223e-04, 7.09151427145116e-05, 1.824565151764546e-05, 4.545955562207382e-06, 1.107565822167089e-06, 2.652291186677758e-07]
-fan4.m_flow=[0e+00, 3.501605708152056e-03, 4.242090508341789e-03, 4.398665856570005e-03, 4.431773908436298e-03, 4.438775591552258e-03, 4.440256860107183e-03, 4.440570715814829e-03, 4.440637305378914e-03, 4.44065174087882e-03, 4.440654534846544e-03, 2.397751668468118e-03, 6.946114008314908e-04, 9.096450230572373e-05, 6.906902399350622e-06, 4.597268343786709e-07, 2.87177499558311e-08, 1.792614057194433e-09, 9.777068044058979e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.042543608695269e-03, 3.62505903467536e-03, 4.20296797528863e-03, 4.376600496470928e-03, 4.424193408340216e-03, 4.436556715518236e-03, 4.439655691385269e-03, 4.440415650606155e-03, 4.440598655492067e-03, 4.4406414963305e-03, 2.397749107331038e-03, 6.946109933778644e-04, 9.096309804590419e-05, 6.906885573698606e-06, 4.581779649015516e-07, 2.86436261376366e-08, 1.758508005877957e-09, 9.731593308970332e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.042540814727534e-03, 3.625059733167291e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.424192477017641e-03, 4.436556249856949e-03, 4.439655225723982e-03, 4.440415184944868e-03, 4.440598655492067e-03, 4.440641961991787e-03, 2.397749340161681e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906884664203972e-06, 4.581770554068498e-07, 2.864408088498691e-08, 1.758508005878018e-09, 9.731593308970332e-11, 5.002220859751105e-12, 4.547473508864641e-13, 2.042529406026006e-03, 3.625063691288233e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.42419433966279e-03, 4.436557646840811e-03, 4.439658019691706e-03, 4.440417047590017e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397749572992325e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906886028446024e-06, 4.581775101542007e-07, 2.86436261376366e-08, 1.757598511176184e-09, 9.640643838793039e-11, 5.002220859751105e-12, 4.547473508864641e-13, 2.042529173195382e-03, 3.625062759965648e-03, 4.202965646982193e-03, 4.376600962132215e-03, 4.424190614372492e-03, 4.436555318534374e-03, 4.439657554030418e-03, 4.44041658192873e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397749572992325e-03, 6.946110515855253e-04, 9.09631053218618e-05, 6.906885573698673e-06, 4.581775101542007e-07, 2.86436261376366e-08, 1.757598511176184e-09, 9.731593308970332e-11, 5.911715561524034e-12, 0e+00]
-fan1.dp=[0e+00, -1.7029619140625e+04, -2.499365234375e+04, -2.6872728515625e+04, -2.7278783203125e+04, -2.7365044921875e+04, -2.738330859375e+04, -2.738718359375e+04, -2.7388005859375e+04, -2.73881796875e+04, -2.7388216796875e+04, -7.98509130859375e+03, -1.274897583007812e+03, -1.618067779541016e+02, -1.227907276153558e+01, -8.134369254112244e-01, -5.04227913916111e-02, -2.984987571835503e-03, -1.70716259162873e-04, -9.519848390482366e-06, -5.200854502618313e-07, -5.79449072265625e+03, -1.825158203125e+04, -2.4534767578125e+04, -2.6603796875e+04, -2.7185541015625e+04, -2.733769140625e+04, -2.737589453125e+04, -2.738526953125e+04, -2.7387525390625e+04, -2.738805078125e+04, -7.9850751953125e+03, -1.274897338867188e+03, -1.618069305419922e+02, -1.227913665771472e+01, -8.134126663208008e-01, -5.041937157511711e-02, -2.984585706144571e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.794474609374945e+03, -1.82515859375e+04, -2.45347421875e+04, -2.66038046875e+04, -2.7185529296875e+04, -2.73376875e+04, -2.7375888671875e+04, -2.7385263671875e+04, -2.73875234375e+04, -2.7388060546875e+04, -7.985076171875e+03, -1.274897338867188e+03, -1.618069458007812e+02, -1.227913665771484e+01, -8.134127259254456e-01, -5.041937157511608e-02, -2.98458570614468e-03, -1.706803450360894e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.79441015625e+03, -1.825162890625e+04, -2.453474609375e+04, -2.660380859375e+04, -2.718555078125e+04, -2.7337705078125e+04, -2.737592578125e+04, -2.7385283203125e+04, -2.7387533203125e+04, -2.738806640625e+04, -7.9850771484375e+03, -1.2748974609375e+03, -1.618069610595703e+02, -1.227913761138916e+01, -8.134127855300903e-01, -5.041937530040741e-02, -2.984585938975215e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.794408691406376e+03, -1.82516171874999e+04, -2.453474609375e+04, -2.6603802734375e+04, -2.71855078125e+04, -2.7337673828125e+04, -2.7375916015625e+04, -2.738528125e+04, -2.738753125e+04, -2.7388064453125e+04, -7.9850771484375e+03, -1.2748974609375e+03, -1.618069458007812e+02, -1.227913761138916e+01, -8.134127259254456e-01, -5.041937530040741e-02, -2.984585706144571e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07]
-fan2.dp=[0e+00, -1.2371650390625e+03, -9.8277197265625e+03, -1.947739453125e+04, -2.4553474609375e+04, -2.6491970703125e+04, -2.7124982421875e+04, -2.731454296875e+04, -2.73683046875e+04, -2.7382982421875e+04, -2.7386875e+04, -2.355655859375e+04, -1.054250390625e+04, -2.428723876953125e+03, -5.12512329101561e+02, -1.404928131103516e+02, -3.881343460083008e+01, -1.02157640457153e+01, -2.587506532669067e+00, -6.379718780517578e-01, -1.542248576879501e-01, -2.771304626464844e+02, -3.78216455078125e+03, -1.27518720703125e+04, -2.0560880859375e+04, -2.47364765625e+04, -2.6469544921875e+04, -2.7092931640625e+04, -2.72981796875e+04, -2.736183203125e+04, -2.7380630859375e+04, -2.3554912109375e+04, -1.054219921875e+04, -2.428685546875e+03, -5.125114746093722e+02, -1.404955749511719e+02, -3.881435012817383e+01, -1.021584224700928e+01, -2.587444305419922e+00, -6.379900574684143e-01, -1.541806310415268e-01, -2.771347045898401e+02, -3.782167724609375e+03, -1.27518798828125e+04, -2.05608515625e+04, -2.47365078125e+04, -2.6469548828125e+04, -2.709293359375e+04, -2.7298154296875e+04, -2.73618125e+04, -2.738070703125e+04, -2.35549375e+04, -1.0542205078125e+04, -2.4286865234375e+03, -5.125115356445312e+02, -1.4049560546875e+02, -3.881435394287067e+01, -1.021584415435806e+01, -2.587444543838501e+00, -6.379901170730591e-01, -1.541807055473328e-01, -2.7715087890625e+02, -3.7821796875e+03, -1.27518955078125e+04, -2.0560853515625e+04, -2.47364609375e+04, -2.64695390625e+04, -2.709296875e+04, -2.7298240234375e+04, -2.7361912109375e+04, -2.7380802734375e+04, -2.355496875e+04, -1.05422109375e+04, -2.4286875e+03, -5.125116577148438e+02, -1.404956207275391e+02, -3.881435775756836e+01, -1.021584510803223e+01, -2.58744478225708e+00, -6.379901766777039e-01, -1.541806608438492e-01, -2.771508483886837e+02, -3.78219433593744e+03, -1.27519013671875e+04, -2.0560876953125e+04, -2.473656640625e+04, -2.64695625e+04, -2.7092953125e+04, -2.7298224609375e+04, -2.736187109375e+04, -2.738075e+04, -2.3554953125e+04, -1.05422080078125e+04, -2.42868701171875e+03, -5.125115966796875e+02, -1.4049560546875e+02, -3.881435775756836e+01, -1.021584415435791e+01, -2.587444543838501e+00, -6.379901170730591e-01, -1.54180645942688e-01]
-fan3.dp=[0e+00, -3.081052001953125e+03, -1.3182890625e+04, -2.1251384765625e+04, -2.5165314453125e+04, -2.666672265625e+04, -2.717064453125e+04, -2.7325939453125e+04, -2.737107421875e+04, -2.7383642578125e+04, -2.738703125e+04, -2.3918869140625e+04, -1.2785947265625e+04, -4.97652294921875e+03, -1.616463745117183e+03, -4.679663696289062e+02, -1.260984344482422e+02, -3.243524932861319e+01, -8.081191062927246e+00, -1.968765258789062e+00, -4.716252088546753e-01, -5.801093139648438e+02, -6.04066259765625e+03, -1.4906681640625e+04, -2.1610474609375e+04, -2.5102759765625e+04, -2.6576609375e+04, -2.7121388671875e+04, -2.7305349609375e+04, -2.73635859375e+04, -2.738107421875e+04, -2.3917166015625e+04, -1.27854853515625e+04, -4.97639990234375e+03, -1.616437011718742e+03, -4.679638977050781e+02, -1.260972290039062e+02, -3.243424987792969e+01, -8.080669403076172e+00, -1.968744993209839e+00, -4.714556634426117e-01, -5.801091918945234e+02, -6.04065478515625e+03, -1.49067294921875e+04, -2.161048828125e+04, -2.5102802734375e+04, -2.6576619140625e+04, -2.7121396484375e+04, -2.7305333984375e+04, -2.73635703125e+04, -2.7381130859375e+04, -2.391719140625e+04, -1.27854931640625e+04, -4.97640234375e+03, -1.616437622070312e+03, -4.679640502929688e+02, -1.26097274780272e+02, -3.243426132202197e+01, -8.080671310424805e+00, -1.968745589256287e+00, -4.714558720588684e-01, -5.800953979492188e+02, -6.04060498046875e+03, -1.49067158203125e+04, -2.1610486328125e+04, -2.51027578125e+04, -2.6576595703125e+04, -2.7121384765625e+04, -2.7305384765625e+04, -2.73636484375e+04, -2.73812109375e+04, -2.391721875e+04, -1.2785501953125e+04, -4.97640478515625e+03, -1.616438354492188e+03, -4.679642333984375e+02, -1.260973205566406e+02, -3.243427276611328e+01, -8.080674171447754e+00, -1.968746066093445e+00, -4.714559018611908e-01, -5.800921630859641e+02, -6.040574707031175e+03, -1.49067197265625e+04, -2.16104921875e+04, -2.510285546875e+04, -2.6576658203125e+04, -2.7121390625e+04, -2.730537890625e+04, -2.7363615234375e+04, -2.7381166015625e+04, -2.3917203125e+04, -1.2785498046875e+04, -4.97640380859375e+03, -1.61643798828125e+03, -4.679641418457031e+02, -1.26097297668457e+02, -3.243426513671875e+01, -8.080673217773438e+00, -1.968745827674866e+00, -4.71455842256546e-01]
-fan4.dp=[0e+00, -1.7029619140625e+04, -2.499365234375e+04, -2.6872728515625e+04, -2.7278783203125e+04, -2.7365044921875e+04, -2.738330859375e+04, -2.738718359375e+04, -2.7388005859375e+04, -2.73881796875e+04, -2.7388216796875e+04, -7.98509130859375e+03, -1.274897583007812e+03, -1.618067779541016e+02, -1.227907276153558e+01, -8.134369254112244e-01, -5.04227913916111e-02, -2.984987571835503e-03, -1.70716259162873e-04, -9.519848390482366e-06, -5.200854502618313e-07, -5.79449072265625e+03, -1.825158203125e+04, -2.4534767578125e+04, -2.6603796875e+04, -2.7185541015625e+04, -2.733769140625e+04, -2.737589453125e+04, -2.738526953125e+04, -2.7387525390625e+04, -2.738805078125e+04, -7.9850751953125e+03, -1.274897338867188e+03, -1.618069305419922e+02, -1.227913665771472e+01, -8.134126663208008e-01, -5.041937157511711e-02, -2.984585706144571e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.794474609374945e+03, -1.82515859375e+04, -2.4534744140625e+04, -2.66038046875e+04, -2.7185529296875e+04, -2.73376875e+04, -2.7375888671875e+04, -2.7385263671875e+04, -2.73875234375e+04, -2.7388060546875e+04, -7.985076171875e+03, -1.274897338867188e+03, -1.618069458007812e+02, -1.227913665771484e+01, -8.134127259254456e-01, -5.041937157511608e-02, -2.98458570614468e-03, -1.706803450360894e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.79441015625e+03, -1.825162890625e+04, -2.453474609375e+04, -2.660380859375e+04, -2.718555078125e+04, -2.7337705078125e+04, -2.737592578125e+04, -2.7385283203125e+04, -2.7387533203125e+04, -2.738806640625e+04, -7.9850771484375e+03, -1.2748974609375e+03, -1.618069610595703e+02, -1.227913761138916e+01, -8.134127855300903e-01, -5.041937530040741e-02, -2.984585938975215e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07, -5.794408691406376e+03, -1.82516171874999e+04, -2.453474609375e+04, -2.6603802734375e+04, -2.71855078125e+04, -2.7337673828125e+04, -2.7375916015625e+04, -2.738528125e+04, -2.738753125e+04, -2.7388064453125e+04, -7.9850771484375e+03, -1.2748974609375e+03, -1.618069458007812e+02, -1.227913761138916e+01, -8.134127259254456e-01, -5.041937530040741e-02, -2.984585706144571e-03, -1.706803595880046e-04, -9.518960723653436e-06, -5.195761332288384e-07]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt
deleted file mode 100644
index 5243535411..0000000000
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Obsolete_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-last-generated=2022-08-12
-statistics-initialization=
-{
- "nonlinear": "1, 0, 1, 0",
- "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
- "linear": " ",
- "nonlinear": "1, 0, 1",
- "number of continuous time states": "3",
- "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floMacSta.dpMachine=[4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.794398617743659e+02, 4.60098378735429e+02, 4.411532615168607e+02, 4.226047515662231e+02, 4.044529938614071e+02, 3.866980632772671e+02, 3.693401366808059e+02, 3.523794165633871e+02, 3.358159238354154e+02, 3.196498318150345e+02, 3.03881339468104e+02, 2.885104442652517e+02, 2.735373770073344e+02, 2.589621987299449e+02, 2.447850577938055e+02, 2.31006037638156e+02, 2.17625242166598e+02, 2.046428466961402e+02, 1.92058850206186e+02, 1.798734141037055e+02, 1.68086649106894e+02, 1.566985918106157e+02, 1.457093695701548e+02, 1.351190895372946e+02, 1.249277725219727e+02, 1.151355423425644e+02, 1.057424675876581e+02, 9.674862455141749e+01, 8.815413186832403e+01, 7.995896343619431e+01, 7.21632250871787e+01, 6.47669855429761e+01, 5.777030580097554e+01, 5.117323161869565e+01, 4.497585973124306e+01, 3.918022580065193e+01, 3.379532490656646e+01, 2.882868923497502e+01, 2.428444630137457e+01, 2.016343911214301e+01, 1.646309634831643e+01, 1.317693850012823e+01, 1.029396252050215e+01, 7.797536307782446e+00, 5.664503184096723e+00, 3.865953326378335e+00, 2.373942729492089e+00, 1.189011777832478e+00, 3.556552820124339e-01, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-floMacDyn.dpMachine=[3.819660034179688e+02, 4.766992499358793e+02, 4.943363955481709e+02, 4.981237183545724e+02, 4.989477539332347e+02, 4.991255798274815e+02, 4.991662292500728e+02, 4.991748657225244e+02, 4.991771240235466e+02, 4.991775512693675e+02, 4.991780700682912e+02, 4.991782226562409e+02, 4.99177947997965e+02, 4.99177673339771e+02, 4.991776733398347e+02, 4.991777648924872e+02, 4.991777954101562e+02, 4.991777648926054e+02, 4.99177703857531e+02, 4.991776733398438e+02, 4.991776428222656e+02, 4.991776123046875e+02, 4.991776123047057e+02, 4.991776123047512e+02, 4.991776428222656e+02, 4.991776733398438e+02, 4.819452031532197e+02, 4.630534261794696e+02, 4.441022666518538e+02, 4.254541472229342e+02, 4.071856905353997e+02, 3.893125042234302e+02, 3.718374815688907e+02, 3.54762564905012e+02, 3.380877439432832e+02, 3.21812887171019e+02, 3.059381023140285e+02, 2.904635082790626e+02, 2.753893972236399e+02, 2.607158912185096e+02, 2.464431389047906e+02, 2.325712078935821e+02, 2.191001260834498e+02, 2.060300537893813e+02, 1.933609589508802e+02, 1.810929574643305e+02, 1.69226358645252e+02, 1.577611680955661e+02, 1.466975897070733e+02, 1.360358071337484e+02, 1.257754516601562e+02, 1.159164260692366e+02, 1.064593177506969e+02, 9.740517955879956e+01, 8.875274191509273e+01, 8.050211535650894e+01, 7.265348999210792e+01, 6.520702609656742e+01, 5.816281137017207e+01, 5.152093353176446e+01, 4.528155059352893e+01, 3.945436141349783e+01, 3.410650117095461e+01, 2.925580188373673e+01, 2.486386852004861e+01, 2.089062944515968e+01, 1.730616517009572e+01, 1.408298434764626e+01, 1.119890600817512e+01, 8.629098322079875e+00, 6.353054878150746e+00, 4.361795801581371e+00, 2.662918775992468e+00, 1.305368440178004e+00, 3.715901946611515e-01, -2.317575854249299e-05, 1.625591761384986e-07, -5.398772484419601e-09, -1.062289187180899e-09, -8.731153820694205e-10, -6.839402759373578e-10, -5.093170676877553e-10, -3.201420309424247e-10, -1.45518787997906e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floMacSta.VMachine_flow=[8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.179551799330834e-01, 8.012098253604085e-01, 7.844675203252821e-01, 7.677283147381856e-01, 7.509921988664439e-01, 7.342589537458853e-01, 7.175286292588894e-01, 7.008012156472726e-01, 6.840764939988395e-01, 6.673544545648926e-01, 6.506350875641913e-01, 6.339182933405832e-01, 6.172039429126689e-01, 6.004920362800221e-01, 5.837825636319149e-01, 5.670753657677331e-01, 5.503703732797423e-01, 5.336675763383496e-01, 5.169668753863813e-01, 5.00268200996563e-01, 4.835715433205083e-01, 4.668767432339683e-01, 4.501837908951999e-01, 4.334926764397228e-01, 4.168032109737396e-01, 4.001154144414578e-01, 3.834291676330666e-01, 3.667444407458171e-01, 3.500612736084016e-01, 3.33379377938475e-01, 3.166987935734454e-01, 3.00019460908206e-01, 2.833413203380766e-01, 2.666642824562558e-01, 2.499884168513041e-01, 2.333011270105493e-01, 2.165425797956496e-01, 1.996426948237181e-01, 1.825317195393328e-01, 1.651394245822069e-01, 1.47396194194614e-01, 1.292373546042894e-01, 1.106163174348533e-01, 9.153306023404656e-02, 7.209600415124648e-02, 5.264118295486991e-02, 3.392443780500445e-02, 1.744533575602981e-02, 5.264308190498649e-03, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-floMacDyn.VMachine_flow=[1.030056595802307e+00, 8.721678841896618e-01, 8.42772662165464e-01, 8.364604709985033e-01, 8.350870608833674e-01, 8.347907066453573e-01, 8.347229361500546e-01, 8.347085118296071e-01, 8.347047567365955e-01, 8.34704101085876e-01, 8.347032666207248e-01, 8.347029685974299e-01, 8.347034454347302e-01, 8.347038626672258e-01, 8.347039222717285e-01, 8.347037434579718e-01, 8.347036838531494e-01, 8.347037434577409e-01, 8.34703803062439e-01, 8.347038626671548e-01, 8.347039222717285e-01, 8.347039818763733e-01, 8.347039818763378e-01, 8.347039818763733e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.136944596565525e-01, 7.960795347717832e-01, 7.792388816753005e-01, 7.625664333706792e-01, 7.459317643988921e-01, 7.293075362732457e-01, 7.126890302062875e-01, 6.960729578457985e-01, 6.794591605470209e-01, 6.628483434863087e-01, 6.462406157589643e-01, 6.296355803508913e-01, 6.130330483431568e-01, 5.964329601306898e-01, 5.798351863604067e-01, 5.632395684979322e-01, 5.466463944304053e-01, 5.300555347848119e-01, 5.134671290906079e-01, 4.968811373891713e-01, 4.802971024612471e-01, 4.637149552606244e-01, 4.471343577842296e-01, 4.305551508223537e-01, 4.139783382415771e-01, 3.974047145164949e-01, 3.808326405081978e-01, 3.64258271725198e-01, 3.476866541221091e-01, 3.3111708351209e-01, 3.145493904512701e-01, 2.979831577073159e-01, 2.814182064654735e-01, 2.64854298307295e-01, 2.482911147216521e-01, 2.316704333640658e-01, 2.145492815619662e-01, 1.966789873632548e-01, 1.781460521916592e-01, 1.590855405758219e-01, 1.395988830026544e-01, 1.198117468876128e-01, 9.985970642921581e-02, 8.000471719956283e-02, 6.064589678943654e-02, 4.23407371539888e-02, 2.592865146005137e-02, 1.250635008308209e-02, 3.372658913925401e-03, 1.545050909044221e-04, -1.083776081714321e-06, 3.596003283436759e-08, 7.040317728998752e-09, 5.823099285461279e-09, 4.606124933296064e-09, 3.388560389995756e-09, 2.171607801563245e-09, 9.54233552637677e-10, 4.654012055599654e-11, 4.427231439097093e-11, 4.307033202310961e-11, 4.133592514019411e-11, 3.923276939677873e-11, 3.778093614052413e-11, 3.578643442666455e-11, 3.44232142790446e-11, 3.280731137566852e-11, 3.138845483459439e-11, 2.916008325547038e-11, 2.718313176416255e-11, 2.5699724654422e-11, 2.417070321639934e-11, 2.228625286307288e-11, 2.075788413213941e-11, 1.928186776911645e-11]
From 8cf7668f6eaf1bc0688d1804721b4c0828bef771 Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Fri, 30 Aug 2024 13:18:03 -0700
Subject: [PATCH 19/47] Removed wrong parameter keyword
This is for #1930
---
.../Transmission/BaseClasses/BaseCable.mo | 30 +++++++++++++++++--
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/IBPSA/Electrical/Transmission/BaseClasses/BaseCable.mo b/IBPSA/Electrical/Transmission/BaseClasses/BaseCable.mo
index 97885e5459..0ad06526d3 100644
--- a/IBPSA/Electrical/Transmission/BaseClasses/BaseCable.mo
+++ b/IBPSA/Electrical/Transmission/BaseClasses/BaseCable.mo
@@ -17,10 +17,16 @@ record BaseCable "Record that contains the properties of a generic cable"
"Frequency considered in the definition of cables properties";
output Modelica.Units.SI.Resistance R "Resistance of the cable";
protected
- parameter Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
+ Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
annotation (Documentation(revisions="
-
+August 30, 2024, by Michael Wetter:
+Removed wrong parameter keyword on protected variable, which is needed for Dymola 2025x.
+This is for
+IBPSA, #1930.
+
+-
September 23, 2014, by Marco Bonvini:
Added function and documentation
@@ -36,10 +42,16 @@ Added function and documentation
"Frequency considered in the definition of cables properties";
output Modelica.Units.SI.Inductance L "Inductance of the cable";
protected
- parameter Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
+ Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
annotation (Documentation(revisions="
-
+August 30, 2024, by Michael Wetter:
+Removed wrong parameter keyword on protected variable, which is needed for Dymola 2025x.
+This is for
+IBPSA, #1930.
+
+-
September 23, 2014, by Marco Bonvini:
Added function and documentation
@@ -55,10 +67,16 @@ Added function and documentation
"Frequency considered in the definition of cables properties";
output Modelica.Units.SI.Capacitance C "Capacitance of the cable";
protected
- parameter Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
+ Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
annotation (Documentation(revisions="
-
+August 30, 2024, by Michael Wetter:
+Removed wrong parameter keyword on protected variable, which is needed for Dymola 2025x.
+This is for
+IBPSA, #1930.
+
+-
September 23, 2014, by Marco Bonvini:
Added function and documentation
@@ -69,6 +87,12 @@ Added function and documentation
annotation (Documentation(revisions="
-
+August 30, 2024, by Michael Wetter:
+Removed wrong parameter keyword on protected variable, which is needed for Dymola 2025x.
+This is for
+IBPSA, #1930.
+
+-
September 24, 2014, by Marco Bonvini:
Revised structure of the record, now the temperature constant M
is directly specified in the record.
From 5dda0b7850bf8ee0c678489abb3326db8f17221e Mon Sep 17 00:00:00 2001
From: hcasperfu
Date: Tue, 3 Sep 2024 13:47:16 -0700
Subject: [PATCH 20/47] merged from Buildings
---
IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo | 10 ++++++----
.../Preconfigured/PumpCharacteristic.png | Bin 0 -> 110969 bytes
.../Preconfigured/PumpCharacteristic.svg | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
create mode 100644 IBPSA/Resources/Images/Fluid/Movers/Preconfigured/PumpCharacteristic.png
create mode 100644 IBPSA/Resources/Images/Fluid/Movers/Preconfigured/PumpCharacteristic.svg
diff --git a/IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo b/IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo
index d08eb8a9e6..0376c9352e 100644
--- a/IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo
+++ b/IBPSA/Fluid/Movers/Preconfigured/UsersGuide.mo
@@ -23,9 +23,14 @@ IBPSA.Fluid.Movers.Data.Pumps
for pumps and
IBPSA.Fluid.Movers.Data.Fans
-for fans. See link in References for more details.
+for fans. It goes through the design operating point and spans over
+0 and twice the design flow rate at maximum speed. See figure below.
The model identifies itself as a fan or pump based on the default density of
the medium.
+
+
+
-
The hydraulic efficiency is computed based on the Euler number.
@@ -40,9 +45,6 @@ IBPSA.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve
for details.
-References
-
-https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HydronicConfigurations_UsersGuide.html#Buildings.Fluid.HydronicConfigurations.UsersGuide.ModelParameters
"));
end UsersGuide;
diff --git a/IBPSA/Resources/Images/Fluid/Movers/Preconfigured/PumpCharacteristic.png b/IBPSA/Resources/Images/Fluid/Movers/Preconfigured/PumpCharacteristic.png
new file mode 100644
index 0000000000000000000000000000000000000000..987719920a880c6b594dbfbfa9ee193d421ab44d
GIT binary patch
literal 110969
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 5>wbUtZMdF=7%CxV
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