Replace fluid pass-through with fixed resistance in actuators (#4228)

AntoineGautier · web-flow · commit f4534df124d1 · 2025-05-15T08:19:20.000-07:00
* Replace fluid pass-through with fixed resistance in actuators

* Fix for ambiguous argument 'origin/master'
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt
diff --git a/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum b/Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum
@@ -1 +1 @@
-cea8833433e2ef85285ade2ceaf980fd
+ea3551453bd32d5e692f72319a7273f9
diff --git a/Buildings/Resources/Scripts/travis/templates/checkandrun.sh b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
@@ -132,6 +132,7 @@ for type in "${!test_script[@]}"; do
     fi
 
     # Diff/master
+    git fetch origin master
     diff_checksum="$(git diff --name-only origin/master Resources/Scripts/travis/templates | grep Resources/Scripts/travis/templates/$type.checksum)"
     if (( $? == 0 ));  then
       echo "Computed checksum does not match checksum on master."
diff --git a/Buildings/Templates/Components/Actuators/Damper.mo b/Buildings/Templates/Components/Actuators/Damper.mo
@@ -18,6 +18,9 @@ model Damper "Multiple-configuration damper"
   final parameter Modelica.Units.SI.PressureDifference dp_nominal=
     dat.dp_nominal
     "Damper pressure drop";
+  final parameter Modelica.Units.SI.PressureDifference dpFixed_nominal=
+    dat.dpFixed_nominal
+    "Pressure drop of duct and resistances other than the damper in series, at nominal mass flow rate";
 
   parameter Boolean use_strokeTime=true
     "Set to true to continuously open and close valve"
@@ -79,7 +82,7 @@ model Damper "Multiple-configuration damper"
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     final dpDamper_nominal=dp_nominal,
-    final dpFixed_nominal=dat.dpFixed_nominal,
+    final dpFixed_nominal=dpFixed_nominal,
     final use_strokeTime=use_strokeTime,
     final strokeTime=strokeTime,
     final init=init,
@@ -90,12 +93,12 @@ model Damper "Multiple-configuration damper"
     final linearized=linearized) if typ == Buildings.Templates.Components.Types.Damper.Modulating
      or typ == Buildings.Templates.Components.Types.Damper.TwoPosition
     "Damper with exponential characteristic"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+    annotation (Placement(transformation(extent={{-50,-30},{-30,-10}})));
   Buildings.Fluid.Actuators.Dampers.PressureIndependent ind(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     final dpDamper_nominal=dp_nominal,
-    final dpFixed_nominal=dat.dpFixed_nominal,
+    final dpFixed_nominal=dpFixed_nominal,
     final use_strokeTime=use_strokeTime,
     final strokeTime=strokeTime,
     final init=init,
@@ -105,12 +108,18 @@ model Damper "Multiple-configuration damper"
     final from_dp=from_dp)
     if typ==Buildings.Templates.Components.Types.Damper.PressureIndependent
     "Pressure independent damper"
-    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
-  Buildings.Templates.Components.Routing.PassThroughFluid non(
-    redeclare final package Medium = Medium)
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+  Buildings.Fluid.FixedResistances.PressureDrop non(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal=dpFixed_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final show_T=show_T,
+    final from_dp=from_dp,
+    final linearized=linearized)
     if typ==Buildings.Templates.Components.Types.Damper.None
     "No damper"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal y1(final realTrue=1,
       final realFalse=0)
     if typ == Buildings.Templates.Components.Types.Damper.TwoPosition
@@ -156,17 +165,21 @@ equation
   connect(y1_actual.u, ind.y_actual);
   /* Control point connection - stop */
   connect(port_a, non.port_a)
-    annotation (Line(points={{-100,0},{-80,0}}, color={0,127,255}));
+    annotation (Line(points={{-100,0},{-10,0}}, color={0,127,255}));
   connect(non.port_b, port_b)
-    annotation (Line(points={{-60,0},{100,0}}, color={0,127,255}));
+    annotation (Line(points={{10,0},{100,0}},  color={0,127,255}));
   connect(port_a,exp. port_a)
-    annotation (Line(points={{-100,0},{-10,0}}, color={0,127,255}));
+    annotation (Line(points={{-100,0},{-80,0},{-80,-20},{-50,-20}},
+                                                color={0,127,255}));
   connect(exp.port_b, port_b)
-    annotation (Line(points={{10,0},{100,0}}, color={0,127,255}));
+    annotation (Line(points={{-30,-20},{80,-20},{80,0},{100,0}},
+                                              color={0,127,255}));
   connect(port_a, ind.port_a)
-    annotation (Line(points={{-100,0},{50,0}}, color={0,127,255}));
+    annotation (Line(points={{-100,0},{-80,0},{-80,-40},{30,-40}},
+                                               color={0,127,255}));
   connect(ind.port_b, port_b)
-    annotation (Line(points={{70,0},{100,0}}, color={0,127,255}));
+    annotation (Line(points={{50,-40},{80,-40},{80,0},{100,0}},
+                                              color={0,127,255}));
   connect(bus.y1, y1.u) annotation (Line(
       points={{0,100},{0,60},{-80,60},{-80,52}},
       color={255,204,51},
@@ -290,6 +303,12 @@ Buildings.Templates.Components.Data.Damper</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+May 7, 2025, by Antoine Gautier:<br/>
+Replaced direct fluid pass-through with fixed resistance.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4227\">#4227</a>.
+</li>
+<li>
 September 27, 2023, by Antoine Gautier:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Templates/Components/Actuators/Valve.mo b/Buildings/Templates/Components/Actuators/Valve.mo
@@ -226,8 +226,14 @@ model Valve "Multiple-configuration valve"
         rotation=-90,
         origin={40,120})));
 
-  Routing.PassThroughFluid non(
-    redeclare final package Medium = Medium)
+  Buildings.Fluid.FixedResistances.PressureDrop non(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal=dpFixed_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final show_T=show_T,
+    final from_dp=from_dp,
+    final linearized=linearized)
     if typ==Buildings.Templates.Components.Types.Valve.None
     "No valve"
     annotation (Placement(transformation(extent={{-10,30},{10,50}})));
@@ -603,6 +609,12 @@ for the rationale.
 </html>", revisions="<html>
 <ul>
 <li>
+May 7, 2025, by Antoine Gautier:<br/>
+Replaced direct fluid pass-through with fixed resistance.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4227\">#4227</a>.
+</li>
+<li>
 September 27, 2023, by Antoine Gautier:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Templates/Components/Data/Damper.mo b/Buildings/Templates/Components/Data/Damper.mo
@@ -11,8 +11,7 @@ record Damper "Record for damper model"
     start=1)
     "Air mass flow rate"
     annotation (
-      Dialog(group="Mechanical",
-        enable=typ<>Buildings.Templates.Components.Types.Damper.None));
+      Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.PressureDifference dp_nominal(
     final min=0,
     displayUnit="Pa",
@@ -21,14 +20,13 @@ record Damper "Record for damper model"
     else 15)
     "Air pressure drop"
     annotation (
-      Dialog(group="Mechanical",
+      Dialog(group="Nominal condition",
         enable=typ<>Buildings.Templates.Components.Types.Damper.None));
   parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(
     final min=0,
     displayUnit="Pa")=0
     "Air pressure drop of fixed elements in series with damper"
-    annotation (
-      Dialog(group="Mechanical", enable=false));
+    annotation (Dialog(group="Nominal condition"));
   annotation (
   defaultComponentPrefixes = "parameter",
   defaultComponentName="datDam",
diff --git a/Buildings/Templates/Components/Data/Valve.mo b/Buildings/Templates/Components/Data/Valve.mo
@@ -10,8 +10,7 @@ record Valve "Record for valve model"
     final min=0,
     start=1)
     "Nominal mass flow rate of fully open valve"
-    annotation(Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Valve.None));
+    annotation(Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.PressureDifference dpValve_nominal(
     final min=0,
     displayUnit="Pa",
@@ -23,8 +22,7 @@ record Valve "Record for valve model"
     final min=0,
     displayUnit="Pa")=0
     "Nominal pressure drop of pipes and other equipment in flow leg"
-    annotation(Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Valve.None));
+    annotation(Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.PressureDifference dpFixedByp_nominal(
     final min=0,
     displayUnit="Pa")=dpFixed_nominal
diff --git a/Buildings/Templates/Components/Validation/Dampers.mo b/Buildings/Templates/Components/Validation/Dampers.mo
@@ -33,7 +33,6 @@ model Dampers "Validation model for damper components"
   Buildings.Controls.OBC.CDL.Reals.Sources.Ramp y(height=1,
     duration=10) "Damper control signal"
     annotation (Placement(transformation(extent={{-90,90},{-70,110}})));
-
   Buildings.Templates.Components.Actuators.Damper pre(
     final typ=Buildings.Templates.Components.Types.Damper.PressureIndependent,
     y_start=0,
@@ -66,7 +65,8 @@ model Dampers "Validation model for damper components"
     annotation (Placement(transformation(extent={{-90,-30},{-70,-10}})));
   Buildings.Templates.Components.Actuators.Damper non(
     final typ=Buildings.Templates.Components.Types.Damper.None,
-    redeclare final package Medium = MediumAir)
+    redeclare final package Medium = MediumAir,
+    dat(m_flow_nominal=1))
     "No damper"
     annotation (Placement(transformation(extent={{10,-110},{30,-90}})));
   Fluid.FixedResistances.PressureDrop res(
diff --git a/Buildings/Templates/Components/Validation/Valves.mo b/Buildings/Templates/Components/Validation/Valves.mo
@@ -94,7 +94,8 @@ model Valves "Validation model for valve components"
       iconTransformation(extent={{-250,-32},{-210,8}})));
   Actuators.Valve non(
     redeclare final package Medium = MediumLiq,
-    typ=Buildings.Templates.Components.Types.Valve.None)
+    typ=Buildings.Templates.Components.Types.Valve.None,
+    dat(m_flow_nominal=1))
     "No valve"
     annotation (Placement(transformation(extent={{10,-130},{30,-110}})));
   Fluid.FixedResistances.PressureDrop res(
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo b/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo
diff --git a/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo b/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_12_0_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_12_0_1.mo

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-cea8833433e2ef85285ade2ceaf980fd`
	`1`	`+ea3551453bd32d5e692f72319a7273f9`