From 2204b81218fc9ae8c968a07f0a575b1a8af52db0 Mon Sep 17 00:00:00 2001 From: "fabian.wuellhorst" Date: Tue, 4 Feb 2025 13:41:46 +0100 Subject: [PATCH 1/2] fix typo in iceFacHPMea --- .../RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo index e52cab9aac..541ee1850f 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo @@ -11,7 +11,7 @@ partial model PartialHeatPumpCycle "Calculates evaporator heat flow with total energy balance" annotation ( Placement(transformation(extent={{-80,-20},{-60,0}}, rotation=0))); equation - connect(iceFacCal.iceFac, sigBus.icefacHPMea) annotation (Line(points={{-81.2, + connect(iceFacCal.iceFac, sigBus.iceFacHPMea) annotation (Line(points={{-81.2, -50},{-64,-50},{-64,-28},{-110,-28},{-110,120},{1,120}}, color={0,0,127}), Text( From 257c6dab97b4390b0b90e2334dd064dca10dae28 Mon Sep 17 00:00:00 2001 From: "fabian.wuellhorst" Date: Tue, 4 Feb 2025 13:43:01 +0100 Subject: [PATCH 2/2] Regroup Dialog annotations --- .../ConstantCarnotEffectiveness.mo | 3 ++- .../PartialReversibleRefrigerantMachine.mo | 27 +++++++++---------- .../BaseClasses/PartialCarnot.mo | 6 +++-- .../BaseClasses/PartialTableData2D.mo | 6 +++-- .../ConstantCarnotEffectiveness.mo | 3 ++- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo index 69af71c76c..c5da933d9e 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo @@ -18,7 +18,8 @@ model ConstantCarnotEffectiveness "Carnot EER with a constant Carnot effectivene min=0, final unit="1") = etaCarnot_nominal*(TEva_nominal - TAppEva_nominal)/( TCon_nominal + TAppCon_nominal - (TEva_nominal - TAppEva_nominal)) - "Nominal EER"; + "Nominal EER" + annotation(Dialog(group="Nominal condition")); Modelica.Blocks.Sources.Constant constNegOne(final k=-1) "Negative one to negative evaporator heat flow rate" annotation (Placement( diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo index 94359a289b..00136bb3a8 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo @@ -39,6 +39,19 @@ partial model PartialReversibleRefrigerantMachine "if use_rev=true, device data for cooling and heating need to entered. Set allowDifferentDeviceIdentifiers=true to allow different device identifiers devIde" annotation(Dialog(tab="Advanced", enable=use_rev)); + // Safety control + parameter Boolean use_intSafCtr=true + "=true to enable internal safety control" + annotation (Dialog(group="Safety control"), choices(checkBox=true)); + replaceable parameter + IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 safCtrPar + constrainedby + IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Generic + "Safety control parameters" annotation (Dialog(enable=use_intSafCtr, + group="Safety control"), + choicesAllMatching=true, + Placement(transformation(extent={{42,-18},{58,-2}}))); + //Condenser parameter Modelica.Units.SI.Time tauCon=30 "Condenser heat transfer time constant at nominal flow" @@ -130,20 +143,6 @@ partial model PartialReversibleRefrigerantMachine MediumEva.specificHeatCapacityCp(staEva_nominal) "Evaporator medium specific heat capacity"; - // Safety control - parameter Boolean use_intSafCtr=true - "=true to enable internal safety control" - annotation (Dialog(group="Safety control"), choices(checkBox=true)); - replaceable parameter - IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 safCtrPar - constrainedby - IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Generic - "Safety control parameters" annotation (Dialog(enable=use_intSafCtr, - group="Safety control"), - choicesAllMatching=true, - Placement(transformation(extent={{42,-18},{58,-2}}))); - - //Assumptions parameter Boolean allowFlowReversalEva=true "= false to simplify equations, assuming, but not enforcing, no flow reversal" diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo index 6b2095da40..f8f893d3bd 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo @@ -2,9 +2,11 @@ within IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses; partial model PartialCarnot "Model with components for Carnot efficiency calculation" parameter Boolean useForChi "=false to use in heat pump models"; - parameter Real etaCarnot_nominal=0.3 "Constant Carnot effectiveness"; + parameter Real etaCarnot_nominal=0.3 "Constant Carnot effectiveness" + annotation(Dialog(group="Nominal condition")); parameter Boolean use_constAppTem=false - "=true to fix approach temperatures at nominal values. This can improve simulation speed"; + "=true to fix approach temperatures at nominal values. This can improve simulation speed" + annotation(Dialog(group="Efficiency")); parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal(min=0) "Temperature difference between refrigerant and working fluid outlet in condenser" annotation (Dialog(group="Efficiency")); diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo index ecb83bca28..f9878d47be 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo @@ -10,10 +10,12 @@ partial model PartialTableData2D annotation (Dialog(group="Nominal condition")); parameter Modelica.Blocks.Types.Smoothness smoothness= Modelica.Blocks.Types.Smoothness.LinearSegments - "Smoothness of table interpolation"; + "Smoothness of table interpolation" + annotation(Dialog(group="Data handling")); parameter Modelica.Blocks.Types.Extrapolation extrapolation= Modelica.Blocks.Types.Extrapolation.LastTwoPoints - "Extrapolation of data outside the definition range"; + "Extrapolation of data outside the definition range" + annotation(Dialog(group="Data handling")); parameter Boolean use_TEvaOutForTab=true "=true to use evaporator outlet temperature, false for inlet"; parameter Boolean use_TConOutForTab=true diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo index a12b37052c..457a973f35 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo @@ -17,7 +17,8 @@ model ConstantCarnotEffectiveness "Carnot COP with a constant Carnot effectivene min=0, final unit="1") = etaCarnot_nominal*(TCon_nominal + TAppCon_nominal)/( TCon_nominal + TAppCon_nominal - (TEva_nominal - TAppEva_nominal)) - "Nominal coefficient of performance"; + "Nominal coefficient of performance" + annotation(Dialog(group="Nominal condition")); equation connect(pasThrYMea.u, sigBus.yMea) annotation (Line(points={{18,70},{0,70},{0,