diff --git a/.travis.yml b/.travis.yml index c1773ac8bb1..7686557168d 100644 --- a/.travis.yml +++ b/.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 diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt index 87c39bb5cf2..efd53538b55 100644 --- a/Buildings/.copiedFiles.txt +++ b/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 diff --git a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo index 52712bb4618..5d59fe23743 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo +++ b/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. ")); -end ChillerDXHeatingEconomizer; \ No newline at end of file +end ChillerDXHeatingEconomizer; diff --git a/Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo b/Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo index b5326fd6d69..c0b6666d3cd 100644 --- a/Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo +++ b/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="