Merge pull request #4450 from lbl-srg/issue4432_loadModelTemplate

Update load model in plant template validation

Author: mwetter

Buildings/Fluid/HydronicConfigurations/ActiveNetworks/Examples/BaseClasses/Load.mo

@@ -295,11 +295,11 @@ model Load "Model of a load on a hydronic circuit"
     annotation (Placement(transformation(extent={{-90,130},{-70,150}})));
   Buildings.Controls.OBC.CDL.Routing.RealExtractor TAirEnt_actual(
     y(final unit="K", displayUnit="degC"), final nin=3)
-    "Actual value of entering air temperature"
-    annotation (Placement(transformation(extent={{-60,130},{-40,150}})));
+    "Select design value of entering air temperature depending on mode"
+    annotation (Placement(transformation(extent={{-62,130},{-42,150}})));
   Buildings.Controls.OBC.CDL.Routing.RealExtractor TAirLvg_actual(
     y(final unit="K", displayUnit="degC"), final nin=3)
-    "Actual value of leaving air temperature"
+    "Select design value of leaving air temperature depending on mode"
     annotation (Placement(transformation(extent={{40,130},{20,150}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TAirLvgVal(
     final k=TAirLvgChg_nominal) "Values of leaving air temperature"
@@ -397,26 +397,26 @@ equation
   connect(mode, ctl.mode)
     annotation (Line(points={{-120,40},{54,40},{54,48}}, color={255,127,0}));
   connect(TAirEntVal.y, TAirEnt_actual.u)
-    annotation (Line(points={{-68,140},{-62,140}}, color={0,0,127}));
+    annotation (Line(points={{-68,140},{-64,140}}, color={0,0,127}));
   connect(pro.y, TAirSupSet.u2)
     annotation (Line(points={{-2,60},{8,60},{8,54},{12,54}},color={0,0,127}));
-  connect(TAirEnt_actual.y, TAirSupSet.u1) annotation (Line(points={{-38,140},{
+  connect(TAirEnt_actual.y, TAirSupSet.u1) annotation (Line(points={{-40,140},{
           6,140},{6,66},{12,66}},
                                color={0,0,127}));
   connect(sub.y, pro.u1) annotation (Line(points={{-30,90},{-30,66},{-26,66}},
                          color={0,0,127}));
   connect(u, pro.u2) annotation (Line(points={{-120,80},{-60,80},{-60,54},{-26,
           54}},
         color={0,0,127}));
-  connect(TAirEnt_actual.y, souAir.T_in) annotation (Line(points={{-38,140},{6,
+  connect(TAirEnt_actual.y, souAir.T_in) annotation (Line(points={{-40,140},{6,
           140},{6,34},{50,34},{50,8},{42,8}},
                                          color={0,0,127}));
   connect(sub.u1, TAirLvg_actual.y) annotation (Line(points={{-24,114},{-24,132},
           {10,132},{10,140},{18,140}}, color={0,0,127}));
   connect(TAirEnt_actual.y, sub.u2)
-    annotation (Line(points={{-38,140},{-36,140},{-36,114}}, color={0,0,127}));
+    annotation (Line(points={{-40,140},{-36,140},{-36,114}}, color={0,0,127}));
   connect(addPar.y, TAirEnt_actual.index) annotation (Line(points={{-80,112},{
-          -80,120},{-50,120},{-50,128}}, color={255,127,0}));
+          -80,120},{-52,120},{-52,128}}, color={255,127,0}));
   connect(addPar.y, TAirLvg_actual.index) annotation (Line(points={{-80,112},{
           -80,120},{30,120},{30,128}}, color={255,127,0}));
   connect(mode, addPar.u)

Buildings/Fluid/HydronicConfigurations/ActiveNetworks/Examples/BaseClasses/PartialLoadValveControl.mo

@@ -55,7 +55,7 @@ partial model PartialLoadValveControl
     60+273.15
     "Liquid entering temperature in change-over mode"
     annotation(Dialog(
-      enable=typ <> Buildings.Fluid.HydronicConfigurations.Types.Control.Heating));
+      enable=typ == Buildings.Fluid.HydronicConfigurations.Types.Control.ChangeOver));
 
   final parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=
    (MediumLiq.specificEnthalpy_pTX(MediumLiq.p_default, TLiqEnt_nominal, X=MediumLiq.X_default)-
@@ -119,8 +119,7 @@ partial model PartialLoadValveControl
     final dpValve_nominal=dpValve_nominal,
     final dpBal1_nominal=dpBal1_nominal,
     use_lumFloRes=true,
-    final energyDynamics=energyDynamics)
-    "Diversion connection"
+    final energyDynamics=energyDynamics) "Hydronic connection"
     annotation (Placement(transformation(extent={{-10,0},{10,20}})));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yLoa_actual(final unit="1")

Buildings/Fluid/HydronicConfigurations/ActiveNetworks/InjectionTwoWay.mo

@@ -41,6 +41,7 @@ model InjectionTwoWay "Injection circuit with two-way valve"
         origin={-60,40})));
   Components.TwoWayValve val(
     redeclare final package Medium = Medium,
+    final energyDynamics=energyDynamics,
     final typCha=typCha,
     use_strokeTime=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState,
     final allowFlowReversal=allowFlowReversal,

Buildings/Fluid/HydronicConfigurations/ActiveNetworks/Throttle.mo

@@ -14,6 +14,7 @@ model Throttle "Throttle circuit"
 
   Buildings.Fluid.HydronicConfigurations.Components.TwoWayValve val(
     redeclare final package Medium=Medium,
+    final energyDynamics=energyDynamics,
     final typCha=typCha,
     use_strokeTime=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState,
     final allowFlowReversal=allowFlowReversal,

Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Enabling_Validation_Enable.txt

@@ -1,4 +1,4 @@
-last-generated=2024-04-01
+last-generated=2026-01-23
 statistics-simulation=
 {
   "linear": " ",

Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatPumps_Validation_AirToWater.txt

@@ -1,4 +1,4 @@
-last-generated=2024-08-08
+last-generated=2026-01-23
 statistics-simulation=
 {
   "linear": " ",

Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatRecoveryChillers_Validation_EnableAndModeControl.txt

@@ -1,4 +1,4 @@
-last-generated=2024-12-10
+last-generated=2026-01-23
 statistics-simulation=
 {
   "linear": " ",

Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_Controller.txt

@@ -1,4 +1,4 @@
-last-generated=2024-06-12
+last-generated=2026-01-23
 statistics-simulation=
 {
   "linear": " ",

Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_ControllerDualMode.txt

@@ -1,4 +1,4 @@
-last-generated=2024-06-12
+last-generated=2026-01-23
 statistics-simulation=
 {
   "linear": " ",

Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_MinimumFlow_Validation_Setpoint.txt

@@ -1,4 +1,4 @@
-last-generated=2024-06-12
+last-generated=2026-01-23
 statistics-simulation=
 {
   "linear": " ",