minor annotation fixes, fix missing input, add doc

ibpsa · Nov 14, 2023 · 82ffd5f · 82ffd5f
1 parent 2eccb26
commit 82ffd5f
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 12 deletions.
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/package.mo b/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/package.mo
@@ -1,4 +1,10 @@
 within IBPSA.Fluid.Chillers.ModularReversible.Validation;
 package BaseClasses "Package with partial validation models"
 extends Modelica.Icons.BasesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains partial models for comparative validation.
+</p>
+</html>"));
 end BaseClasses;
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Validation/package.mo b/IBPSA/Fluid/Chillers/ModularReversible/Validation/package.mo
@@ -1,4 +1,13 @@
 within IBPSA.Fluid.Chillers.ModularReversible;
 package Validation "Package for model validation"
   extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models that validate the modular reversible chiller models
+using comparative validation against the carnot model:
+<a href=\"modelica://IBPSA.Fluid.Chillers.Examples.Carnot_y\">
+IBPSA.Fluid.Chillers.Examples.Carnot_y</a>
+</p>
+</html>"));
 end Validation;
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo
@@ -158,14 +158,14 @@ equation
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=is_con),
+          visible=isCon),
         Rectangle(
           extent={{44,-4},{100,5}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=is_con),
+          visible=isCon),
         Line(
           points={{0,-96},{0,-50},{0,-46}},
           color={0,0,0},
@@ -242,14 +242,14 @@ equation
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=not is_con),
+          visible=not isCon),
         Rectangle(
           extent={{43,5},{106,-4}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=not is_con),
+          visible=not isCon),
         Text(
           extent={{-100,-100},{100,-60}},
           textColor={28,108,200},

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
@@ -48,8 +48,8 @@ partial model PartialReversibleRefrigerantMachine
     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_internalSafetyControl, group="Safety Control"),
+    "Safety control parameters" annotation (Dialog(enable=use_intSafCtr,
+    group="Safety Control"),
       choicesAllMatching=true);
   //Condenser
   parameter Modelica.Units.SI.Time tauCon=30
@@ -349,8 +349,8 @@ partial model PartialReversibleRefrigerantMachine
 
 // To avoid using the bus, set the section below to protected
 // <!-- @include_Buildings @include_IDEAS @include_BuildingSystems
-protected
 // -->
+protected
   RefrigerantMachineControlBus sigBus
     "Bus with model outputs and possibly inputs" annotation (Placement(transformation(
           extent={{-120,-60},{-90,-26}}), iconTransformation(extent={{-108,-52},
@@ -363,8 +363,8 @@ protected
           use_intSafCtr));
 
 // <!-- @include_AixLib
-protected
 // -->
+protected
   parameter Real scaFac "Scaling factor";
   parameter MediumCon.ThermodynamicState staCon_nominal=MediumCon.setState_pTX(
       T=MediumCon.T_default, p=MediumCon.p_default, X=MediumCon.X_default)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/BoundaryMap.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/BoundaryMap.mo
@@ -120,7 +120,7 @@ equation
     coordinateSystem(preserveAspectRatio=false,
     extent={{-100,-100},{100,100}}), graphics={
                                     Line(points=DynamicSelect(
-      {{-66,-66},{-66,50},{-44,66}, {68,66},{68,-66},{-66,-66}},points),
+      {{-66,-66},{-66,50},{-44,66}, {68,66},{68,-66},{-66,-66}},poi),
       color={238,46,47},
       thickness=0.5),
   Polygon(

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mo
@@ -52,6 +52,11 @@ model Safety "Example for usage of all safety controls"
   Modelica.Blocks.Sources.Pulse mEvaEmu_flow(amplitude=1, period=100)
     "Emulator for evaporator mass flow rate"
     annotation (Placement(transformation(extent={{-20,-100},{0,-80}})));
+  Modelica.Blocks.Sources.BooleanConstant conHea(final k=true)
+    "Constant heating mode" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-90,70})));
 equation
   connect(safCtr.sigBus, sigBus) annotation (Line(
       points={{0.0833333,3.91667},{-50,3.91667},{-50,-52}},
@@ -109,6 +114,12 @@ equation
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
+  connect(conHea.y, sigBus.hea) annotation (Line(points={{-79,70},{-50,70},{-50,
+          -52}}, color={255,0,255}), Text(
+      string="%second",
+      index=1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
   annotation (Documentation(info="<html>
 <p>
   This example shows the usage and effect of

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo
@@ -78,7 +78,7 @@ record WAMAK_WaterToWater_220kW "220 kW water to water with R513A"
 <p>
 WAMAK, Produktblatt ver. 2023/24.
 <a href=\"https://products.wamak.eu/combine.php?&amp;ampcoverpg&amp;ampdescriptmrktadv&amp;amplang=de-DE&amp;ampcode_id=WAHDR2XE\">
-https://products.wamak.eu/combine.php?&amp;ampcoverpg&amp;ampdescriptmrktadv&amp;amplang=de-DE&amp;ampcode_id=WAHDR2XE\</a>.
+https://products.wamak.eu/combine.php?&amp;ampcoverpg&amp;ampdescriptmrktadv&amp;amplang=de-DE&amp;ampcode_id=WAHDR2XE</a>.
 </p>
 </html>", revisions="<html>
 <ul><li>

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo
@@ -52,7 +52,7 @@ model LargeScaleWaterToWater
     final tabLowCoo=datTab.tabUppBou,
     final use_TUseSidOut=datTab.use_TConOutForOpeEnv,
     final use_TAmbSidOut=datTab.use_TEvaOutForOpeEnv) "Safety control parameters"
-    annotation (Dialog(enable=use_internalSafetyControl, group="Safety Control"),
+    annotation (Dialog(enable=use_intSafCtr, group="Safety Control"),
       choicesAllMatching=true);
     // Lower boundary has no influence as use_rev=false
   annotation (Documentation(info="<html>

diff --git a/...Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo b/...Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
@@ -43,7 +43,7 @@ partial model PartialRefrigerantCycle
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.Frosting.BaseClasses.PartialIcingFactor
     "Replaceable model to calculate the icing factor" annotation (
     choicesAllMatching=true,
-    Dialog(group="Frosting supression", enable=calc_iceFac),
+    Dialog(group="Frosting supression"),
     Placement(transformation(extent={{-100,-52},{-80,-32}})));
 
   Modelica.Blocks.Interfaces.RealOutput PEle(final unit="W", final displayUnit=