Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
956 changes: 904 additions & 52 deletions IDEAS/.copiedFiles.txt

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions IDEAS/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ __Dymola_Commands(file="modelica://IDEAS/Resources/Scripts/Dymola/Airflow/Multiz
<p>
This examples demonstrates the
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLaw\">
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
IDEAS.Airflow.Multizone.BaseClasses.powerLaw</a>
function.
</p>
</html>", revisions="<html>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ experiment(Tolerance=1e-6, StopTime=1.0),
<p>
This examples demonstrates the
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLaw\">
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
IDEAS.Airflow.Multizone.BaseClasses.powerLaw</a>
and
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM\">
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>
IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM</a>
functions.
They need to return the same function value.
This is verified by an <code>assert</code> statement.
Expand Down
2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/BaseClasses/Examples/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ annotation (preferredView="info", Documentation(info="<html>
<p>
This package contains examples for the use of models that can be found in
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses\">
Buildings.Airflow.Multizone.BaseClasses</a>.
IDEAS.Airflow.Multizone.BaseClasses</a>.
</p>
</html>"));
end Examples;
4 changes: 2 additions & 2 deletions IDEAS/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ This is for
February 24, 2015 by Michael Wetter:<br/>
Changed model to use
<a href=\"modelica://IDEAS.Utilities.Psychrometrics.Functions.density_pTX\">
Buildings.Utilities.Psychrometrics.Functions.density_pTX</a>
IDEAS.Utilities.Psychrometrics.Functions.density_pTX</a>
for the density computation
as
<a href=\"modelica://IDEAS.Media.Air.density\">
Buildings.Media.Air.density</a>
IDEAS.Media.Air.density</a>
does not depend on temperature.
</li>
<li>June 18, 2014 by Michael Wetter:<br/>
Expand Down
2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/BaseClasses/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package BaseClasses "Package with base classes for IDEAS.Airflow.Multizone"
annotation (preferredView="info", Documentation(info="<html>
<p>
This package contains base classes that are used to construct the models in
<a href=\"modelica://IDEAS.Airflow.Multizone\">Buildings.Airflow.Multizone</a>.
<a href=\"modelica://IDEAS.Airflow.Multizone\">IDEAS.Airflow.Multizone</a>.
</p>
</html>"));
end BaseClasses;
2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/BaseClasses/windPressureLowRise.mo
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ the current angle of incidence.
<p>
This function is used in
<a href=\"modelica://IDEAS.Fluid.Sources.Outside_CpLowRise\">
Buildings.Fluid.Sources.Outside_CpLowRise</a>
IDEAS.Fluid.Sources.Outside_CpLowRise</a>
which can be used directly with components of this package.
</p>
<h4>References</h4>
Expand Down
4 changes: 2 additions & 2 deletions IDEAS/Airflow/Multizone/DoorDiscretizedOpen.mo
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ An orifice equation is used to compute the flow for each compartment.
In this model, the door is always open.
Use the model
<a href=\"modelica://IDEAS.Airflow.Multizone.DoorDiscretizedOperable\">
Buildings.Airflow.Multizone.DoorDiscretizedOperable</a>
IDEAS.Airflow.Multizone.DoorDiscretizedOperable</a>
for a door that can either be open or closed.
</p>
</html>",
Expand Down Expand Up @@ -79,7 +79,7 @@ as it seems to try negative values for the density during iterative solutions.
<li>August 12, 2011 by Michael Wetter:<br/>
Changed model to use the new function
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM\">
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
</li>
<li>July 20, 2010 by Michael Wetter:<br/>
Migrated model to Modelica 3.1 and integrated it into the Buildings library.
Expand Down
2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/DoorDiscretizedOperable.mo
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ as it seems to try negative values for the density during iterative solutions.
August 12, 2011 by Michael Wetter:<br/>
Changed model to use the new function
<a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM\">
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
IDEAS.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
</li>
<li>
July 20, 2010 by Michael Wetter:<br/>
Expand Down
4 changes: 2 additions & 2 deletions IDEAS/Airflow/Multizone/Examples/CO2TransportStep.mo
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ equation
<p>
This model is based on
<a href=\"modelica://IDEAS.Airflow.Multizone.Validation.ThreeRoomsContam\">
Buildings.Airflow.Multizone.Validation.ThreeRoomsContam</a>.
IDEAS.Airflow.Multizone.Validation.ThreeRoomsContam</a>.
In addition, a CO<sub>2</sub> source has been added to the left room
in the bottom floor.
At initial time, all volumes have zero CO<sub>2</sub> concentration.
Expand All @@ -85,7 +85,7 @@ Updated comments for
November 10, 2011, by Michael Wetter:<br/>
Extended model from
<a href=\"modelica://IDEAS.Airflow.Multizone.Validation.ThreeRoomsContam\">
Buildings.Airflow.Multizone.Validation.ThreeRoomsContam</a>
IDEAS.Airflow.Multizone.Validation.ThreeRoomsContam</a>
and added documentation.
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/Examples/ChimneyShaftWithVolume.mo
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ equation
<p>
This model is identical to
<a href=\"modelica://IDEAS.Airflow.Multizone.Examples.ChimneyShaftNoVolume\">
Buildings.Airflow.Multizone.Examples.ChimneyShaftNoVolume</a>,
IDEAS.Airflow.Multizone.Examples.ChimneyShaftNoVolume</a>,
except that the chimney model is not steady-state, but rather dynamic
as it contains an air volume. The air volume is approximated
as being well-mixed. (Stratified volumes could be approximated by
Expand Down
4 changes: 2 additions & 2 deletions IDEAS/Airflow/Multizone/Examples/ClosedDoors.mo
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ a small air flow through the doors.
<p>
This model uses
<a href=\"modelica://IDEAS.Media.Specialized.Air.PerfectGas\">
Buildings.Media.Specialized.Air.PerfectGas</a>
IDEAS.Media.Specialized.Air.PerfectGas</a>
as the medium because
<a href=\"modelica://IDEAS.Media.Air\">
Buildings.Media.Air</a>
IDEAS.Media.Air</a>
does not account for expansion if air the air is heated.
</p>
</html>", revisions="<html>
Expand Down
2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/Examples/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ annotation (preferredView="info", Documentation(info="<html>
<p>
This package contains examples for the use of models that can be found in
<a href=\"modelica://IDEAS.Airflow.Multizone\">
Buildings.Airflow.Multizone</a>.
IDEAS.Airflow.Multizone</a>.
</p>
</html>"));
end Examples;
2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/UsersGuide.mo
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package UsersGuide "User's Guide"
annotation (preferredView="info",
Documentation(info="<html>
<p>
The package <code>Buildings.Airflow.Multizone</code> contains models for
The package <code>IDEAS.Airflow.Multizone</code> contains models for
multizone airflow and contaminant transport.
</p>
<p>
Expand Down
2 changes: 1 addition & 1 deletion IDEAS/Airflow/Multizone/Validation/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ annotation (preferredView="info", Documentation(info="<html>
<p>
This package contains validation models for the classes in
<a href=\"modelica://IDEAS.Airflow.Multizone\">
Buildings.Airflow.Multizone</a>.
IDEAS.Airflow.Multizone</a>.
</p>
<p>
Note that most validation models contain simple input data
Expand Down
2 changes: 1 addition & 1 deletion IDEAS/Airflow/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ models to compute the air flow between different rooms and between
a room and the exterior environment.
For models that compute airflow in duct networks, see
<a href=\"modelica://IDEAS.Fluid\">
Buildings.Fluid</a>.
IDEAS.Fluid</a>.
</html>"),
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
graphics={
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
within IDEAS.BoundaryConditions.SolarIrradiation.BaseClasses;
block BrighteningCoefficient "Circumsolar and horizon brightening coefficients"
extends Modelica.Blocks.Icons.Block;
import H = IDEAS.Utilities.Math.Functions.regStep;
Modelica.Blocks.Interfaces.RealInput zen(
quantity="Angle",
unit="rad",
Expand Down Expand Up @@ -42,43 +41,42 @@ protected
Real b7;
Real b8;
equation
b1 = H(
b1 = IDEAS.Utilities.Math.Functions.regStep(
y1=1,
y2=0,
x=1.065 - skyCle,
x_small=d);
b2 = H(
b2 = IDEAS.Utilities.Math.Functions.regStep(
y1=1,
y2=0,
x=1.23 - skyCle,
x_small=d);
b3 = H(
b3 = IDEAS.Utilities.Math.Functions.regStep(
y1=1,
y2=0,
x=1.50 - skyCle,
x_small=d);
b4 = H(
b4 = IDEAS.Utilities.Math.Functions.regStep(
y1=1,
y2=0,
x=1.95 - skyCle,
x_small=d);
b5 = H(
b5 = IDEAS.Utilities.Math.Functions.regStep(
y1=1,
y2=0,
x=2.80 - skyCle,
x_small=d);

b6 = H(
b6 = IDEAS.Utilities.Math.Functions.regStep(
y1=1,
y2=0,
x=4.50 - skyCle,
x_small=d);
b7 = H(
b7 = IDEAS.Utilities.Math.Functions.regStep(
y1=1,
y2=0,
x=6.20 - skyCle,
x_small=d);
b8 = H(
b8 = IDEAS.Utilities.Math.Functions.regStep(
y1=1,
y2=0,
x=skyCle - 6.20,
Expand Down Expand Up @@ -119,6 +117,12 @@ This component computes the circumsolar and horizon brightening coefficients.
</html>", revisions="<html>
<ul>
<li>
February 7, 2025, by Jelger Jansen:<br/>
Removed <code>import</code> statement.
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1961\">IBPSA, #1961</a>.
</li>
<li>
April 27, 2018, by Michael Wetter:<br/>
Corrected <code>displayUnit</code>.<br/>
This is for
Expand Down
38 changes: 34 additions & 4 deletions IDEAS/BoundaryConditions/WeatherData/ReaderTMY3.mo
Original file line number Diff line number Diff line change
Expand Up @@ -1256,35 +1256,59 @@ The following variables serve as output and are accessible via <code>weaBus</cod
</tr>
</table>
<!-- ============================================== -->
<h4>Adding new weather data</h4>
<h4>Using new weather data</h4>
<p>
To add new weather data, proceed as follows:
To use new weather data, there are two supported ways:
</p>
<ul>
<li>
<p>
You can use the Python tool AixWeather
(<a href=\"https://github.com/RWTH-EBC/AixWeather\">https://github.com/RWTH-EBC/AixWeather</a>),
which is installable via <code>pip</code> or accessible via a WebApp (<a href=\"https://aixweather.eonerc.rwth-aachen.de/\">https://aixweather.eonerc.rwth-aachen.de/</a>).
Here, conversion of <code>epw</code> (EnergyPlus), <code>dat</code> (German Meteorological Service) or custom data
to the desired <code>mos</code> format is supported.
</p>
</li>
<li>
<p>
You can use a Java application to convert <code>epw</code> to <code>mos</code> format by following these steps:
</p>
<ol>
<li>
<p>
Download the weather data file with the <code>epw</code> extension from
<a href=\"http://energyplus.net/weather\">
http://energyplus.net/weather</a>.
</p>
</li>
<li>
<p>
Add the file to <code>IDEAS/Resources/weatherdata</code> (or to any directory
for which you have write permission).
</p>
</li>
<li>
On a console window, type<pre>
<p>
On a console window, type</p><pre>
cd IDEAS/Resources/weatherdata
java -jar ../bin/ConvertWeatherData.jar inputFile.epw
</pre>
if inputFile contains space in the name:
<p>
or if <code>inputFile.epw</code> contains space in the name:
</p>
<pre>
java -jar ../bin/ConvertWeatherData.jar \"inputFile .epw\"
</pre>
<p>
This will generate the weather data file <code>inputFile.mos</code>, which can be read
by the model
<a href=\"modelica://IDEAS.BoundaryConditions.WeatherData.ReaderTMY3\">
IDEAS.BoundaryConditions.WeatherData.ReaderTMY3</a>.
</p>
</li>
</ol>
</ul>
<!-- ============================================== -->
<h4>Location data that are read automatically from the weather data file</h4>
<p>
Expand Down Expand Up @@ -1598,6 +1622,12 @@ Technical Report, NREL/TP-581-43156, revised May 2008.
</html>", revisions="<html>
<ul>
<li>
May 28, 2025, by Fabian Wuellhorst:<br/>
Added information on AixWeather to documentation.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2017\">IBPSA, #2017</a>.
</li>
<li>
September 6, 2021, by Ettore Zanetti:<br/>
Changed alt and lat to real inputs.<br/>
This is for
Expand Down
68 changes: 68 additions & 0 deletions IDEAS/Controls/OBC/CDL/Constants.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
within IDEAS.Controls.OBC.CDL;
package Constants
"Package with constants"
// Machine dependent constants
final constant Real eps=1E-15
"Biggest number such that 1.0 + eps = 1.0";
final constant Real small=1E-37
"Smallest number such that small and -small are representable on the machine";
final constant Real pi=2*Modelica.Math.asin(1.0)
"Constant number pi, 3.14159265358979";
annotation (
Documentation(
info="<html>
<p>
This package provides often needed constants.
</p>
</html>",
revisions="<html>
<ul>
<li>
March 12, 2024, by Michael Wetter:<br/>
Changed <code>small</code> to <i>1E-37</i>.<br/>
This is for
<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3695\">Buildings, issue 3695</a>.
</li>
<li>
March 27, 2017, by Michael Wetter:<br/>
First implementation, based on the implementation of the
Modelica Standard Library.
</li>
</ul>
</html>"),
Icon(
coordinateSystem(
extent={{-100.0,-100.0},{100.0,100.0}}),
graphics={
Rectangle(
lineColor={200,200,200},
fillColor={248,248,248},
fillPattern=FillPattern.HorizontalCylinder,
extent={{-100.0,-100.0},{100.0,100.0}},
radius=25.0),
Polygon(
origin={-9.2597,25.6673},
fillColor={102,102,102},
pattern=LinePattern.None,
fillPattern=FillPattern.Solid,
points={{48.017,11.336},{48.017,11.336},{10.766,11.336},{-25.684,10.95},{-34.944,-15.111},{-34.944,-15.111},{-32.298,-15.244},{-32.298,-15.244},{-22.112,0.168},{11.292,0.234},{48.267,-0.097},{48.267,-0.097}},
smooth=Smooth.Bezier),
Polygon(
origin={-19.9923,-8.3993},
fillColor={102,102,102},
pattern=LinePattern.None,
fillPattern=FillPattern.Solid,
points={{3.239,37.343},{3.305,37.343},{-0.399,2.683},{-16.936,-20.071},{-7.808,-28.604},{6.811,-22.519},{9.986,37.145},{9.986,37.145}},
smooth=Smooth.Bezier),
Polygon(
origin={23.753,-11.5422},
fillColor={102,102,102},
pattern=LinePattern.None,
fillPattern=FillPattern.Solid,
points={{-10.873,41.478},{-10.873,41.478},{-14.048,-4.162},{-9.352,-24.8},{7.912,-24.469},{16.247,0.27},{16.247,0.27},{13.336,0.071},{13.336,0.071},{7.515,-9.983},{-3.134,-7.271},{-2.671,41.214},{-2.671,41.214}},
smooth=Smooth.Bezier),
Rectangle(
lineColor={128,128,128},
extent={{-100.0,-100.0},{100.0,100.0}},
radius=25.0)}));
end Constants;
Loading
Loading