Skip to content

Commit 6ec99ec

Browse files
JayHuLBLJayHuLBL
committed
Propagated IBPSA changes
1 parent d94bbc8 commit 6ec99ec

5 files changed

Lines changed: 39 additions & 12 deletions

File tree

‎Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within Buildings.BoundaryConditions.WeatherData;
2-
block ReaderTMY3 "Reader for TMY3 weather data"
2+
model ReaderTMY3 "Reader for TMY3 weather data"
33

44
Bus weaBus "Weather data bus" annotation (Placement(transformation(extent={{
55
290,-10},{310,10}}), iconTransformation(extent={{190,-10},{210,10}})));
@@ -1614,6 +1614,11 @@ Technical Report, NREL/TP-581-43156, revised May 2008.
16141614
</html>", revisions="<html>
16151615
<ul>
16161616
<li>
1617+
April 8, 2026, by Jianjun Hu:<br/>
1618+
Changed the class type from block to model.<br/>
1619+
This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2091\">IBPSA, #2091</a>.
1620+
</li>
1621+
<li>
16171622
May 28, 2025, by Fabian Wuellhorst:<br/>
16181623
Added information on AixWeather to documentation.<br/>
16191624
This is for

‎Buildings/Controls/OBC/CDL/Reals/PID.mo‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ block PID
6060
"Gain for proportional control action"
6161
annotation (Placement(transformation(extent={{-50,130},{-30,150}})));
6262
Buildings.Controls.OBC.CDL.Reals.IntegratorWithReset I(
63+
y(nominal=max(abs(yMax), abs(yMin))),
6364
final k=k/Ti,
6465
final y_start=xi_start) if with_I
6566
"Integral term"
@@ -479,6 +480,12 @@ American Society of Heating Refrigerating and Air-Conditioning Engineers Inc. At
479480
revisions="<html>
480481
<ul>
481482
<li>
483+
April 13, 2026, by Michael Wetter:<br/>
484+
Added value for <code>nominal</code> attribute for integrator state <code>I.y</code><br/>
485+
This is for
486+
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2106\">IBPSA, issue 2106</a>.
487+
</li>
488+
<li>
482489
October 23, 2023, by Michael Wetter:<br/>
483490
Added value of control output <code>y</code> to icon.
484491
</li>

‎Buildings/Controls/OBC/CDL/Reals/PIDWithReset.mo‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ block PIDWithReset
6565
"Proportional action"
6666
annotation (Placement(transformation(extent={{-50,130},{-30,150}})));
6767
Buildings.Controls.OBC.CDL.Reals.IntegratorWithReset I(
68+
y(nominal=max(abs(yMax), abs(yMin))),
6869
final k=k/Ti,
6970
final y_start=xi_start) if with_I
7071
"Integral term"
@@ -482,6 +483,12 @@ American Society of Heating Refrigerating and Air-Conditioning Engineers Inc. At
482483
revisions="<html>
483484
<ul>
484485
<li>
486+
April 13, 2026, by Michael Wetter:<br/>
487+
Added value for <code>nominal</code> attribute for integrator state <code>I.y</code><br/>
488+
This is for
489+
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2106\">IBPSA, issue 2106</a>.
490+
</li>
491+
<li>
485492
October 23, 2023, by Michael Wetter:<br/>
486493
Added value of control output <code>y</code> to icon.
487494
</li>

‎Buildings/Fluid/HeatPumps/ModularReversible/UsersGuide.mo‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ package UsersGuide
4040
They may be on/off and inverter driven;
4141
</li>
4242
<li>
43-
They are able to reverse the operation between heating and cooling,
43+
They are able to reverse the operation between heating and cooling,
4444
and some systems even provide simultaneous heating and cooling capabilities;
4545
</li>
4646
<li>
@@ -117,8 +117,8 @@ to the section <b>Refrigerant cycle models</b>.
117117
<ul>
118118
<li>
119119
<a href=\"modelica://Buildings.Fluid.HeatPumps.ModularReversible.TableData2DLoadDep\">
120-
Buildings.Fluid.HeatPumps.ModularReversible.TableData2DLoadDep</a>:
121-
This is the recommended model for energy simulation and any use case where detailed
120+
Buildings.Fluid.HeatPumps.ModularReversible.TableData2DLoadDep</a>:
121+
This is the recommended model for energy simulation and any use case where detailed
122122
modeling of the heat pump onboard controls is not required.
123123
</li>
124124
<li>
@@ -168,8 +168,8 @@ to the section <b>Refrigerant cycle models</b>.
168168
<ul>
169169
<li>
170170
<a href=\"modelica://Buildings.Fluid.Chillers.ModularReversible.TableData2DLoadDep\">
171-
Buildings.Fluid.Chillers.ModularReversible.TableData2DLoadDep</a>:
172-
This is the recommended model for energy simulation and any use case where detailed
171+
Buildings.Fluid.Chillers.ModularReversible.TableData2DLoadDep</a>:
172+
This is the recommended model for energy simulation and any use case where detailed
173173
modeling of the chiller onboard controls is not required.
174174
</li>
175175
<li>
@@ -300,7 +300,7 @@ The following table summarizes the possible options.
300300
301301
<p>
302302
Prefatory note: This section only applies to the models that do not include
303-
onboard controls. The models that include onboard controls, such as
303+
onboard controls. The models that include onboard controls, such as
304304
<a href=\"modelica://Buildings.Fluid.HeatPumps.ModularReversible.TableData2DLoadDep\">
305305
Buildings.Fluid.HeatPumps.ModularReversible.TableData2DLoadDep</a>,
306306
rather expose a connector <code>THwSet</code> or <code>TChwSet</code> representing
@@ -382,11 +382,11 @@ the HW or CHW temperature setpoint.
382382
the third dimension of the performance sensitivity is captured using
383383
the part load ratio as a proxy variable for the actual capacity modulation observable.
384384
This allows a unified modeling of various technologies such as
385-
modulating the compressor speed, throttling the inlet guide vanes
385+
modulating the compressor speed, throttling the inlet guide vanes
386386
or staging a varying number of compressors.
387387
This approach does not rely on any third-party dependency and is fully
388388
supported by the existing classes from the Modelica Standard Library.
389-
It is implemented in the modular heat pump and chiller models named
389+
It is implemented in the modular heat pump and chiller models named
390390
<code>TableData2DLoadDep</code>.
391391
</p>
392392

‎Buildings/Media/Antifreeze/EthyleneGlycolWater.mo‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ package EthyleneGlycolWater
2727
constant Modelica.Units.SI.Temperature property_T
2828
"Temperature for evaluation of constant fluid properties";
2929
constant Modelica.Units.SI.MassFraction X_a
30-
"Mass fraction of propylene glycol in water";
30+
"Mass fraction of ethylene glycol in water";
3131

3232
redeclare model BaseProperties "Base properties"
3333
Temperature T(stateSelect=
@@ -107,7 +107,7 @@ protected
107107
constant Modelica.Units.SI.MassFraction X_a_min=0.
108108
"Minimum allowed mass fraction of ethylene glycol in water";
109109
constant Modelica.Units.SI.MassFraction X_a_max=0.6
110-
"Maximum allowed mass fraction of propylene glycol in water";
110+
"Maximum allowed mass fraction of ethylene glycol in water";
111111

112112
// Fluid constants based on pure Ethylene Glycol
113113
constant Modelica.Media.Interfaces.Types.Basic.FluidConstants[1]
@@ -157,7 +157,7 @@ protected
157157
annotation (
158158
Documentation(info="<html>
159159
<p>
160-
Density of propylene antifreeze-water mixture at specified mass fraction
160+
Density of ethylene antifreeze-water mixture at specified mass fraction
161161
and temperature, based on Melinder (2010).
162162
</p>
163163
<h4>References</h4>
@@ -170,6 +170,10 @@ protected
170170
revisions="<html>
171171
<ul>
172172
<li>
173+
April 14, 2026, by Michael Wetter:<br/>
174+
Corrected typo in documentation.
175+
</li>
176+
<li>
173177
May 2, 2018 by Massimo Cimmino:<br/>
174178
First implementation.
175179
This function is used by
@@ -465,6 +469,10 @@ a temperature of <i>20</i> &deg;C and a mass fraction of <i>0.40</i>):
465469
</html>", revisions="<html>
466470
<ul>
467471
<li>
472+
April 14, 2026, by Michael Wetter:<br/>
473+
Corrected typo in documentation.
474+
</li>
475+
<li>
468476
August 05, 2020, by Wen HU:<br/>
469477
First implementation.
470478
</li>

0 commit comments

Comments
 (0)