Skip to content

Commit e185022

Browse files
JayHuLBLJayHuLBL
committed
Merge branch 'master' into issue2884_PID_autotuning
2 parents bd9cc41 + 20754a3 commit e185022

405 files changed

Lines changed: 1432 additions & 5456 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/formatting.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: pip3 install --upgrade pip wheel
4141

4242
- name: "Install BuildingsPy"
43-
run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@0f21a33a8416149d6aa297e25c6e7dc11e1d21bd
43+
run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@v5.2.0
4444

4545
- name: Check for UTF-8 BOM
4646
run : |

‎.travis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
env:
3232
global:
3333
- DOCKER_REPONAME=lbnlblum
34-
- BUILDINGSPY_VERSION=BuildingsPy@0f21a33a8416149d6aa297e25c6e7dc11e1d21bd
34+
- BUILDINGSPY_VERSION=BuildingsPy@v5.2.0
3535
- OMC_VERSION=ubuntu-2204-omc:1.24.0-1
3636
- OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.55.11
3737
- DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64_rev-1
@@ -47,9 +47,9 @@ env:
4747
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Air,Examples}\""
4848
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Air,Examples}\""
4949
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Air,Examples}\""
50-
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
51-
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
52-
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
50+
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""
51+
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""
52+
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""
5353
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
5454
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
5555
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
@@ -161,7 +161,7 @@ install:
161161
export ENERGYPLUS_23_1_0=${ENERGYPLUS_23_1_0};
162162
pip3 install pandas==1.3.5;
163163
fi;
164-
- if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.DHC.{ETS,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
164+
- if [[ "$TEST_ARG" == *EnergyPlus_24_2_0* ]] || [[ "$TEST_ARG" == *Buildings.{Obsolete* ]] || [[ "$TEST_ARG" == *Buildings.DHC.{ETS,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
165165
echo "Installing Spawn binaries";
166166
Buildings/Resources/src/ThermalZones/install.py --binaries-for-os-only;
167167
fi;

‎Buildings/Fluid/Chillers/ModularReversible/Modular.mo‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@ model Modular
8282
extent={{-10,-10},{10,10}},
8383
rotation=0,
8484
origin={70,50})));
85+
Modelica.Blocks.Logical.Hysteresis hys(
86+
final uLow=0.001,
87+
final uHigh=ySet_small,
88+
final pre_y_start=false)
89+
"Outputs whether the device is on based on the relative speed"
90+
annotation (Placement(
91+
transformation(extent={{10,10},{-10,-10}}, rotation=180, origin={-110,-90})));
8592
equation
8693
connect(conCoo.y, sigBus.coo)
8794
annotation (Line(points={{-99,-130},{-76,-130},{-76,-40},{-138,-40},{-138,-42},
@@ -102,11 +109,23 @@ equation
102109
index=1,
103110
extent={{-6,3},{-6,3}},
104111
horizontalAlignment=TextAlignment.Right));
112+
connect(hys.y, sigBus.onOffMea) annotation (Line(points={{-99,-90},{-88,-90},
113+
{-88,-70},{-128,-70},{-128,-40},{-134,-40},{-134,-41},{-141,-41}},
114+
color={255,0,255}));
115+
connect(hys.u, sigBus.yMea) annotation (Line(points={{-122,-90},{-132,-90},{
116+
-132,-40},{-136,-40},{-136,-41},{-141,-41}},
117+
color={0,0,127}));
105118
annotation (Icon(coordinateSystem(extent={{-100,-100},{100,100}})),
106119
Diagram(coordinateSystem(extent={{-140,-160},{140,160}})),
107120
Documentation(revisions="<html>
108121
<ul>
109122
<li>
123+
February 25, 2025, by Antoine Gautier:<br/>
124+
Added hysteresis that was removed from base class.<br/>
125+
This is for
126+
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1977\">IBPSA #1977</a>.
127+
</li>
128+
<li>
110129
May 2, 2024, by Michael Wetter:<br/>
111130
Refactored check for device identifiers.<br/>
112131
This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1576\">IBPSA, #1576</a>.

‎Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,6 @@ partial model PartialReversibleRefrigerantMachine
313313
extent={{-10,10},{10,-10}},
314314
rotation=0)));
315315

316-
Modelica.Blocks.Logical.Hysteresis hys(
317-
final uLow=0.001,
318-
final uHigh=ySet_small,
319-
final pre_y_start=false) "Use default ySet value" annotation (Placement(
320-
transformation(extent={{10,10},{-10,-10}}, rotation=180,
321-
origin={-110,-90})));
322-
323316
RefrigerantCycleInertia refCycIneCon "Inertia model for condenser side"
324317
annotation(Placement(transformation(
325318
extent={{-10,-10},{10,10}},
@@ -491,9 +484,6 @@ equation
491484
string="%second",
492485
index=1,
493486
extent={{6,3},{6,3}}));
494-
connect(hys.y, sigBus.onOffMea) annotation (Line(points={{-99,-90},{-88,-90},{
495-
-88,-70},{-128,-70},{-128,-40},{-134,-40},{-134,-41},{-141,-41}},
496-
color={255,0,255}));
497487
connect(TConAmb, sigBus.TConAmbMea) annotation (Line(
498488
points={{-152,120},{-128,120},{-128,50},{-76,50},{-76,-42},{-78,-42},{-78,
499489
-41},{-141,-41}},
@@ -503,9 +493,6 @@ equation
503493
points={{-152,-130},{-130,-130},{-130,-110},{-76,-110},{-76,-41},{-141,-41}},
504494
color={0,0,127},
505495
pattern=LinePattern.Dash));
506-
connect(hys.u, sigBus.yMea) annotation (Line(points={{-122,-90},{-132,-90},{-132,
507-
-40},{-136,-40},{-136,-41},{-141,-41}},
508-
color={0,0,127}));
509496
connect(con.T, sigBus.TConOutMea) annotation (Line(points={{22.4,90},{38,90},{
510497
38,32},{-76,32},{-76,-40},{-140,-40},{-140,-41},{-141,-41}},
511498
color={0,0,127}));
@@ -697,6 +684,12 @@ equation
697684
This is for
698685
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1979\">IBPSA #1979</a>.
699686
</li>
687+
<li>
688+
<i>February 25, 2025</i> by Antoine Gautier:<br/>
689+
Removed hysteresis.<br/>
690+
This is for
691+
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1977\">IBPSA #1977</a>.
692+
</li>
700693
<li>
701694
<i>August 19, 2024</i> by Michael Wetter:<br/>
702695
Changed markup commands for code merge.<br/>

‎Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ record WAMAK_WaterToWater_220kW "220 kW water to water with R513A"
7777
<h4>References</h4>
7878
<p>
7979
WAMAK, Produktblatt ver. 2023/24.
80-
<a href=\"https://products.wamak.eu/combine.php?&amp;ampcoverpg&amp;ampdescriptmrktadv&amp;amplang=de-DE&amp;ampcode_id=WAHDR2XE\">
81-
https://products.wamak.eu/combine.php?&amp;ampcoverpg&amp;ampdescriptmrktadv&amp;amplang=de-DE&amp;ampcode_id=WAHDR2XE</a>.
80+
<a href=\"https://products.wamak.eu/\">
81+
WAMAK Product Sheets Application</a>.
8282
</p>
8383
</html>", revisions="<html>
8484
<ul><li>

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ model Modular
7474
"=true for heating, =false for cooling"
7575
annotation (Placement(transformation(extent={{-164,-82},{-140,-58}}),
7676
iconTransformation(extent={{-120,-30},{-102,-12}})));
77+
Modelica.Blocks.Logical.Hysteresis hys(
78+
final uLow=0.001,
79+
final uHigh=ySet_small,
80+
final pre_y_start=false)
81+
"Outputs whether the device is on based on the relative speed"
82+
annotation (Placement(
83+
transformation(extent={{10,10},{-10,-10}}, rotation=180, origin={-110,-90})));
7784
equation
7885
connect(conHea.y, sigBus.hea)
7986
annotation (Line(points={{-99,-130},{-76,-130},{-76,-40},{-140,-40},{-140,-41},
@@ -90,16 +97,27 @@ equation
9097
index=1,
9198
extent={{-6,3},{-6,3}},
9299
horizontalAlignment=TextAlignment.Right));
100+
connect(hys.y, sigBus.onOffMea) annotation (Line(points={{-99,-90},{-88,-90},
101+
{-88,-70},{-128,-70},{-128,-40},{-134,-40},{-134,-41},{-141,-41}},
102+
color={255,0,255}));
103+
connect(hys.u, sigBus.yMea) annotation (Line(points={{-122,-90},{-132,-90},{
104+
-132,-40},{-136,-40},{-136,-41},{-141,-41}},
105+
color={0,0,127}));
93106
annotation (Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
94107
Text(
95108
extent={{-100,-12},{-72,-30}},
96109
textColor={255,85,255},
97110
visible=not use_busConOnl and use_rev,
98111
textString="hea")}),
99112
Diagram(coordinateSystem(extent={{-140,-160},{140,160}})),
100-
Documentation(revisions="
101-
<html>
113+
Documentation(revisions="<html>
102114
<ul>
115+
<li>
116+
February 25, 2025, by Antoine Gautier:<br/>
117+
Added hysteresis that was removed from base class.<br/>
118+
This is for
119+
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1977\">IBPSA #1977</a>.
120+
</li>
103121
<li>
104122
May 2, 2024, by Michael Wetter:<br/>
105123
Refactored check for device identifiers.<br/>

‎Buildings/Obsolete/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo‎

Lines changed: 0 additions & 149 deletions
This file was deleted.

0 commit comments

Comments
 (0)