diff --git a/IBPSA/Fluid/Chillers/ModularReversible/BaseClasses/RefrigerantCycle.mo b/IBPSA/Fluid/Chillers/ModularReversible/BaseClasses/RefrigerantCycle.mo index ad70b2589d..8c121126c4 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/BaseClasses/RefrigerantCycle.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/BaseClasses/RefrigerantCycle.mo @@ -162,8 +162,8 @@ equation ", info="

Modular refrigerant cycle model for chiller applications used in - the model - IBPSA.Fluid.Chillers.ModularReversible.ModularReversible and extending models + the model + IBPSA.Fluid.Chillers.ModularReversible.Modular and extending models of the modular approach.

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/ReversibleCarnotWithLosses.mo b/IBPSA/Fluid/Chillers/ModularReversible/CarnotWithLosses.mo similarity index 94% rename from IBPSA/Fluid/Chillers/ModularReversible/ReversibleCarnotWithLosses.mo rename to IBPSA/Fluid/Chillers/ModularReversible/CarnotWithLosses.mo index a39c37dcab..10fb8d3740 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/ReversibleCarnotWithLosses.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/CarnotWithLosses.mo @@ -1,7 +1,7 @@ within IBPSA.Fluid.Chillers.ModularReversible; -model ReversibleCarnotWithLosses +model CarnotWithLosses "Reversible chiller using Carnot approach with losses (frost, heat, inertia)" - extends IBPSA.Fluid.Chillers.ModularReversible.ModularReversible( + extends IBPSA.Fluid.Chillers.ModularReversible.Modular( QHea_flow_nominal=PEle_nominal*refCyc.refCycChiHea.COP_nominal, redeclare model RefrigerantCycleChillerHeating = IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.ConstantCarnotEffectiveness @@ -61,8 +61,8 @@ model ReversibleCarnotWithLosses

This model extends - - IBPSA.Fluid.Chillers.ModularReversible.ModularReversible and selects the + + IBPSA.Fluid.Chillers.ModularReversible.Modular and selects the constant Carnot effectiveness module for chillers ( IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.ConstantCarnotEffectiveness) @@ -88,4 +88,4 @@ For more information, see IBPSA.Fluid.HeatPumps.ModularReversible.UsersGuide.

")); -end ReversibleCarnotWithLosses; +end CarnotWithLosses; diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mo b/IBPSA/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mo index ddb83dda68..155d48017e 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mo @@ -5,7 +5,7 @@ model CarnotWithLosses package MediumCon = IBPSA.Media.Water "Medium model for condenser"; package MediumEva = IBPSA.Media.Water "Medium model for evaporator"; - IBPSA.Fluid.Chillers.ModularReversible.ReversibleCarnotWithLosses chi( + IBPSA.Fluid.Chillers.ModularReversible.CarnotWithLosses chi( redeclare package MediumCon = MediumCon, redeclare package MediumEva = MediumEva, QCoo_flow_nominal=-30000, @@ -123,8 +123,8 @@ __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers

Example that simulates a chiller based on the modular reversible approach using the - - IBPSA.Fluid.Chillers.ModularReversible.ReversibleCarnotWithLosses. + + IBPSA.Fluid.Chillers.ModularReversible.CarnotWithLosses. model directly. The chiller control signal is the compressor speed ySet and the mode coo. diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Examples/Modular.mo b/IBPSA/Fluid/Chillers/ModularReversible/Examples/Modular.mo index 05aa2597ec..8672327734 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/Examples/Modular.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/Examples/Modular.mo @@ -5,7 +5,7 @@ model Modular package MediumCon = IBPSA.Media.Air "Medium model for condenser"; package MediumEva = IBPSA.Media.Water "Medium model for evaporator"; - IBPSA.Fluid.Chillers.ModularReversible.ModularReversible chi( + IBPSA.Fluid.Chillers.ModularReversible.Modular chi( redeclare package MediumCon = MediumCon, redeclare package MediumEva = MediumEva, QCoo_flow_nominal=-30000, @@ -142,8 +142,8 @@ __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers

The example further demonstrates how to redeclare the replaceable options in the model approach - - IBPSA.Fluid.Chillers.ModularReversible.ModularReversible. + + IBPSA.Fluid.Chillers.ModularReversible.Modular.

")); end Modular; diff --git a/IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo b/IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo index cf1caefdce..e30ed79e1a 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo @@ -55,12 +55,12 @@ model LargeScaleWaterToWater "Large scale water to water chiller"

Large scale water-to-water chiller, using the - - IBPSA.Fluid.Chillers.ModularReversible.ModularReversible approach. + + IBPSA.Fluid.Chillers.ModularReversible.Modular approach.

- Contrary to the standard sizing approach for the - IBPSA.Fluid.Chillers.ModularReversible.ModularReversible models, + Contrary to the standard sizing approach for the + IBPSA.Fluid.Chillers.ModularReversible.Modular models, the parameters are based on an automatic estimation as described in IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.LargeScaleWaterToWaterDeclarations. diff --git a/IBPSA/Fluid/Chillers/ModularReversible/ModularReversible.mo b/IBPSA/Fluid/Chillers/ModularReversible/Modular.mo similarity index 99% rename from IBPSA/Fluid/Chillers/ModularReversible/ModularReversible.mo rename to IBPSA/Fluid/Chillers/ModularReversible/Modular.mo index 8e7d264b3c..cb2878e6d0 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/ModularReversible.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/Modular.mo @@ -1,5 +1,5 @@ within IBPSA.Fluid.Chillers.ModularReversible; -model ModularReversible +model Modular "Grey-box model for reversible chillers" extends IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.PartialReversibleRefrigerantMachine( @@ -132,4 +132,4 @@ equation IBPSA.Fluid.HeatPumps.ModularReversible.UsersGuide.

")); -end ModularReversible; +end Modular; diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/PartialModularComparison.mo b/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/PartialModularComparison.mo index 5002741896..d580e22a0d 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/PartialModularComparison.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/PartialModularComparison.mo @@ -9,7 +9,7 @@ partial model PartialModularComparison sou2(nPorts=1), sin1(nPorts=1)); - ModularReversible chi( + Modular chi( redeclare final package MediumCon = Medium1, redeclare final package MediumEva = Medium2, QCoo_flow_nominal=-QUse_flow_nominal, diff --git a/IBPSA/Fluid/Chillers/ModularReversible/package.order b/IBPSA/Fluid/Chillers/ModularReversible/package.order index 6845144243..d92b0a0660 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/package.order +++ b/IBPSA/Fluid/Chillers/ModularReversible/package.order @@ -1,7 +1,7 @@ UsersGuide +CarnotWithLosses LargeScaleWaterToWater -ModularReversible -ReversibleCarnotWithLosses +Modular Controls RefrigerantCycle Data diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/ReversibleAirToWaterTableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/AirToWaterTableData2D.mo similarity index 91% rename from IBPSA/Fluid/HeatPumps/ModularReversible/ReversibleAirToWaterTableData2D.mo rename to IBPSA/Fluid/HeatPumps/ModularReversible/AirToWaterTableData2D.mo index 1ba2eb3f21..1fdb6eb263 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/ReversibleAirToWaterTableData2D.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/AirToWaterTableData2D.mo @@ -1,7 +1,7 @@ within IBPSA.Fluid.HeatPumps.ModularReversible; -model ReversibleAirToWaterTableData2D +model AirToWaterTableData2D "Reversible air to water heat pump based on 2D manufacturer data in Europe" - extends IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.PartialReversibleTableData2D( + extends IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.PartialTableData2D( redeclare package MediumEva = IBPSA.Media.Air, redeclare package MediumCon = IBPSA.Media.Water, redeclare replaceable IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D.GenericAirToWater datTabHea @@ -14,8 +14,8 @@ model ReversibleAirToWaterTableData2D Reversible air-to-water heat pump based on two-dimensional data from manufacturer data, (e.g. based on EN 14511), using the - - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible approach. + + IBPSA.Fluid.HeatPumps.ModularReversible.Modular approach.

For more information on the approach, see @@ -48,4 +48,4 @@ https://www.beuth.de/de/norm/din-en-14511-1/298537524

")); -end ReversibleAirToWaterTableData2D; +end AirToWaterTableData2D; diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo index 4c367ff3cf..454d14ada1 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo @@ -270,10 +270,10 @@ equation

Used in - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible and - IBPSA.Fluid.Chillers.ModularReversible.ModularReversible, + \"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.Modular\"> + IBPSA.Fluid.HeatPumps.ModularReversible.Modular and + IBPSA.Fluid.Chillers.ModularReversible.Modular, the heat flow to or from the volume is calculated in a black-box. Thus the heat is directly added to the medium.

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo index 24be896398..386209419f 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo @@ -657,8 +657,8 @@ equation model for heat pumps and chillers, e.g. by IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.RefrigerantCycle - in - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible. + in + IBPSA.Fluid.HeatPumps.ModularReversible.Modular.

For more information on the approach, please read the diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleTableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialTableData2D.mo similarity index 96% rename from IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleTableData2D.mo rename to IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialTableData2D.mo index bf39f6ea48..8d9021cd64 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleTableData2D.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialTableData2D.mo @@ -1,7 +1,7 @@ within IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses; -partial model PartialReversibleTableData2D +partial model PartialTableData2D "Reversible heat pump based on 2D manufacturer data" - extends IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible( + extends IBPSA.Fluid.HeatPumps.ModularReversible.Modular( final use_rev=true, QCoo_flow_nominal=refCyc.refCycHeaPumCoo.QCooNoSca_flow_nominal*scaFacHea, dpEva_nominal=datTabHea.dpEva_nominal*scaFacHea^2, @@ -87,8 +87,8 @@ initial algorithm Heat pump based on two-dimensional data from manufacturer data, (e.g. based on EN 14511), using the - - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible approach. + + IBPSA.Fluid.HeatPumps.ModularReversible.Modular approach.

For more information on the approach, see @@ -152,4 +152,4 @@ https://www.beuth.de/de/norm/din-en-14511-1/298537524

")); -end PartialReversibleTableData2D; +end PartialTableData2D; diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo index f1c91ca23b..5dd162fae2 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo @@ -168,8 +168,8 @@ equation ", info="

Modular refrigerant cycle model for heat pump applications used in - the model - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible and extending models + the model + IBPSA.Fluid.HeatPumps.ModularReversible.Modular and extending models of the modular approach.

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantMachineControlBus.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantMachineControlBus.mo index 2c1c3c037e..4c2c6ee67c 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantMachineControlBus.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantMachineControlBus.mo @@ -9,10 +9,10 @@ expandable connector RefrigerantMachineControlBus

Used in the reversbile modular approaches for chiller and heat pump in the models - - IBPSA.Fluid.Chillers.ModularReversible.ModularReversible and - - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible. + + IBPSA.Fluid.Chillers.ModularReversible.Modular and + + IBPSA.Fluid.HeatPumps.ModularReversible.Modular.

", revisions=" ")); -end ReversibleCarnotWithLosses; +end CarnotWithLosses; diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericAirToWater.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericAirToWater.mo index 6457d66e42..125d30875b 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericAirToWater.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericAirToWater.mo @@ -14,8 +14,8 @@ record GenericAirToWater

This record allows specific selection using choicesAllMatching for air-to-water heat pumps only in models such as - - IBPSA.Fluid.HeatPumps.ModularReversible.ReversibleAirToWaterTableData2D. + + IBPSA.Fluid.HeatPumps.ModularReversible.AirToWaterTableData2D.

")); end GenericAirToWater; diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo index c7479018b3..c9ec42c5b3 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo @@ -11,7 +11,7 @@ model AirToWater2D_OneRoomRadiator sou(use_T_in=true, redeclare package Medium = MediumAir)); - IBPSA.Fluid.HeatPumps.ModularReversible.ReversibleAirToWaterTableData2D + IBPSA.Fluid.HeatPumps.ModularReversible.AirToWaterTableData2D heaPum( redeclare package MediumCon = MediumWat, redeclare package MediumEva = MediumAir, @@ -80,8 +80,8 @@ equation Documentation(info="

This example demonstrates how to use the - - IBPSA.Fluid.HeatPumps.ModularReversible.ReversibleAirToWaterTableData2D + + IBPSA.Fluid.HeatPumps.ModularReversible.AirToWaterTableData2D heat pump model. Please check the associated documentation for further information.

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo index 41211b2981..d78031d0f8 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo @@ -10,7 +10,7 @@ model CarnotWithLosses_OneRoomRadiator parameter Real perHeaLos=0.1 "Percentage of heat losses in the heat exchangers to the nominal heating output"; - IBPSA.Fluid.HeatPumps.ModularReversible.ReversibleCarnotWithLosses heaPum( + IBPSA.Fluid.HeatPumps.ModularReversible.CarnotWithLosses heaPum( redeclare package MediumCon = MediumWat, redeclare package MediumEva = MediumWat, QHea_flow_nominal=Q_flow_nominal, @@ -74,8 +74,8 @@ equation Documentation(info="

This example demonstrates how to use the - - IBPSA.Fluid.HeatPumps.ModularReversible.ReversibleCarnotWithLosses + + IBPSA.Fluid.HeatPumps.ModularReversible.CarnotWithLosses heat pump model. Please check the associated documentation for further information.

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo index 94066d9b36..2c3619c6f7 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo @@ -16,7 +16,7 @@ model LargeScaleWaterToWater_OneRoomRadiator pumHeaPumSou( redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2 per)); - IBPSA.Fluid.HeatPumps.ModularReversible.ReversibleLargeScaleWaterToWater heaPum( + IBPSA.Fluid.HeatPumps.ModularReversible.LargeScaleWaterToWater heaPum( QHea_flow_nominal=Q_flow_nominal, use_intSafCtr=true, TConHea_nominal=TRadSup_nominal, @@ -63,8 +63,8 @@ equation info="

This example demonstrates how to use the - - IBPSA.Fluid.HeatPumps.ModularReversible.ReversibleLargeScaleWaterToWater + + IBPSA.Fluid.HeatPumps.ModularReversible.LargeScaleWaterToWater heat pump model. Please check the associated documentation for further information.

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo index e29794dfd7..410d6b8ef6 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo @@ -10,7 +10,7 @@ model Modular_OneRoomRadiator booToReaPumEva(realTrue=heaPum.mEva_flow_nominal)); extends Modelica.Icons.Example; - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible heaPum( + IBPSA.Fluid.HeatPumps.ModularReversible.Modular heaPum( redeclare package MediumCon = MediumWat, redeclare package MediumEva = MediumAir, QHea_flow_nominal=Q_flow_nominal, @@ -84,8 +84,8 @@ equation annotation (Documentation(info="

This example demonstrates how to use the - - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible + + IBPSA.Fluid.HeatPumps.ModularReversible.Modular heat pump model directly. Please check the associated documentation for further information.

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/ReversibleLargeScaleWaterToWater.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo similarity index 91% rename from IBPSA/Fluid/HeatPumps/ModularReversible/ReversibleLargeScaleWaterToWater.mo rename to IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo index 69075805a2..f5c10ae548 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/ReversibleLargeScaleWaterToWater.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo @@ -1,7 +1,7 @@ within IBPSA.Fluid.HeatPumps.ModularReversible; -model ReversibleLargeScaleWaterToWater +model LargeScaleWaterToWater "Model with automatic parameter estimation for large scale water-to-water heat pumps" - extends IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.PartialReversibleTableData2D( + extends IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.PartialTableData2D( redeclare package MediumCon = IBPSA.Media.Water, redeclare package MediumEva = IBPSA.Media.Water, final mCon_flow_nominal=autCalMasCon_flow, @@ -22,8 +22,8 @@ model ReversibleLargeScaleWaterToWater

Contrary to the standard sizing approach for the - - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible models, + + IBPSA.Fluid.HeatPumps.ModularReversible.Modular models, the parameters are based on an automatic estimation as described in IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.LargeScaleWaterToWaterDeclarations. @@ -53,4 +53,4 @@ model ReversibleLargeScaleWaterToWater ")); -end ReversibleLargeScaleWaterToWater; +end LargeScaleWaterToWater; diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/ModularReversible.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Modular.mo similarity index 99% rename from IBPSA/Fluid/HeatPumps/ModularReversible/ModularReversible.mo rename to IBPSA/Fluid/HeatPumps/ModularReversible/Modular.mo index 2f1b83e34f..7219a8c997 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/ModularReversible.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Modular.mo @@ -1,5 +1,5 @@ within IBPSA.Fluid.HeatPumps.ModularReversible; -model ModularReversible +model Modular "Grey-box model for reversible heat pumps" extends IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.PartialReversibleRefrigerantMachine( @@ -133,4 +133,4 @@ equation IBPSA.Fluid.HeatPumps.ModularReversible.UsersGuide.

")); -end ModularReversible; +end Modular; diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/UsersGuide.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/UsersGuide.mo index f0af8f2e96..690daa6a97 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/UsersGuide.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/UsersGuide.mo @@ -86,8 +86,8 @@ package UsersGuide
Heat pump models

-For heat pumps, the model -IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible extends the partial model and adds +For heat pumps, the model +IBPSA.Fluid.HeatPumps.ModularReversible.Modular extends the partial model and adds the connector hea to choose between the operation modes of the heat pump:

@@ -115,24 +115,24 @@ to the section Refrigerant cycle models.

Chiller models

-For chillers, the model -IBPSA.Fluid.Chillers.ModularReversible.ModularReversible extends the partial model and adds +For chillers, the model +IBPSA.Fluid.Chillers.ModularReversible.Modular extends the partial model and adds the connector coo to choose between the operation mode of the chiller:

@@ -164,8 +164,8 @@ to the section Refrigerant cycle models. IBPSA.Fluid.Chillers.ModularReversible.LargeScaleWaterToWater
  • - - IBPSA.Fluid.Chillers.ModularReversible.ReversibleCarnotWithLosses + + IBPSA.Fluid.Chillers.ModularReversible.CarnotWithLosses
    • diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/PartialValidation.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/PartialValidation.mo index 7759ab420b..bbfcccf577 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/PartialValidation.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/PartialValidation.mo @@ -27,7 +27,7 @@ partial model PartialValidation extent={{-11,11},{11,-11}}, rotation=0, origin={-31,11}))); - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible heaPum( + IBPSA.Fluid.HeatPumps.ModularReversible.Modular heaPum( redeclare final package MediumCon = MediumSin, redeclare final package MediumEva = MediumSou, final use_intSafCtr=false, diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialModularComparison.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialModularComparison.mo index 4205319625..72435f8fbe 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialModularComparison.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialModularComparison.mo @@ -9,7 +9,7 @@ partial model PartialModularComparison sou2(nPorts=1), sin1(nPorts=1)); - IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversible heaPum( + IBPSA.Fluid.HeatPumps.ModularReversible.Modular heaPum( redeclare final package MediumCon = Medium1, redeclare final package MediumEva = Medium2, QHea_flow_nominal=QUse_flow_nominal, diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/package.order b/IBPSA/Fluid/HeatPumps/ModularReversible/package.order index 172071d310..e7884cd06f 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/package.order +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/package.order @@ -1,8 +1,8 @@ UsersGuide -ModularReversible -ReversibleAirToWaterTableData2D -ReversibleCarnotWithLosses -ReversibleLargeScaleWaterToWater +AirToWaterTableData2D +CarnotWithLosses +LargeScaleWaterToWater +Modular Controls RefrigerantCycle Data