Merge branch 'master' into issue2884_PID_autotuning

.travis.yml

@@ -32,7 +32,7 @@ env:
   global:
     - DOCKER_REPONAME=lbnlblum
     - BUILDINGSPY_VERSION=BuildingsPy@0bc654fd913c83f64163be167807e8989eff0293
-    - OMC_VERSION=ubuntu-2204-omc:1.23.0-1
+    - OMC_VERSION=ubuntu-2204-omc:1.24.0-1
     - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.51.6
     - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024xRefresh1-x86_64
     - ENERGYPLUS_9_6_0=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64

Buildings/.copiedFiles.txt

@@ -850,6 +850,40 @@ Buildings/Fluid/BaseClasses/Validation/package.mo
 Buildings/Fluid/BaseClasses/Validation/package.order
 Buildings/Fluid/BaseClasses/package.mo
 Buildings/Fluid/BaseClasses/package.order
+Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/FixedEvaporating.mo
+Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/InterpolateStates.mo
+Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/DryFluid.mo
+Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/WetFluid.mo
+Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/package.mo
+Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/package.order
+Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/package.mo
+Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/package.order
+Buildings/Fluid/CHPs/OrganicRankine/ConstantEvaporation.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/Generic.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Acetone.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Ethanol.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Heptane.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Pentane.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Propane.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R123.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R134a.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R245fa.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R32.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Toluene.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/package.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/package.order
+Buildings/Fluid/CHPs/OrganicRankine/Data/package.mo
+Buildings/Fluid/CHPs/OrganicRankine/Data/package.order
+Buildings/Fluid/CHPs/OrganicRankine/Examples/ORCHotWater.mo
+Buildings/Fluid/CHPs/OrganicRankine/Examples/package.mo
+Buildings/Fluid/CHPs/OrganicRankine/Examples/package.order
+Buildings/Fluid/CHPs/OrganicRankine/Validation/VariableSource.mo
+Buildings/Fluid/CHPs/OrganicRankine/Validation/package.mo
+Buildings/Fluid/CHPs/OrganicRankine/Validation/package.order
+Buildings/Fluid/CHPs/OrganicRankine/package.mo
+Buildings/Fluid/CHPs/OrganicRankine/package.order
+Buildings/Fluid/CHPs/package.mo
+Buildings/Fluid/CHPs/package.order
 Buildings/Fluid/Chillers/BaseClasses/Carnot.mo
 Buildings/Fluid/Chillers/BaseClasses/PartialCarnot_T.mo
 Buildings/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo
@@ -2293,7 +2327,17 @@ Buildings/Resources/Images/Fluid/Actuators/Valves/Examples/TwoWayValveTable_kv.p
 Buildings/Resources/Images/Fluid/Actuators/threeWayValvePressureDropSeries.png
 Buildings/Resources/Images/Fluid/Actuators/valvePressureDropSeries.png
 Buildings/Resources/Images/Fluid/Actuators/valveResponse.png
+Buildings/Resources/Images/Fluid/Actuators/valveResponse.svg
 Buildings/Resources/Images/Fluid/Actuators/valveSchematic.png
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/ComputationPaths.pdf
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/ComputationPaths.png
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/ComputationPaths.svg
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/CycleArchitecture.pdf
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/CycleArchitecture.png
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/CycleArchitecture.svg
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/SupportCurves.pdf
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/SupportCurves.png
+Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/SupportCurves.svg
 Buildings/Resources/Images/Fluid/FMI/ExportContainers/Validation/RoomConvectiveHVACConvective.pdf
 Buildings/Resources/Images/Fluid/FMI/ExportContainers/Validation/RoomConvectiveHVACConvective.png
 Buildings/Resources/Images/Fluid/FMI/ExportContainers/Validation/RoomConvectiveHVACConvective.svg
@@ -2355,8 +2399,11 @@ Buildings/Resources/Images/Fluid/Movers/BaseClasses/Validation/NegativePressureO
 Buildings/Resources/Images/Fluid/Movers/BaseClasses/Validation/NegativePressureOrFlow.svg
 Buildings/Resources/Images/Fluid/Movers/Data/stratoscurve.png
 Buildings/Resources/Images/Fluid/Movers/Examples/Supply.png
+Buildings/Resources/Images/Fluid/Movers/Preconfigured/PumpCharacteristic.png
+Buildings/Resources/Images/Fluid/Movers/Preconfigured/PumpCharacteristic.svg
 Buildings/Resources/Images/Fluid/Movers/UsersGuide/2013-IBPSA-Wetter.pdf
 Buildings/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.png
+Buildings/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.svg
 Buildings/Resources/Images/Fluid/Movers/UsersGuide/pumpCurve.png
 Buildings/Resources/Images/Fluid/Movers/Validation/PumpValidationHead.png
 Buildings/Resources/Images/Fluid/Movers/Validation/PumpValidationPower.png
@@ -2420,6 +2467,7 @@ Buildings/Resources/Images/Utilities/Math/Functions/Examples/cubicHermite.png
 Buildings/Resources/Images/Utilities/Math/Functions/SmoothExponentialXPower.png
 Buildings/Resources/Images/Utilities/Math/int.pdf
 Buildings/Resources/Images/Utilities/Math/int.png
+Buildings/Resources/Python-Sources/MakeORCFluidRecord.py
 Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos
 Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos
 Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos
@@ -2641,6 +2689,10 @@ Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/Inver
 Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mos
 Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/ActuatorFilter.mos
 Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mos
+Buildings/Resources/Scripts/Dymola/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/DryFluid.mos
+Buildings/Resources/Scripts/Dymola/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/WetFluid.mos
+Buildings/Resources/Scripts/Dymola/Fluid/CHPs/OrganicRankine/Examples/ORCHotWater.mos
+Buildings/Resources/Scripts/Dymola/Fluid/CHPs/OrganicRankine/Validation/VariableSource.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_TEva.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_y.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mos

Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo

@@ -124,14 +124,12 @@ model ChillerDXHeatingEconomizer
     final m_flow_nominal=mAir_flow_nominal,
     final nominalValuesDefineDefaultPressureCurve=true,
     final dp_nominal=875,
-    final per(
-      final etaHydMet=Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided,
-      final etaMotMet=Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided),
+    final per(final etaHydMet=Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided,
+        final etaMotMet=Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided),
     final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     final allowFlowReversal=false,
-    final use_inputFilter=false,
-    redeclare package Medium = MediumA)
-    "Supply fan"
+    final use_riseTime=false,
+    redeclare package Medium = MediumA) "Supply fan"
     annotation (Placement(transformation(extent={{-30,30},{-10,50}})));
   Buildings.Fluid.FixedResistances.PressureDrop totalRes(
     final m_flow_nominal=mAir_flow_nominal,
@@ -182,7 +180,7 @@ model ChillerDXHeatingEconomizer
         extent={{10,-10},{-10,10}},
         origin={138,-174})));
   Buildings.Fluid.Movers.FlowControlled_m_flow pumChiWat(
-    final use_inputFilter=false,
+    final use_riseTime=false,
     final allowFlowReversal=false,
     redeclare package Medium = MediumW,
     final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
@@ -195,9 +193,7 @@ model ChillerDXHeatingEconomizer
     final dp_nominal=12000,
     final inputType=Buildings.Fluid.Types.InputType.Continuous,
     final nominalValuesDefineDefaultPressureCurve=true)
-    "Pump for chilled water loop"
-    annotation (
-      Placement(transformation(
+    "Pump for chilled water loop" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={120,-90})));
@@ -664,4 +660,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end ChillerDXHeatingEconomizer;
+end ChillerDXHeatingEconomizer;

Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo

@@ -17,9 +17,9 @@ partial model DoorDiscretized
   Modelica.Units.SI.Velocity vTop "Velocity at top of opening from A to B";
   Modelica.Units.SI.Velocity vBot "Velocity at bottom of opening from A to B";
 
-protected
-  parameter Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment";
 
+  input Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment";
+protected
   parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
       T=Medium.T_default,
       p=Medium.p_default,
@@ -28,11 +28,11 @@ protected
   parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
     "Density, used to compute fluid volume";
 
-  parameter Real hAg[nCom](each unit="m2/s2")=
+  input Real hAg[nCom](each unit="m2/s2")=
     {Modelica.Constants.g_n*(hA - (i - 0.5)*dh) for i in 1:nCom}
     "Product g*h_i for each compartment";
 
-  parameter Real hBg[nCom](each unit="m2/s2")=
+  input Real hBg[nCom](each unit="m2/s2")=
     {Modelica.Constants.g_n*(hB - (i - 0.5)*dh) for i in 1:nCom}
     "Product g*h_i for each compartment";
   Modelica.Units.SI.AbsolutePressure pA[nCom](each nominal=101325)
@@ -118,6 +118,11 @@ using the model for a door that can be open or closed.
 revisions="<html>
 <ul>
 <li>
+October 29, 2024, by Klaas De Jonge:<br/>
+Unprotected <code>dh</code> and changed prefixes of <code>dh</code>,<code>hAg</code> and <code>hBg</code> to <code>input</code>.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1935\">#1935</a>.
+</li>
+<li>
 January 8, 2019, by Michael Wetter:<br/>
 Moved parameter <code>CD</code> from
 <a href=\"modelica://Buildings.Airflow.Multizone.BaseClasses.DoorDiscretized\">

Buildings/Applications/BaseClasses/Equipment/ElectricChillerParallel.mo

@@ -4,10 +4,9 @@ model ElectricChillerParallel "Multiple identical electric chillers"
     redeclare final Buildings.Fluid.Chillers.ElectricEIR chi[num](
       final per=per));
 
-  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricEIR.Generic per[num]
-    "Performance data"
-    annotation (choicesAllMatching = true,
-                Placement(transformation(extent={{42,74},{62,94}})));
+  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricEIR.Generic per[
+    numAct] "Performance data" annotation (choicesAllMatching=true, Placement(
+        transformation(extent={{42,74},{62,94}})));
   annotation (    Documentation(info="<html>
 <p>
 This model implements a chiller parallel with <code>num</code> identical chillers. For the chiller model please see

Buildings/Applications/BaseClasses/Equipment/Validation/ElectricChillerParallel.mo

@@ -24,7 +24,6 @@ model ElectricChillerParallel "Model that test electric chiller parallel"
     per2 "Chiller performance data"
     annotation (Placement(transformation(extent={{32,50},{52,70}})));
   Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel chiPar(
-    num=2,
     redeclare package Medium1 = Medium1,
     redeclare package Medium2 = Medium2,
     m1_flow_nominal=mEva_flow_nominal,
@@ -104,10 +103,10 @@ equation
     annotation (Line(points={{-20,-50},{-16,-50},{-16,-26},{-10,-26}},
                             color={0,127,255}));
   connect(greaterThreshold.y, chiPar.on[1])
-    annotation (Line(points={{-19,60},{-16,60},{-16,-17},{-12,-17}},
+    annotation (Line(points={{-19,60},{-16,60},{-16,-16},{-12,-16}},
       color={255,0,255}));
   connect(greaterThreshold.y, chiPar.on[2])
-    annotation (Line(points={{-19,60},{-16,60},{-16,-15},{-12,-15}},
+    annotation (Line(points={{-19,60},{-16,60},{-16,-16},{-12,-16}},
       color={255,0,255}));
   connect(TSet.y, chiPar.TSet)
     annotation (Line(points={{-59,30},{-28,30},{-28,-20},{-12,-20}},

Buildings/Applications/BaseClasses/Equipment/Validation/PumpParallel.mo

@@ -18,8 +18,7 @@ model PumpParallel "Example that tests the model pump parallels"
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     threshold=thr1,
     tau=1,
-    use_inputFilter=false)
-    "Pumps with speed controlled"
+    use_riseTime=false) "Pumps with speed controlled"
     annotation (Placement(transformation(extent={{-18,30},{2,50}})));
 
   Buildings.Fluid.FixedResistances.PressureDrop dp2(