Skip to content

Commit

Permalink
Issue3479 misc fix (#3480)
Browse files Browse the repository at this point in the history
* fixed typo in Buildings.Fluid.FMI.UsersGuide

* improved mover model assert messages

* moved connection line to void overlapping

The connection line out of returnAir is moved because it overlapped with many other lines. Also slightly moved the fan to straighten connection lines. Slightly moved another connection line out of the chiller so that it is not so close to another line.

* fixed typo in equation

Corrected an equation in documentaiton where dT should be T. Also rewrote a sentence for clarity. And fixed another minor documentation typo.

* fixed typo

* fixed broken mos that caused missing figure

* corrected mos to remove empty subplot
  • Loading branch information
hcasperfu authored Aug 24, 2023
1 parent 675801b commit 3dd4a0c
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 56 deletions.
20 changes: 10 additions & 10 deletions Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ model ChillerDXHeatingEconomizer
final use_inputFilter=false,
redeclare package Medium = MediumA)
"Supply fan"
annotation (Placement(transformation(extent={{-30,32},{-10,52}})));
annotation (Placement(transformation(extent={{-30,30},{-10,50}})));
Buildings.Fluid.FixedResistances.PressureDrop totalRes(
final m_flow_nominal=mAir_flow_nominal,
final dp_nominal=dp_nominal,
Expand Down Expand Up @@ -370,9 +370,9 @@ protected
end IdealValve;

equation
connect(fanSup.port_b, totalRes.port_a) annotation (Line(points={{-10,42},
{0,42},{0,40},{10,40}}, color={0,127,255}));
connect(fanSup.P, PFan) annotation (Line(points={{-9,51},{-6,51},{-6,150},{
connect(fanSup.port_b, totalRes.port_a) annotation (Line(points={{-10,40},
{10,40}}, color={0,127,255}));
connect(fanSup.P, PFan) annotation (Line(points={{-9,49},{-6,49},{-6,150},{
210,150}}, color={0,0,127}));
connect(eff.y, QHea_flow) annotation (Line(points={{141,110},{166,110},{166,
130},{210,130}},
Expand All @@ -385,7 +385,7 @@ equation
index=-1,
extent={{-6,3},{-6,3}}));
connect(senTMixAir.port_b, fanSup.port_a) annotation (Line(points={{-40,40},
{-36,40},{-36,42},{-30,42}}, color={0,127,255}));
{-30,40}}, color={0,127,255}));
connect(heaCoi.Q_flow, eff.u) annotation (Line(points={{73,46},{80,46},{80,
110},{118,110}}, color={0,0,127}));
connect(heaCoi.port_b, cooCoi.port_a2) annotation (Line(points={{72,40},{90,40}}, color={0,127,255}));
Expand All @@ -410,7 +410,7 @@ equation
extent={{-6,3},{-6,3}}));
connect(pumChiWat.P, PPum) annotation (Line(points={{111,-79},{111,-52},{180,
-52},{180,90},{210,90}}, color={0,0,127}));
connect(chi.P, PCoo) annotation (Line(points={{89,-177},{84,-177},{84,-128},{
connect(chi.P, PCoo) annotation (Line(points={{89,-177},{80,-177},{80,-128},{
98,-128},{98,-50},{178,-50},{178,110},{210,110}},
color={0,0,127}));
connect(ideVal.port_2, chi.port_a2) annotation (Line(points={{86,0.2},{86,-162},{90,-162}},
Expand All @@ -425,7 +425,7 @@ equation
connect(senTSup.port_b, supplyAir) annotation (Line(points={{148,40},{174,40},
{174,60},{202,60}}, color={0,127,255}));
connect(gaiFan.y, fanSup.m_flow_in) annotation (Line(points={{-59,140},{
-20,140},{-20,54}}, color={0,0,127}));
-20,140},{-20,52}}, color={0,0,127}));
connect(booToInt.y, pumChiWat.m_flow_in) annotation (Line(points={{81,-90},{108,-90}}, color={0,0,127}));
connect(booToInt.u, chiOn) annotation (Line(points={{58,-90},{40,-90},{40,-120},
{-220,-120}}, color={255,0,255}));
Expand Down Expand Up @@ -455,10 +455,10 @@ equation
connect(TRet, senTRetAir.T) annotation (Line(points={{210,-80},{174,-80},{174,
-20},{-30,-20},{-30,-29}}, color={0,0,127}));
connect(senTRetAir.port_a, senTraSub.port_b) annotation (Line(points={{-20,-40},{20,-40}}, color={0,127,255}));
connect(senTraSub.port_a, returnAir) annotation (Line(points={{40,-40},{120,-40},{120,-20},{202,-20}},
color={0,127,255}));
connect(senTraSub.port_a, returnAir) annotation (Line(points={{40,-40},{192,
-40},{192,-20},{202,-20}}, color={0,127,255}));

connect(fanSup.y_actual, y_actual) annotation (Line(points={{-9,49},{0,49},{0,
connect(fanSup.y_actual, y_actual) annotation (Line(points={{-9,47},{0,47},{0,
172},{210,172}}, color={0,0,127}));
annotation (defaultComponentName="chiDXHeaEco",
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-200,-220},
Expand Down
8 changes: 4 additions & 4 deletions Buildings/Experimental/DHC/Loads/BaseClasses/SimpleRoomODE.mo
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ infiltration and ventilation) is assessed from the steady-state energy balance
at heating nominal conditions as
</p>
<p style=\"font-style:italic;\">
0 = Q&#775;<sub>heating, nom</sub> + G (dT<sub>out, heating, nom</sub> - T<sub>ind, heating, nom</sub>).
0 = Q&#775;<sub>heating, nom</sub> + G (T<sub>out, heating, nom</sub> - T<sub>ind, heating, nom</sub>).
</p>
<p>
Note that it is important for the model representativeness that
Q&#775;<sub>heating, nom</sub> be evaluated in close to steady-state conditions
Note that for model representativeness, it is important
for Q&#775;<sub>heating, nom</sub> to be evaluated in close to steady-state conditions
with no internal heat gains and no solar heat gains.
</p>
<p>
Expand All @@ -91,7 +91,7 @@ G (T<sub>out</sub> - T<sub>ind, set</sub>) +
Q&#775;<sub>various</sub>,
</p>
<p>
where <i>Q&#775;<sub>various</sub></i> represent the miscellaneous heat gains.
where <i>Q&#775;<sub>various</sub></i> represents the miscellaneous heat gains.
The indoor temperature variation rate due to an unmet load is given by
</p>
<p style=\"font-style:italic;\">
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Fluid/CHPs/ThermalElectricalFollowing.mo
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ model ThermalElectricalFollowing "CHP model that can be thermal or electrical lo
final Td=Td,
final yMax=1,
final yMin=0) if switchThermalElectricalFollowing
"Cooling water outplet controller"
"Cooling water outlet controller"
annotation (Placement(transformation(extent={{-60,340},{-40,360}})));
Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter elePowDem(
final k=per.PEleMax) if switchThermalElectricalFollowing
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Fluid/FMI/UsersGuide.mo
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ The model
<a href=\"modelica://Buildings.Fluid.Movers.FlowControlled_m_flow\">
Buildings.Fluid.Movers.FlowControlled_m_flow</a>
cannot be exported as an FMU.
This is because it assignes the mass flow rate.
This is because it assigns the mass flow rate.
However, the input connector
<a href=\"modelica://Buildings.Fluid.FMI.Interfaces.Inlet\">
Buildings.Fluid.FMI.Interfaces.Inlet</a>
Expand Down
6 changes: 4 additions & 2 deletions Buildings/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,8 @@ Set nominalValuesDefineDefaultPressureCurve=true to suppress this warning.",
"*** Warning in " + getInstanceName() +
": Mover has per.etaHydMet=.Power_VolumeFlowRate or per.etaHydMet=.EulerNumber.
This requires per.pressure to be provided.
Because it is not, the model overrides this setting by using per.etaHydMet=.NotProvided.",
Because it is not, the model overrides this setting by using per.etaHydMet=.NotProvided.
Also consider using models under Movers.Preconfigured which autopopulate a pressure curve.",
level=AssertionLevel.warning);

assert(per.havePressureCurve or per.haveWMot_nominal or
Expand All @@ -433,7 +434,8 @@ Because it is not, the model overrides this setting by using per.etaHydMet=.NotP
"*** Warning in " + getInstanceName() +
": Mover has per.etaMotMet=.Efficiency_MotorPartLoadRatio or per.etaMotMet=.GenericCurve.
This requires per.WMot_nominal or per.pressure to be provided. Because neither is provided,
the model overrides this setting and by using per.etaMotMet=.NotProvided.",
the model overrides this setting and by using per.etaMotMet=.NotProvided.
Also consider using models under Movers.Preconfigured which autopopulate a pressure curve.",
level=AssertionLevel.warning);

assert(per.powerOrEfficiencyIsHydraulic or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
simulateModel("Buildings.Fluid.HeatExchangers.Validation.HeaterCooler_u", method="CVode", tolerance=1e-6, stopTime=1200, resultFile="HeaterCooler_u");
createPlot(id = 1,
position = {78, 39, 400, 444},
y = {"con1.u_s", "con1.u_m", "con2.u_m"},
range = {0.0, 1200.0, 35.0, 15.0},
autoscale = true,
autoerase = true,
autoreplot = true,
grid = true,
color = true,
leftTitleType = 1,
bottomTitleType = 1);
createPlot(id = 20,
position = {78, 39, 400, 219},
y = {"con1.y", "con2.y"},
range = {0.0, 1200.0, 1.5, -0.5},
autoscale = true,
autoerase = true,
autoreplot = true,
grid = true,
color = true,
subPlot = 2,
leftTitleType = 1,
bottomTitleType = 1);
createPlot(id=1,
position={125, 65, 400, 447},
y={"con1.u_s", "con1.u_m", "con2.u_m"},
range={0.0, 1200.0, 290.0, 305.0},
grid=true,
subPlot=101,
colors={{28,108,200}, {238,46,47}, {0,140,72}},
timeUnit="s");
createPlot(id=1,
position={125, 65, 400, 447},
y={"con1.y", "con2.y"},
range={0.0, 1200.0, -0.5, 1.5},
grid=true,
subPlot=102,
colors={{28,108,200}, {238,46,47}},
timeUnit="s");

Original file line number Diff line number Diff line change
@@ -1,37 +1,45 @@
simulateModel("Buildings.Fluid.Storage.Validation.StratifiedLoadingUnloading", tolerance=1e-6, stopTime=14400, method="CVode", resultFile="StratifiedLoadingUnloading");
createPlot(id = 1,
position = {10, 30, 719, 600},
filename = "StratifiedLoadingUnloading.mat",
y = {"tanEnh.vol[1].T", "tanEnh.vol[2].T", "tanEnh.vol[3].T", "tanEnh.vol[4].T", "tanEnh.vol[5].T", "tanEnh.vol[6].T", "tanEnh.vol[7].T"},
range = {0, 15000.0, 55.0, 15.0},
createPlot(id=1,
position={10, 30, 719, 603},
y={"tanEnh.vol[1].T", "tanEnh.vol[2].T", "tanEnh.vol[3].T", "tanEnh.vol[4].T", "tanEnh.vol[5].T", "tanEnh.vol[6].T", "tanEnh.vol[7].T"},
range={0.0, 15000.0, 10.0, 50.0},
subPlot=101,
colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}},
timeUnit="s",
displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"},
autoscale = true,
autoerase = true,
autoreplot = true,
grid = true,
color = true,
leftTitleType = 1,
bottomTitleType = 1);
createPlot(id = 1,
position = {10, 30, 719, 200},
y = {"dHTan.y", "dHTanEnh.y"},
range = {0, 14500.0, 60.0, 10.0},
createPlot(id=1,
position={10, 30, 719, 603},
y={"dHTan.y", "dHTanEnh.y"},
range={0.0, 15000.0, -5000000.0, 10000000.0},
subPlot=102,
colors={{28,108,200}, {238,46,47}},
timeUnit="s",
autoscale = true,
autoerase = true,
autoreplot = true,
grid = true,
color = true,
subPlot = 3,
leftTitleType = 1,
bottomTitleType = 1);
createPlot(id = 1,
position = {10, 30, 719, 200},
y = {"tan.vol[1].T", "tan.vol[2].T", "tan.vol[3].T", "tan.vol[4].T", "tan.vol[5].T", "tan.vol[6].T", "tan.vol[7].T"},
range = {0, 14500.0, 60.0, 10.0},
createPlot(id=1,
position={10, 30, 719, 603},
y={"tan.vol[1].T", "tan.vol[2].T", "tan.vol[3].T", "tan.vol[4].T", "tan.vol[5].T","tan.vol[6].T", "tan.vol[7].T"},
range={0.0, 15000.0, 10.0, 50.0},
subPlot=103,
colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}},
timeUnit="s",
displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"},
autoscale = true,
autoerase = true,
autoreplot = true,
grid = true,
color = true,
subPlot = 2,
leftTitleType = 1,
bottomTitleType = 1);

0 comments on commit 3dd4a0c

Please sign in to comment.