diff --git a/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
index d42f1d63f0d..f7bb6034dcb 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
@@ -123,7 +123,7 @@ for a description of the filter.
August 26, 2024, by Michael Wetter:
Implemented linear actuator travel dynamics.
This is for Buildings, #3965 and
-for IBPSA, #1926.
+for IBPSA, #1926.
June 10, 2021, by Michael Wetter:
@@ -164,7 +164,7 @@ This is for
March 24, 2017, by Michael Wetter:
-Renamed filteredInput to use_strokeTime.
+Renamed filteredInput to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
index 6c5e75fc4a0..1e631b6a70e 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -156,7 +156,7 @@ This is for
November 16, 2022, by Michael Wetter:
-Propagated parameter strokeTime to valves. The value is not used as the filter is disabled,
+Propagated parameter riseTime to valves. The value is not used as the filter is disabled,
but it will show in the result file. Having a consistent value for all these parameters in the result filter
helps during debugging.
@@ -181,7 +181,7 @@ Improved icon graphics annotation. This is for
March 24, 2017, by Michael Wetter:
-Renamed filteredInput to use_strokeTime.
+Renamed filteredInput to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo b/Buildings/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
index 4db419c8e6e..0242093dc67 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
@@ -124,7 +124,7 @@ Improved icon graphics annotation. This is for
March 24, 2017, by Michael Wetter:
-Renamed filteredInput to use_strokeTime.
+Renamed filteredInput to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo b/Buildings/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo
index 9b9795c6199..1a601361e53 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo
@@ -63,7 +63,7 @@ Removed icon graphics annotation. This is for
March 24, 2017, by Michael Wetter:
-Renamed filteredInput to use_strokeTime.
+Renamed filteredInput to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Actuators/Dampers/MixingBox.mo b/Buildings/Fluid/Actuators/Dampers/MixingBox.mo
index 9d5e8b419e5..cfdb10825d4 100644
--- a/Buildings/Fluid/Actuators/Dampers/MixingBox.mo
+++ b/Buildings/Fluid/Actuators/Dampers/MixingBox.mo
@@ -325,7 +325,7 @@ See #1050.
March 24, 2017, by Michael Wetter:
-Renamed filteredInput to use_strokeTime.
+Renamed filteredInput to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Actuators/Motors/IdealMotor.mo b/Buildings/Fluid/Actuators/Motors/IdealMotor.mo
index 4ff1c93b1d8..2ac64b6e70c 100644
--- a/Buildings/Fluid/Actuators/Motors/IdealMotor.mo
+++ b/Buildings/Fluid/Actuators/Motors/IdealMotor.mo
@@ -94,7 +94,7 @@ Buildings.Fluid.Actuators.UsersGuide.
-
March 24, 2017, by Michael Wetter:
-Renamed filteredInput to use_strokeTime.
+Renamed filteredInput to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo b/Buildings/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
index 1e76c9eb74a..661cd2369ea 100644
--- a/Buildings/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
+++ b/Buildings/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
@@ -263,7 +263,7 @@ See #156.
-
March 24, 2017, by Michael Wetter:
-Renamed filteredInput to use_strokeTime.
+Renamed filteredInput to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo b/Buildings/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo
index 578d89ada48..364dea25329 100644
--- a/Buildings/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo
+++ b/Buildings/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo
@@ -24,7 +24,7 @@ model ThreeWayValveParameterization
273.15 + 4,
Medium.X_default) "Standard density";
- Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valOPPoi(
+ Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valOpePoi(
redeclare package Medium = Medium,
m_flow_nominal=m_flow_nominal,
CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
@@ -84,17 +84,17 @@ model ThreeWayValveParameterization
offset=0) "Control signal"
annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flowOpPoi(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFloOpPoi(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{20,80},{40,100}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flowKv(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFloKv(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{20,20},{40,40}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flowCv(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFloCv(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flowAv(redeclare package Medium =
+ Buildings.Fluid.Sensors.MassFlowRate senMasFloAv(redeclare package Medium =
Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{20,-94},{40,-74}})));
Buildings.Fluid.Sources.Boundary_pT sou3(
@@ -105,7 +105,7 @@ model ThreeWayValveParameterization
T=293.15) "Boundary condition for flow source"
annotation (Placement(transformation(extent={{-70,-20},{-50,0}})));
equation
- connect(sou1.ports[1], valOPPoi.port_1) annotation (Line(points={{-48,33},{-32,
+ connect(sou1.ports[1], valOpePoi.port_1) annotation (Line(points={{-48,33},{-32,
33},{-32,90},{-10,90}}, color={0,127,255}));
connect(sou1.ports[2], valKv.port_1) annotation (Line(points={{-48,31},{-42,31},
{-42,30},{-10,30}}, color={0,127,255}));
@@ -113,7 +113,7 @@ equation
{-32,-30},{-10,-30}}, color={0,127,255}));
connect(sou1.ports[4], valAv.port_1) annotation (Line(points={{-48,27},{-32,27},
{-32,-84},{-10,-84}}, color={0,127,255}));
- connect(sou3.ports[1], valOPPoi.port_3) annotation (Line(points={{-50,-7},{-20,
+ connect(sou3.ports[1], valOpePoi.port_3) annotation (Line(points={{-50,-7},{-20,
-7},{-20,70},{0,70},{0,80}}, color={0,127,255}));
connect(sou3.ports[2], valKv.port_3) annotation (Line(points={{-50,-9},{-20,-9},
{-20,12},{0,12},{0,20}}, color={0,127,255}));
@@ -121,23 +121,23 @@ equation
{-20,-48},{0,-48},{0,-40}}, color={0,127,255}));
connect(sou3.ports[4], valAv.port_3) annotation (Line(points={{-50,-13},{-20,-13},
{-20,-110},{0,-110},{0,-94}}, color={0,127,255}));
- connect(valOPPoi.port_2, senM_flowOpPoi.port_a)
+ connect(valOpePoi.port_2, senMasFloOpPoi.port_a)
annotation (Line(points={{10,90},{20,90}}, color={0,127,255}));
- connect(valKv.port_2, senM_flowKv.port_a)
+ connect(valKv.port_2, senMasFloKv.port_a)
annotation (Line(points={{10,30},{20,30}}, color={0,127,255}));
- connect(valCv.port_2, senM_flowCv.port_a)
+ connect(valCv.port_2, senMasFloCv.port_a)
annotation (Line(points={{10,-30},{20,-30}}, color={0,127,255}));
- connect(valAv.port_2, senM_flowAv.port_a)
+ connect(valAv.port_2, senMasFloAv.port_a)
annotation (Line(points={{10,-84},{20,-84}}, color={0,127,255}));
- connect(senM_flowOpPoi.port_b, sin.ports[1]) annotation (Line(points={{40,90},
+ connect(senMasFloOpPoi.port_b, sin.ports[1]) annotation (Line(points={{40,90},
{52,90},{52,92},{90,92},{90,3},{100,3}}, color={0,127,255}));
- connect(senM_flowKv.port_b, sin.ports[2]) annotation (Line(points={{40,30},{76,
+ connect(senMasFloKv.port_b, sin.ports[2]) annotation (Line(points={{40,30},{76,
30},{76,1},{100,1}}, color={0,127,255}));
- connect(senM_flowCv.port_b, sin.ports[3]) annotation (Line(points={{40,-30},{90,
+ connect(senMasFloCv.port_b, sin.ports[3]) annotation (Line(points={{40,-30},{90,
-30},{90,-1},{100,-1}}, color={0,127,255}));
- connect(senM_flowAv.port_b, sin.ports[4]) annotation (Line(points={{40,-84},{92,
+ connect(senMasFloAv.port_b, sin.ports[4]) annotation (Line(points={{40,-84},{92,
-84},{92,-3},{100,-3}}, color={0,127,255}));
- connect(y.y, valOPPoi.y) annotation (Line(points={{-59,110},{0,110},{0,102}},
+ connect(y.y, valOpePoi.y) annotation (Line(points={{-59,110},{0,110},{0,102}},
color={0,0,127}));
connect(y.y, valKv.y) annotation (Line(points={{-59,110},{-40,110},{-40,52},{0,
52},{0,42}},
diff --git a/Buildings/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo b/Buildings/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo
index bf1db30e7e6..f487c088e82 100644
--- a/Buildings/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo
+++ b/Buildings/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo
@@ -26,7 +26,7 @@ model TwoWayValveParameterization
273.15 + 4,
Medium.X_default) "Standard density";
- Buildings.Fluid.Actuators.Valves.TwoWayLinear valOPPoi(
+ Buildings.Fluid.Actuators.Valves.TwoWayLinear valOpePoi(
redeclare package Medium = Medium,
m_flow_nominal=m_flow_nominal,
CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
@@ -66,13 +66,13 @@ model TwoWayValveParameterization
T=293.15) "Boundary condition for flow sink" annotation (Placement(
transformation(extent={{90,-10},{70,10}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flowOpPoi(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFloOpPoi(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{20,30},{40,50}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flowKv(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFloKv(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{20,-10},{40,10}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flowCv(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFloCv(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
Valves.TwoWayLinear valAv(
@@ -82,11 +82,11 @@ model TwoWayValveParameterization
CvData=Buildings.Fluid.Types.CvTypes.Av,
Av=Av) "Valve model, linear opening characteristics"
annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flowAv(redeclare package Medium =
+ Buildings.Fluid.Sensors.MassFlowRate senMasFloAv(redeclare package Medium =
Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{20,-90},{40,-70}})));
equation
- connect(y.y, valOPPoi.y)
+ connect(y.y, valOpePoi.y)
annotation (Line(
points={{-39,70},{-20,70},{6.66134e-16,70},{6.66134e-16,52}},
color={0,0,127}));
@@ -102,33 +102,33 @@ equation
connect(y.y, valCv.y) annotation (Line(
points={{-39,70},{-20,70},{-20,-20},{6.66134e-16,-20},{6.66134e-16,-28}},
color={0,0,127}));
- connect(sou.ports[1], valOPPoi.port_a) annotation (Line(
+ connect(sou.ports[1], valOpePoi.port_a) annotation (Line(
points={{-50,-1.5},{-40,-1.5},{-40,40},{-10,40}},
color={0,127,255}));
- connect(valOPPoi.port_b, senM_flowOpPoi.port_a) annotation (Line(
+ connect(valOpePoi.port_b, senMasFloOpPoi.port_a) annotation (Line(
points={{10,40},{20,40}},
color={0,127,255}));
- connect(valKv.port_b, senM_flowKv.port_a) annotation (Line(
+ connect(valKv.port_b, senMasFloKv.port_a) annotation (Line(
points={{10,6.10623e-16},{12.5,6.10623e-16},{12.5,1.22125e-15},{15,
1.22125e-15},{15,6.10623e-16},{20,6.10623e-16}},
color={0,127,255}));
- connect(valCv.port_b, senM_flowCv.port_a) annotation (Line(
+ connect(valCv.port_b, senMasFloCv.port_a) annotation (Line(
points={{10,-40},{20,-40}},
color={0,127,255}));
- connect(senM_flowCv.port_b, sin.ports[3]) annotation (Line(
+ connect(senMasFloCv.port_b, sin.ports[3]) annotation (Line(
points={{40,-40},{56,-40},{56,0.5},{70,0.5}},
color={0,127,255}));
- connect(senM_flowKv.port_b, sin.ports[2]) annotation (Line(
+ connect(senMasFloKv.port_b, sin.ports[2]) annotation (Line(
points={{40,0},{50,0},{50,-0.5},{70,-0.5}},
color={0,127,255}));
- connect(senM_flowOpPoi.port_b, sin.ports[1]) annotation (Line(
+ connect(senMasFloOpPoi.port_b, sin.ports[1]) annotation (Line(
points={{40,40},{60,40},{60,2},{66,2},{66,-1.5},{70,-1.5}},
color={0,127,255}));
connect(sou.ports[4], valAv.port_a) annotation (Line(points={{-50,1.5},{-40,1.5},
{-40,-80},{-10,-80}}, color={0,127,255}));
- connect(valAv.port_b, senM_flowAv.port_a)
+ connect(valAv.port_b, senMasFloAv.port_a)
annotation (Line(points={{10,-80},{20,-80}}, color={0,127,255}));
- connect(senM_flowAv.port_b, sin.ports[4]) annotation (Line(points={{40,-80},{60,
+ connect(senMasFloAv.port_b, sin.ports[4]) annotation (Line(points={{40,-80},{60,
-80},{60,1.5},{70,1.5}}, color={0,127,255}));
connect(valAv.y, y.y) annotation (Line(points={{0,-68},{0,-60},{-20,-60},{-20,
70},{-39,70}}, color={0,0,127}));
diff --git a/Buildings/Fluid/Actuators/package.mo b/Buildings/Fluid/Actuators/package.mo
index 36b01b37a27..0c1fd8393b4 100644
--- a/Buildings/Fluid/Actuators/package.mo
+++ b/Buildings/Fluid/Actuators/package.mo
@@ -102,12 +102,12 @@ or damper position is equal to the input signal y.
If use_strokeTime=true, then the actual valve or damper position
changes linear in time until it reaches the control input.
The parameter strokeTime, which by default is set to
-120 seconds, determines how fast the speed changes.
+120 seconds, determines how fast the position changes.
For example, if strokeTime=120 seconds and the current actuator position is 0, then
a step change in the actuator input signal from 0 to 1 will
cause the actuator position to change linearly from 0 to 1 within
-30 seconds. Similarly, if the actuator position is then reduced by changing
-the input signal from 1 to 0.5, it will take 15 seconds
+120 seconds. Similarly, if the actuator position is then reduced by changing
+the input signal from 1 to 0.5, it will take 60 seconds
to achieve the new set point.
diff --git a/Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
index 4357dcfd42c..3f7f141ed51 100644
--- a/Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
+++ b/Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
@@ -61,8 +61,7 @@ partial model PartialFlowMachine
enable=use_riseTime));
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="Motor speed",
- enable=use_riseTime));
+ annotation(Dialog(tab="Dynamics", group="Motor speed", enable=use_riseTime));
// Connectors and ports
Modelica.Blocks.Interfaces.IntegerInput stage
@@ -240,7 +239,7 @@ protected
initType=init,
strict=true)
if use_riseTime
- "Dynamics of engine speed"
+ "Dynamics of motor speed"
annotation (Placement(transformation(extent={{20,60},{40,80}})));
Buildings.Fluid.Movers.BaseClasses.IdealSource preSou(
@@ -644,9 +643,8 @@ revisions="
August 26, 2024, by Michael Wetter:
Implemented linear dynamics for change in motor speed.
This is for Buildings, #3965 and
-for IBPSA, #1926.
+for IBPSA, #1926.
-
June 18, 2024, by Michael Wetter:
Added start and nominal attributes
@@ -723,7 +721,7 @@ This is for
March 24, 2017, by Michael Wetter:
-Renamed filteredSpeed to use_riseTime.
+Renamed filteredSpeed to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Movers/Examples/MoverParameter.mo b/Buildings/Fluid/Movers/Examples/MoverParameter.mo
index 1745315f0c5..ff0ac899312 100644
--- a/Buildings/Fluid/Movers/Examples/MoverParameter.mo
+++ b/Buildings/Fluid/Movers/Examples/MoverParameter.mo
@@ -28,8 +28,9 @@ model MoverParameter
annotation (Placement(transformation(extent={{80,-10},{60,10}})));
Buildings.Fluid.Movers.SpeedControlled_y pump_y(
redeclare package Medium = Medium,
- redeclare Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per(speeds=
- {0,0.5,1}, constantSpeed=1),
+ redeclare Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per(
+ speeds={0,0.5,1},
+ constantSpeed=1),
use_riseTime=false,
inputType=Buildings.Fluid.Types.InputType.Constant,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
diff --git a/Buildings/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo b/Buildings/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo
index 6d66174d7e1..2bef7f7aa98 100644
--- a/Buildings/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo
+++ b/Buildings/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo
@@ -17,8 +17,9 @@ model SpeedControlled_y_pumpCurves
redeclare package Medium = Medium,
use_riseTime=false,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
- per(pressure(V_flow=2/1000*m_flow_nominal*{0.2,0.4,0.6,0.8}, dp=
- dp_nominal*{0.9,0.85,0.6,0.2})))
+ per(pressure(
+ V_flow=2/1000*m_flow_nominal*{0.2,0.4,0.6,0.8},
+ dp=dp_nominal*{0.9,0.85,0.6,0.2})))
"Declaration of pump model";
pumpModel pum(
diff --git a/Buildings/Fluid/Movers/FlowControlled_dp.mo b/Buildings/Fluid/Movers/FlowControlled_dp.mo
index a40e0dcb145..8e4e1e7422d 100644
--- a/Buildings/Fluid/Movers/FlowControlled_dp.mo
+++ b/Buildings/Fluid/Movers/FlowControlled_dp.mo
@@ -16,20 +16,23 @@ model FlowControlled_dp
y(final unit="Pa", nominal=dp_nominal)),
eff(per(
final pressure=if per.havePressureCurve then per.pressure else
- Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
- V_flow={i/(nOri - 1)*2.0*m_flow_nominal/rho_default for i in 0:(
- nOri - 1)},
+ Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
+ V_flow={i/(nOri - 1)*2.0*m_flow_nominal/rho_default for i in 0:(nOri - 1)},
dp={i/(nOri - 1)*2.0*dp_nominal for i in (nOri - 1):-1:0}),
final etaHydMet=if (per.etaHydMet == Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate
- or per.etaHydMet == Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)
- and not per.havePressureCurve then Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
- else per.etaHydMet,
+ or per.etaHydMet == Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)
+ and not per.havePressureCurve then
+ Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
+ else
+ per.etaHydMet,
final etaMotMet=if (per.etaMotMet == Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
- or per.etaMotMet == Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)
- and (not per.haveWMot_nominal and not per.havePressureCurve) then
+ or per.etaMotMet == Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)
+ and (not per.haveWMot_nominal and not per.havePressureCurve) then
Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
- else per.etaMotMet), r_N(start=if abs(dp_nominal) > 1E-8 then
- dp_start/dp_nominal else 0)));
+ else per.etaMotMet), r_N(start=if abs(dp_nominal) > 1E-8 then
+ dp_start/dp_nominal
+ else
+ 0)));
parameter Modelica.Units.SI.PressureDifference dp_start(
min=0,
@@ -173,7 +176,7 @@ Buildings.Fluid.Movers.Validation.FlowControlled_dpSystem.
August 26, 2024, by Michael Wetter:
Implemented linear dynamics for change in motor speed.
This is for Buildings, #3965 and
-for IBPSA, #1926.
+for IBPSA, #1926.
March 1, 2023, by Hongxiang Fu:
@@ -221,7 +224,7 @@ This is for
March 24, 2017, by Michael Wetter:
-Renamed filteredSpeed to use_riseTime.
+Renamed filteredSpeed to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Movers/FlowControlled_m_flow.mo b/Buildings/Fluid/Movers/FlowControlled_m_flow.mo
index 53a645323e4..fdfb2dbf9d0 100644
--- a/Buildings/Fluid/Movers/FlowControlled_m_flow.mo
+++ b/Buildings/Fluid/Movers/FlowControlled_m_flow.mo
@@ -15,20 +15,23 @@ model FlowControlled_m_flow
y(final unit="kg/s", nominal=m_flow_nominal)),
eff(per(
final pressure=if per.havePressureCurve then per.pressure else
- Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
- V_flow={i/(nOri - 1)*2.0*m_flow_nominal/rho_default for i in 0:(
- nOri - 1)},
+ Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
+ V_flow={i/(nOri - 1)*2.0*m_flow_nominal/rho_default for i in 0:(nOri - 1)},
dp={i/(nOri - 1)*2.0*dp_nominal for i in (nOri - 1):-1:0}),
final etaHydMet=if (per.etaHydMet == Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate
- or per.etaHydMet == Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)
- and not per.havePressureCurve then Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
- else per.etaHydMet,
+ or per.etaHydMet == Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)
+ and not per.havePressureCurve then
+ Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
+ else
+ per.etaHydMet,
final etaMotMet=if (per.etaMotMet == Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
- or per.etaMotMet == Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)
- and (not per.haveWMot_nominal and not per.havePressureCurve) then
- Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
- else per.etaMotMet), r_N(start=if abs(m_flow_nominal) > 1E-8 then
- m_flow_start/m_flow_nominal else 0)),
+ or per.etaMotMet == Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)
+ and (not per.haveWMot_nominal and not per.havePressureCurve) then
+ Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
+ else per.etaMotMet), r_N(start=if abs(m_flow_nominal) > 1E-8 then
+ m_flow_start/m_flow_nominal
+ else
+ 0)),
preSou(m_flow_start=m_flow_start));
parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(
@@ -140,9 +143,8 @@ User's Guide for more information.
August 26, 2024, by Michael Wetter:
Implemented linear dynamics for change in motor speed.
This is for Buildings, #3965 and
-for IBPSA, #1926.
+for IBPSA, #1926.
-
March 1, 2023, by Hongxiang Fu:
Refactored the model with a new declaration for
@@ -188,7 +190,7 @@ This is for
March 24, 2017, by Michael Wetter:
-Renamed filteredSpeed to use_riseTime.
+Renamed filteredSpeed to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Movers/SpeedControlled_y.mo b/Buildings/Fluid/Movers/SpeedControlled_y.mo
index ae16df0534d..ed844bb232a 100644
--- a/Buildings/Fluid/Movers/SpeedControlled_y.mo
+++ b/Buildings/Fluid/Movers/SpeedControlled_y.mo
@@ -14,7 +14,8 @@ model SpeedControlled_y
eff(per(
final pressure=per.pressure,
final etaHydMet=per.etaHydMet,
- final etaMotMet=per.etaMotMet), r_N(start=y_start)));
+ final etaMotMet=per.etaMotMet),
+ r_N(start=y_start)));
parameter Real y_start(min=0, max=1, unit="1")=0 "Initial value of speed"
annotation(Dialog(tab="Dynamics", group="Motor speed", enable=use_riseTime));
@@ -87,9 +88,8 @@ User's Guide for more information.
August 26, 2024, by Michael Wetter:
Implemented linear dynamics for change in motor speed.
This is for Buildings, #3965 and
-for IBPSA, #1926.
+for IBPSA, #1926.
-
March 29, 2023, by Hongxiang Fu:
Removed the modification that normalised the speed input
@@ -129,7 +129,7 @@ This is for
March 24, 2017, by Michael Wetter:
-Renamed filteredSpeed to use_riseTime.
+Renamed filteredSpeed to use_inputFilter.
This is for
#665.
diff --git a/Buildings/Fluid/Sensors/Examples/EnthalpyFlowRate.mo b/Buildings/Fluid/Sensors/Examples/EnthalpyFlowRate.mo
index 595b237ef68..3d206a5cb7a 100644
--- a/Buildings/Fluid/Sensors/Examples/EnthalpyFlowRate.mo
+++ b/Buildings/Fluid/Sensors/Examples/EnthalpyFlowRate.mo
@@ -33,7 +33,7 @@ model EnthalpyFlowRate "Test model for the enthalpy flow rate sensors"
m_flow_nominal=2,
tau=0) "Specific enthalpy sensor"
annotation (Placement(transformation(extent={{0,-20},{20,0}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flow(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{28,-20},{48,0}})));
Modelica.Blocks.Math.Add cheEqu(k2=-1)
@@ -51,10 +51,10 @@ equation
connect(senH_flow.port_b, senH.port_a) annotation (Line(
points={{-10,-10},{-5.55112e-16,-10}},
color={0,127,255}));
- connect(senH.port_b, senM_flow.port_a) annotation (Line(
+ connect(senH.port_b, senMasFlo.port_a) annotation (Line(
points={{20,-10},{28,-10}},
color={0,127,255}));
- connect(senM_flow.port_b, sin.ports[1]) annotation (Line(
+ connect(senMasFlo.port_b, sin.ports[1]) annotation (Line(
points={{48,-10},{60,-10}},
color={0,127,255}));
connect(senH_flow.H_flow,cheEqu. u1) annotation (Line(
@@ -63,7 +63,7 @@ equation
connect(senH.h_out, pro.u1) annotation (Line(
points={{10,1},{10,28},{-14,28},{-14,70},{-2,70}},
color={0,0,127}));
- connect(senM_flow.m_flow, pro.u2) annotation (Line(
+ connect(senMasFlo.m_flow, pro.u2) annotation (Line(
points={{38,1},{38,36},{-10,36},{-10,58},{-2,58}},
color={0,0,127}));
connect(pro.y,cheEqu. u2) annotation (Line(
diff --git a/Buildings/Fluid/Sensors/Examples/EntropyFlowRate.mo b/Buildings/Fluid/Sensors/Examples/EntropyFlowRate.mo
index 3a14b053f3b..6f8570a9987 100644
--- a/Buildings/Fluid/Sensors/Examples/EntropyFlowRate.mo
+++ b/Buildings/Fluid/Sensors/Examples/EntropyFlowRate.mo
@@ -33,7 +33,7 @@ model EntropyFlowRate "Test model for the entropy flow rate sensors"
m_flow_nominal=2,
tau=0) "Specific entropy sensor"
annotation (Placement(transformation(extent={{0,-20},{20,0}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flow(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{28,-20},{48,0}})));
Buildings.Utilities.Diagnostics.AssertEquality assEqu
@@ -51,13 +51,13 @@ equation
connect(senS_flow.port_b,senS. port_a) annotation (Line(
points={{-10,-10},{-5.55112e-16,-10}},
color={0,127,255}));
- connect(senS.port_b, senM_flow.port_a) annotation (Line(
+ connect(senS.port_b, senMasFlo.port_a) annotation (Line(
points={{20,-10},{28,-10}},
color={0,127,255}));
- connect(senM_flow.port_b, sin.ports[1]) annotation (Line(
+ connect(senMasFlo.port_b, sin.ports[1]) annotation (Line(
points={{48,-10},{60,-10}},
color={0,127,255}));
- connect(senM_flow.m_flow, pro.u2) annotation (Line(
+ connect(senMasFlo.m_flow, pro.u2) annotation (Line(
points={{38,1},{38,36},{-10,36},{-10,58},{-2,58}},
color={0,0,127}));
connect(pro.y, assEqu.u2) annotation (Line(
diff --git a/Buildings/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo b/Buildings/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo
index f052e592f85..ae8fd3e0714 100644
--- a/Buildings/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo
+++ b/Buildings/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo
@@ -34,7 +34,7 @@ model MoistAirEnthalpyFlowRate
redeclare package Medium = Medium,
m_flow_nominal=1) "Specific enthalpy sensor"
annotation (Placement(transformation(extent={{0,10},{20,30}})));
- Buildings.Fluid.Sensors.MassFlowRate senM_flow(
+ Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
redeclare package Medium = Medium) "Mass flow rate sensor"
annotation (Placement(transformation(extent={{28,10},{48,30}})));
Modelica.Blocks.Math.Product pro "Product to compute enthalpy flow rate"
@@ -60,12 +60,12 @@ equation
connect(senH_flow.port_b, senH.port_a) annotation (Line(
points={{-10,20},{-5.55112e-16,20}},
color={0,127,255}));
- connect(senH.port_b, senM_flow.port_a) annotation (Line(
+ connect(senH.port_b, senMasFlo.port_a) annotation (Line(
points={{20,20},{28,20}},
color={0,127,255}));
connect(senH.h_out, pro.u1) annotation (Line(points={{10,31},{10,38},{10,76},
{58,76}}, color={0,0,127}));
- connect(senM_flow.m_flow, pro.u2) annotation (Line(points={{38,31},{38,48},{
+ connect(senMasFlo.m_flow, pro.u2) annotation (Line(points={{38,31},{38,48},{
38,64},{58,64}}, color={0,0,127}));
connect(senHLat_flow.H_flow, add.u1) annotation (Line(
points={{-50,-59},{-50,-30},{18,-30}},
@@ -73,7 +73,7 @@ equation
connect(senHSen_flow.H_flow, add.u2) annotation (Line(
points={{-10,-59},{-10,-42},{18,-42}},
color={0,0,127}));
- connect(senM_flow.port_b, senHLat_flow.port_a) annotation (Line(
+ connect(senMasFlo.port_b, senHLat_flow.port_a) annotation (Line(
points={{48,20},{60,20},{60,0},{-70,0},{-70,-70},{-60,-70}},
color={0,127,255}));
connect(senHLat_flow.port_b, senHSen_flow.port_a)
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt
index e3d3f571b0d..f11c2f3920f 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt
@@ -5,8 +5,8 @@ statistics-simulation=
"nonlinear": " ",
"linear": " "
}
-senM_flowCv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowKv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowOpPoi.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowAv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
+senMasFloCv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
+senMasFloKv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
+senMasFloOpPoi.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
+senMasFloAv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
time=[0e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt
index 334f7f01383..0811364feaf 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt
@@ -12,6 +12,6 @@ statistics-simulation=
}
valCv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
valKv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
-valOPPoi.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
+valOpePoi.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
valAv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
time=[0e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_EnthalpyFlowRate.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_EnthalpyFlowRate.txt
index 1e4abb65170..9fe299098d4 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_EnthalpyFlowRate.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_EnthalpyFlowRate.txt
@@ -6,7 +6,7 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 6e+01]
-senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
+senMasFlo.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
senH.h_out=[4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 5.544634375e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04]
senH_flow.H_flow=[4.53009453125e+04, 4.439492581725182e+04, 4.348890632200365e+04, 4.258288664674635e+04, 4.167687123775716e+04, 4.07708515625e+04, 3.986483188724284e+04, 3.895881221198626e+04, 3.805279325676374e+04, 3.714677358151055e+04, 3.62407578125e+04, 3.533473813724256e+04, 3.442871846198626e+04, 3.352269950676374e+04, 3.261667911147481e+04, 3.1710662109375e+04, 3.080464315415019e+04, 2.989862275886011e+04, 2.899260575676489e+04, 2.808658536147481e+04, 2.718056640625e+04, 2.627454940415019e+04, 2.536852900886011e+04, 2.446251005364299e+04, 2.35564916114686e+04, 2.265047265625e+04, 2.17444537010314e+04, 2.083843669892538e+04, 1.993241486357461e+04, 1.902639590834981e+04, 1.812037890625e+04, 1.721435995102519e+04, 1.63083409958128e+04, 1.540232013700591e+04, 1.44963021583467e+04, 1.3590283203125e+04, 1.26842652244658e+04, 1.177824724580039e+04, 1.087222541044961e+04, 9.9662074317842e+03, 9.060189453125e+03, 8.1541704979033e+03, 7.248152519240991e+03, 6.342131172165259e+03, 5.436112705223257e+03, 4.5300947265625e+03, 3.624076259620493e+03, 2.718057792680043e+03, 1.812036689741837e+03, 9.060183448711126e+02, -1.354271833564624e-10, -1.311834126900897e+03, -2.623668253801017e+03, -3.935506306744313e+03, -5.247336507655061e+03, -6.55917431640625e+03, -7.871012613438706e+03, -9.182843058461989e+03, -1.049468135559429e+04, -1.180651033579246e+04, -1.31183486328125e+04, -1.443018692984495e+04, -1.5742016886587e+04, -1.70538551837255e+04, -1.836568611703004e+04, -1.96775234375e+04, -2.098936271107012e+04, -2.23011916912745e+04, -2.361302901185051e+04, -2.492485994515504e+04, -2.6236697265625e+04, -2.754853653921994e+04, -2.886036551939949e+04, -3.01722047931005e+04, -3.148403377328004e+04, -3.279587109375e+04, -3.410771036734495e+04, -3.541954130064951e+04, -3.673138057435051e+04, -3.804320760140506e+04, -3.9355046875e+04, -4.066688614859495e+04, -4.197871708189949e+04, -4.329055244935049e+04, -4.460238338265505e+04, -4.591422265625e+04, -4.722605802359495e+04, -4.853788895689951e+04, -4.984972823060049e+04, -5.116155916390505e+04, -5.247339453125e+04, -5.378523380484495e+04, -5.509706473814951e+04, -5.640890401185051e+04, -5.772073103890505e+04, -5.90325703125e+04, -6.034440958609494e+04, -6.165624051939949e+04, -6.296807588685049e+04, -6.427990682015505e+04, -6.55917421875e+04]
cheEqu.y=[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, 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, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_EntropyFlowRate.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_EntropyFlowRate.txt
index 5e3cc2c1709..1dc97877f62 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_EntropyFlowRate.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_EntropyFlowRate.txt
@@ -6,6 +6,6 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 6e+01]
-senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
+senMasFlo.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
senS_flow.S_flow=[9.535915374755859e+01, 9.34519730372094e+01, 9.154478469746876e+01, 8.963760360819531e+01, 8.773042327676708e+01, 8.582323455810547e+01, 8.391605346883232e+01, 8.200887237956037e+01, 8.010169280597437e+01, 7.819450408732062e+01, 7.628732299804688e+01, 7.438014190877313e+01, 7.247295319011938e+01, 7.056577361653336e+01, 6.865859101156698e+01, 6.675140380859375e+01, 6.484422423501505e+01, 6.293704163004625e+01, 6.102985824177386e+01, 5.912267182212599e+01, 5.721549224853516e+01, 5.530830886025919e+01, 5.340112625529039e+01, 5.149394286701799e+01, 4.958675644737013e+01, 4.76795768737793e+01, 4.577239348550332e+01, 4.386521391190036e+01, 4.195802446090236e+01, 4.005084488729941e+01, 3.814366149902344e+01, 3.623647811074746e+01, 3.432929853714452e+01, 3.24221090861465e+01, 3.051492760520097e+01, 2.860774612426758e+01, 2.670056464332812e+01, 2.479338125505215e+01, 2.288619371139064e+01, 2.097901223044511e+01, 1.907183074951172e+01, 1.716464926857226e+01, 1.525746683396454e+01, 1.335027929029697e+01, 1.144309685569229e+01, 9.535915374755859e+00, 7.628733416983782e+00, 5.721551459211716e+00, 3.814363677127092e+00, 1.907181838563546e+00, -3.14685370860282e-13, -3.246330819886722e+00, -6.492661639774959e+00, -9.739002540986739e+00, -1.298532327968114e+01, -1.623166465759277e+01, -1.947800508184226e+01, -2.272432677413318e+01, -2.597066719864511e+01, -2.921698889093606e+01, -3.246332931518555e+01, -3.570967164675941e+01, -3.895598952438948e+01, -4.220233185625001e+01, -4.544865354855309e+01, -4.869499588012695e+01, -5.194133439705206e+01, -5.518765608933089e+01, -5.84339984211672e+01, -6.168031629879723e+01, -6.492665863037109e+01, -6.817299714729616e+01, -7.141932265424801e+01, -7.466566117143554e+01, -7.791197904908988e+01, -8.11583251953125e+01, -8.440466371223761e+01, -8.765098921918946e+01, -9.089732773637699e+01, -9.414364561403131e+01, -9.738999176025391e+01, -1.00636330277179e+02, -1.038826481547848e+02, -1.071289943012699e+02, -1.103753121788757e+02, -1.136216506958008e+02, -1.168679968420234e+02, -1.201143147196777e+02, -1.233606532368652e+02, -1.266069787438171e+02, -1.298533172607422e+02, -1.330996634069648e+02, -1.363459736552731e+02, -1.395923198017582e+02, -1.428386453086615e+02, -1.460849761962891e+02, -1.493313223425116e+02, -1.52577647849512e+02, -1.55823978737402e+02, -1.590703042444024e+02, -1.62316650390625e+02]
senS.s=[9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 1.288379058837891e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt
index cb7c45aced0..d22c6545ff5 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt
@@ -7,7 +7,7 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 6e+01]
-senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
+senMasFlo.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
senH.h_out=[4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.55739020320944e+04, 4.638314323649716e+04, 4.770003328759537e+04, 4.947847941700046e+04, 5.165823828125e+04, 5.416740132741474e+04, 5.692696123229725e+04, 5.985485536801724e+04, 6.286964463659879e+04, 6.58943984375e+04, 6.885979644416763e+04, 7.170635583162136e+04, 7.438590950821755e+04, 7.686219705122702e+04, 7.9110984375e+04, 8.111924692218594e+04, 8.288395100394984e+04, 8.441054082820399e+04, 8.57111453501494e+04, 8.68028203125e+04, 8.770584578296855e+04, 8.844216320418548e+04, 8.903411784236219e+04, 8.95034051685978e+04, 8.987034375e+04, 9.015335217293694e+04, 9.036869506866517e+04, 9.053035954636488e+04, 9.065010129428524e+04, 9.07376328125e+04, 9.080076575563052e+04, 9.084571870052771e+04, 9.087730471963712e+04, 9.089921088981738e+04, 9.09141953125e+04, 9.092432033256644e+04, 9.093101561784738e+04, 9.093544531692071e+04, 9.093839843124166e+04, 9.09403515625e+04, 9.094159375238413e+04, 9.094236718670526e+04, 9.09428046878477e+04, 9.09430312495033e+04, 9.09431796875e+04, 9.094327343779802e+04, 9.094336718745033e+04, 9.094342968759935e+04, 9.094346875e+04, 9.09434375e+04]
senH_flow.H_flow=[4.53009453125e+04, 4.439492581725182e+04, 4.348890632200365e+04, 4.258288664674635e+04, 4.167687123775716e+04, 4.07708515625e+04, 3.986483188724284e+04, 3.895881221198626e+04, 3.805279325676374e+04, 3.714677358151055e+04, 3.62407578125e+04, 3.533473813724256e+04, 3.442871846198626e+04, 3.352269950676374e+04, 3.261667911147481e+04, 3.1710662109375e+04, 3.080464315415019e+04, 2.989862275886011e+04, 2.899260575676489e+04, 2.808658536147481e+04, 2.718056640625e+04, 2.627454940415019e+04, 2.536852900886011e+04, 2.446251005364299e+04, 2.35564916114686e+04, 2.265047265625e+04, 2.17444537010314e+04, 2.083843669892538e+04, 1.993241486357461e+04, 1.902639590834981e+04, 1.812037890625e+04, 1.721435995102519e+04, 1.63083409958128e+04, 1.540232013700591e+04, 1.44963021583467e+04, 1.3590283203125e+04, 1.26842652244658e+04, 1.177824724580039e+04, 1.087222541044961e+04, 9.9662074317842e+03, 9.060189453125e+03, 8.1541704979033e+03, 7.248152519240991e+03, 6.342131172165259e+03, 5.436112705223257e+03, 4.5300947265625e+03, 3.624076259620493e+03, 2.718057792680043e+03, 1.812036689741837e+03, 9.060183448711126e+02, -1.663878756996695e-10, -1.818868594578488e+03, -3.637737189156975e+03, -5.45661168779616e+03, -7.27547437838747e+03, -9.0943486328125e+03, -1.091322337552501e+04, -1.273208655435146e+04, -1.455096032064852e+04, -1.636982349948741e+04, -1.8188697265625e+04, -2.000757298488759e+04, -2.182643518717019e+04, -2.364530895346723e+04, -2.546417310883757e+04, -2.7283046875e+04, -2.910192064116243e+04, -3.092078479653277e+04, -3.273965856282983e+04, -3.455852271823741e+04, -3.637739453125e+04, -3.819627025051257e+04, -4.001513440592017e+04, -4.183400621910465e+04, -4.365287037448741e+04, -4.547174609375e+04, -4.729061790681226e+04, -4.910948206217019e+04, -5.092835778157983e+04, -5.274721803073743e+04, -5.456609375e+04, -5.638496946926259e+04, -5.820382971842017e+04, -6.002270543782981e+04, -6.184156959323741e+04, -6.366044140625e+04, -6.547931712551259e+04, -6.729817737467019e+04, -6.911705700032981e+04, -7.093591724948741e+04, -7.27547890625e+04, -7.457366868801259e+04, -7.639252893717019e+04, -7.821140075032983e+04, -8.003026881198741e+04, -8.1849140625e+04, -8.366801243801258e+04, -8.548688049967017e+04, -8.730575231282981e+04, -8.912461256198741e+04, -9.09434921875e+04]
senHSen_flow.H_flow=[1.991880078125e+04, 1.952042384395515e+04, 1.912204885978453e+04, 1.872367184333969e+04, 1.8325296938319e+04, 1.7926919921875e+04, 1.752854485855444e+04, 1.713016784210914e+04, 1.673179309538776e+04, 1.633341607894568e+04, 1.59350400390625e+04, 1.553666399918009e+04, 1.513828795929819e+04, 1.473991223601431e+04, 1.434153587953178e+04, 1.394316015625e+04, 1.354478443296511e+04, 1.314640807648363e+04, 1.274803235320231e+04, 1.234965599671928e+04, 1.19512802734375e+04, 1.155290455015261e+04, 1.115452819367114e+04, 1.075615247038981e+04, 1.035777611390678e+04, 9.959400390625e+03, 9.561024667340111e+03, 9.162648944055221e+03, 8.764271954376067e+03, 8.365896231094284e+03, 7.96752001953125e+03, 7.569144296247913e+03, 7.170768572964578e+03, 6.772391583285422e+03, 6.374015860002085e+03, 5.97564013671875e+03, 5.577264413433863e+03, 5.178888690148974e+03, 4.780511700472922e+03, 4.382135977189585e+03, 3.983760009765625e+03, 3.585384286481514e+03, 3.187008563197401e+03, 2.788631573519797e+03, 2.390255850236462e+03, 1.991880004882812e+03, 1.593504281599087e+03, 1.195128558315365e+03, 7.967515076022185e+02, 3.983757538012063e+02, -7.271008795051159e-11, -7.887034780512495e+02, -1.577406956102887e+03, -2.366113063428368e+03, -3.154813912237654e+03, -3.94352001953125e+03, -4.732226126824856e+03, -5.520927219755707e+03, -6.309632838834928e+03, -7.098333931768894e+03, -7.8870400390625e+03, -8.675746146349897e+03, -9.464447239286967e+03, -1.025315334664432e+04, -1.104185443957519e+04, -1.18305595703125e+04, -1.261926567761231e+04, -1.340796677054318e+04, -1.419667287790054e+04, -1.498537397082519e+04, -1.5774080078125e+04, -1.656278520887472e+04, -1.735148727835567e+04, -1.814019240915674e+04, -1.892889447862527e+04, -1.9717599609375e+04, -2.05063066932249e+04, -2.129500680960567e+04, -2.208371389351933e+04, -2.287241400990011e+04, -2.3661119140625e+04, -2.44498262244749e+04, -2.523852634085567e+04, -2.602723342476933e+04, -2.68159335411501e+04, -2.7604640625e+04, -2.83933457557249e+04, -2.918204782521826e+04, -2.997075295601933e+04, -3.07594530724001e+04, -3.154816015625e+04, -3.233686528699973e+04, -3.312556540336809e+04, -3.391427444038192e+04, -3.470297455675027e+04, -3.54916796875e+04, -3.628038481824972e+04, -3.706908884084325e+04, -3.785779397163191e+04, -3.864649408800027e+04, -3.943519921875e+04]
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
index 24458068d55..7d51b026bcb 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
@@ -1,2 +1,2 @@
simulateModel("Buildings.Fluid.Actuators.Valves.Validation.ThreeWayValveParameterization", method="CVode", tolerance=1e-06, resultFile="ThreeWayValveParameterization");
-createPlot(id=1, position={37, 30, 958, 513}, y={"senM_flowOpPoi.m_flow", "senM_flowKv.m_flow", "senM_flowCv.m_flow", "senM_flowAv.m_flow"}, range={0.0, 1.0, 0.18, 0.44}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
+createPlot(id=1, position={37, 30, 958, 513}, y={"senMasFloOpPoi.m_flow", "senMasFloKv.m_flow", "senMasFloCv.m_flow", "senMasFloAv.m_flow"}, range={0.0, 1.0, 0.18, 0.44}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
index b8251a347a6..1021caa943a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
@@ -1,2 +1,2 @@
simulateModel("Buildings.Fluid.Actuators.Valves.Validation.TwoWayValveParameterization", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValveParameterization");
-createPlot(id=1, position={15, 10, 873, 609}, y={"valOPPoi.m_flow", "valKv.m_flow", "valCv.m_flow", "valAv.m_flow"}, range={0.0, 1.0, -0.05, 0.45}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
+createPlot(id=1, position={15, 10, 873, 609}, y={"valOpePoi.m_flow", "valKv.m_flow", "valCv.m_flow", "valAv.m_flow"}, range={0.0, 1.0, -0.05, 0.45}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
index edd5fe1ac33..a0d0b81b0d6 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
@@ -1,5 +1,5 @@
simulateModel("Buildings.Fluid.Sensors.Examples.EnthalpyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="EnthalpyFlowRate");
-createPlot(id=5, position={15, 13, 1032, 1035}, y={"senM_flow.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
+createPlot(id=5, position={15, 13, 1032, 1035}, y={"senMasFlo.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
createPlot(id=5, position={15, 13, 1032, 256}, y={"senH.h_out"}, range={0.0, 62.0, 40000.0, 70000.0}, grid=true, subPlot=2, colors={{28,108,200}});
createPlot(id=5, position={15, 13, 1032, 255}, y={"senH_flow.H_flow"}, range={0.0, 62.0, -80000.0, 60000.0}, grid=true, subPlot=3, colors={{28,108,200}});
createPlot(id=5, position={15, 13, 1032, 256}, y={"cheEqu.y"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
index 1cbdf2b1da0..dfd23d7f3b4 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
@@ -1,7 +1,7 @@
simulateModel("Buildings.Fluid.Sensors.Examples.EntropyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="EntropyFlowRate");
createPlot(id = 5,
position = {15, 13, 645, 498},
- y = {"senM_flow.m_flow"},
+ y = {"senMasFlo.m_flow"},
range = {0, 1, 2, (-2.0)},
autoscale = true,
autoerase = true,
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
index 018ed3256cc..38811e2a001 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
@@ -1,5 +1,5 @@
simulateModel("Buildings.Fluid.Sensors.Examples.MoistAirEnthalpyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="MoistAirEnthalpyFlowRate");
-createPlot(id=5, position={15, 13, 1175, 1116}, y={"senM_flow.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
+createPlot(id=5, position={15, 13, 1175, 1116}, y={"senMasFlo.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
createPlot(id=5, position={15, 13, 1175, 276}, y={"senH.h_out"}, range={0.0, 62.0, 40000.0, 100000.0}, grid=true, subPlot=2, colors={{28,108,200}});
createPlot(id=5, position={15, 13, 1175, 276}, y={"senH_flow.H_flow", "senHSen_flow.H_flow", "senHLat_flow.H_flow"}, range={0.0, 62.0, -100000.0, 60000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=5, position={15, 13, 1175, 276}, y={"senH_flow.H_flow", "pro.y", "add.y"}, range={0.0, 62.0, -100000.0, 60000.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Valves.Validation.ThreeWayValveParameterization.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Valves.Validation.ThreeWayValveParameterization.mos
index 9721fc36fcd..69b15bb8de2 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Valves.Validation.ThreeWayValveParameterization.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Valves.Validation.ThreeWayValveParameterization.mos
@@ -1,7 +1,7 @@
compareVars :=
{
- "senM_flowOpPoi.m_flow",
- "senM_flowKv.m_flow",
- "senM_flowCv.m_flow",
- "senM_flowAv.m_flow"
+ "senMasFloOpPoi.m_flow",
+ "senMasFloKv.m_flow",
+ "senMasFloCv.m_flow",
+ "senMasFloAv.m_flow"
};
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Valves.Validation.TwoWayValveParameterization.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Valves.Validation.TwoWayValveParameterization.mos
index 8a714b2fc2e..aaa41b34ce7 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Valves.Validation.TwoWayValveParameterization.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Valves.Validation.TwoWayValveParameterization.mos
@@ -1,6 +1,6 @@
compareVars :=
{
- "valOPPoi.m_flow",
+ "valOpePoi.m_flow",
"valKv.m_flow",
"valCv.m_flow",
"valAv.m_flow"
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.EnthalpyFlowRate.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.EnthalpyFlowRate.mos
index 3008131d879..ab391c35610 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.EnthalpyFlowRate.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.EnthalpyFlowRate.mos
@@ -1,6 +1,6 @@
compareVars :=
{
- "senM_flow.m_flow",
+ "senMasFlo.m_flow",
"senH.h_out",
"senH_flow.H_flow",
"cheEqu.y"
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.EntropyFlowRate.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.EntropyFlowRate.mos
index faac4253f5c..f708ecd252e 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.EntropyFlowRate.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.EntropyFlowRate.mos
@@ -1,6 +1,6 @@
compareVars :=
{
- "senM_flow.m_flow",
+ "senMasFlo.m_flow",
"senS_flow.S_flow",
"senS.s"
};
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.MoistAirEnthalpyFlowRate.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.MoistAirEnthalpyFlowRate.mos
index 94c61bc8023..e0501666cf3 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.MoistAirEnthalpyFlowRate.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.MoistAirEnthalpyFlowRate.mos
@@ -1,6 +1,6 @@
compareVars :=
{
- "senM_flow.m_flow",
+ "senMasFlo.m_flow",
"senH.h_out",
"senH_flow.H_flow",
"senHSen_flow.H_flow",