Skip to content

Commit 7fd01b8

Browse files
jelgerjansenjelgerjansen
authored
Merge pull request #1459 from lucasverleyen/ibpsa_merged
IBPSA merge
2 parents 2fc6e69 + a19c13f commit 7fd01b8

File tree

1,081 files changed

+75608
-24966
lines changed

Some content is hidden

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

1,081 files changed

+75608
-24966
lines changed

‎IDEAS/.copiedFiles.txt‎

Lines changed: 904 additions & 52 deletions
Large diffs are not rendered by default.

‎IDEAS/.idea/.name‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ revisions="<html>
119119
<ul>
120120
<li>
121121
October 29, 2024, by Klaas De Jonge:<br/>
122-
Unprotected <code>dh</code> and changed prefixes of <code>dh</code>,<code>hAg</code> and <code>hBg</code> to <code>input</code>. This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1935\">#1935</a>.
122+
Unprotected <code>dh</code> and changed prefixes of <code>dh</code>,<code>hAg</code> and <code>hBg</code> to <code>input</code>.<br/>
123+
This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1935\">#1935</a>.
123124
</li>
124125
<li>
125126
January 8, 2019, by Michael Wetter:<br/>
@@ -163,7 +164,7 @@ Renamed protected parameters for consistency with the naming conventions.
163164
<li><i>August 12, 2011</i> by Michael Wetter:<br/>
164165
Changed model to use the new function
165166
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM\">
166-
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
167+
IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
167168
</li>
168169
<li><i>July 20, 2010</i> by Michael Wetter:<br/>
169170
Migrated model to Modelica 3.1 and integrated it into the Buildings library.

‎IDEAS/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ __Dymola_Commands(file="modelica://IDEAS/Resources/Scripts/Dymola/Airflow/Multiz
2424
<p>
2525
This examples demonstrates the
2626
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLaw\">
27-
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
27+
IDEAS.Airflow.Multizone.BaseClasses.powerLaw</a>
2828
function.
2929
</p>
3030
</html>", revisions="<html>

‎IDEAS/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ experiment(Tolerance=1e-6, StopTime=1.0),
4949
<p>
5050
This examples demonstrates the
5151
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLaw\">
52-
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
52+
IDEAS.Airflow.Multizone.BaseClasses.powerLaw</a>
5353
and
5454
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM\">
55-
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>
55+
IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM</a>
5656
functions.
5757
They need to return the same function value.
5858
This is verified by an <code>assert</code> statement.

‎IDEAS/Airflow/Multizone/BaseClasses/Examples/package.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ annotation (preferredView="info", Documentation(info="<html>
77
<p>
88
This package contains examples for the use of models that can be found in
99
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses\">
10-
Buildings.Airflow.Multizone.BaseClasses</a>.
10+
IDEAS.Airflow.Multizone.BaseClasses</a>.
1111
</p>
1212
</html>"));
1313
end Examples;

‎IDEAS/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ This is for
169169
February 24, 2015 by Michael Wetter:<br/>
170170
Changed model to use
171171
<a href=\"modelica://IDEAS.Utilities.Psychrometrics.Functions.density_pTX\">
172-
Buildings.Utilities.Psychrometrics.Functions.density_pTX</a>
172+
IDEAS.Utilities.Psychrometrics.Functions.density_pTX</a>
173173
for the density computation
174174
as
175175
<a href=\"modelica://IDEAS.Media.Air.density\">
176-
Buildings.Media.Air.density</a>
176+
IDEAS.Media.Air.density</a>
177177
does not depend on temperature.
178178
</li>
179179
<li>June 18, 2014 by Michael Wetter:<br/>

‎IDEAS/Airflow/Multizone/BaseClasses/package.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package BaseClasses "Package with base classes for IDEAS.Airflow.Multizone"
55
annotation (preferredView="info", Documentation(info="<html>
66
<p>
77
This package contains base classes that are used to construct the models in
8-
<a href=\"modelica://IDEAS.Airflow.Multizone\">Buildings.Airflow.Multizone</a>.
8+
<a href=\"modelica://IDEAS.Airflow.Multizone\">IDEAS.Airflow.Multizone</a>.
99
</p>
1010
</html>"));
1111
end BaseClasses;

‎IDEAS/Airflow/Multizone/BaseClasses/windPressureLowRise.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ the current angle of incidence.
118118
<p>
119119
This function is used in
120120
<a href=\"modelica://IDEAS.Fluid.Sources.Outside_CpLowRise\">
121-
Buildings.Fluid.Sources.Outside_CpLowRise</a>
121+
IDEAS.Fluid.Sources.Outside_CpLowRise</a>
122122
which can be used directly with components of this package.
123123
</p>
124124
<h4>References</h4>

‎IDEAS/Airflow/Multizone/DoorDiscretizedOpen.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ An orifice equation is used to compute the flow for each compartment.
4949
In this model, the door is always open.
5050
Use the model
5151
<a href=\"modelica://IDEAS.Airflow.Multizone.DoorDiscretizedOperable\">
52-
Buildings.Airflow.Multizone.DoorDiscretizedOperable</a>
52+
IDEAS.Airflow.Multizone.DoorDiscretizedOperable</a>
5353
for a door that can either be open or closed.
5454
</p>
5555
</html>",
@@ -79,7 +79,7 @@ as it seems to try negative values for the density during iterative solutions.
7979
<li>August 12, 2011 by Michael Wetter:<br/>
8080
Changed model to use the new function
8181
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM\">
82-
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
82+
IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
8383
</li>
8484
<li>July 20, 2010 by Michael Wetter:<br/>
8585
Migrated model to Modelica 3.1 and integrated it into the Buildings library.

0 commit comments

Comments
 (0)