Skip to content

Commit

Permalink
Rename useConstantHeater to use_constantHeater to comply with the IBP…
Browse files Browse the repository at this point in the history
…SA naming conventions.
  • Loading branch information
jelgerjansen committed Sep 15, 2023
1 parent 59b6d11 commit 9ddbbde
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo
Original file line number Diff line number Diff line change
@@ -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}})));
Expand Down

0 comments on commit 9ddbbde

Please sign in to comment.