From 9ddbbde672168c532fa96e0ce64a203fd9a1ed3f Mon Sep 17 00:00:00 2001 From: jelgerjansen Date: Fri, 15 Sep 2023 16:44:49 +0200 Subject: [PATCH] Rename useConstantHeater to use_constantHeater to comply with the IBPSA naming conventions. --- IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo | 9 ++++----- IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo index 69363c8a9d..4f6207165d 100644 --- a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo +++ b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo @@ -6,7 +6,7 @@ model SimpleHouse4 "Heating model" "Nominal capacity of heating system"; parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=0.1 "Nominal mass flow rate for water loop"; - parameter Boolean useConstantHeater=true + parameter Boolean use_constantHeater=true "To enable/disable the connection between the constant source and heater"; IBPSA.Fluid.HeatExchangers.Radiators.RadiatorEN442_2 rad( @@ -49,10 +49,9 @@ equation -100},{49.75,-170},{90,-170}}, color={0,127,255})); connect(rad.heatPortCon, zon.heatPort) annotation (Line(points={{118,-92.8},{ 118,140},{110,140}}, color={191,0,0})); - connect(rad.heatPortRad, walCap.port) annotation (Line(points={{122,-92.8},{ - 122,-20},{130,-20},{130,1.77636e-15},{140,1.77636e-15}}, - color={191,0,0})); - if useConstantHeater then + connect(rad.heatPortRad, walCap.port) annotation (Line(points={{122,-92.8},{122, + -20},{130,-20},{130,1.77636e-15},{140,1.77636e-15}}, color={191,0,0})); + if use_constantHeater then connect(conHea.y, heaWat.u) annotation (Line(points={{59,-70},{50,-70},{50, -94},{58,-94}}, color={0,0,127})); end if; diff --git a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo index 98edea89a0..aa8c1a4202 100644 --- a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo +++ b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo @@ -1,7 +1,7 @@ within IBPSA.Examples.Tutorial.SimpleHouse; model SimpleHouse5 "Heating controller model" extends SimpleHouse4(pum(inputType=IBPSA.Fluid.Types.InputType.Stages, - massFlowRates=mWat_flow_nominal*{1}), final useConstantHeater=false); + massFlowRates=mWat_flow_nominal*{1}), final use_constantHeater=false); Modelica.Blocks.Math.BooleanToInteger booInt "Boolean to integer" annotation (Placement(transformation(extent={{0,-150},{20,-130}})));