Skip to content

Commit

Permalink
Merge branch 'main' into 1401-improve-parameterization-in-highorder-m…
Browse files Browse the repository at this point in the history 
…odel
  • Loading branch information
@TobiasSpratte
TobiasSpratte authored Jul 26, 2024
2 parents 2e64cc5 + 9eca742 commit 5c4857f
Show file tree
Hide file tree
Showing 3,080 changed files with 290,637 additions and 53,830 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 3 additions & 2 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

include:
project: 'EBC/EBC_all/gitlab_ci/templates'
ref: AixLib
file: 'dymola-ci-tests/ci_templates/.gitlab-ci.yml'
ref: AixLibCI
file: 'modelica-ci-tests/scripts/.gitlab-ci.yml'
2,503 changes: 0 additions & 2,503 deletions AixLib/.copiedFiles.txt
View file

This file was deleted.

26 changes: 13 additions & 13 deletions AixLib/Airflow/Multizone/BaseClasses/Door.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@ equation
fillColor={0,0,0},
fillPattern=FillPattern.Solid)}),
Documentation(info="<html>
<p>
This is a partial model for the bi-directional air flow through a door.
</p>
</html>",
<p>
This is a partial model for the bi-directional air flow through a door.
</p>
</html>",
revisions="<html>
<ul>
<li>
October 6, 2020, by Michael Wetter:<br/>
First implementation for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1353\">#1353</a>.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
<ul>
<li>
October 6, 2020, by Michael Wetter:<br/>
First implementation for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1353\">#1353</a>.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
end Door;
134 changes: 67 additions & 67 deletions AixLib/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,72 +102,72 @@ equation
Line(points={{-54,-58},{-36,-58}}, color={0,0,0}),
Line(points={{-54,-32},{-36,-32}}, color={0,0,0})}),
Documentation(info="<html>
<p>
This is a partial model for the bi-directional air flow through a door.
</p>
<p>
To compute the bi-directional flow,
the door is discretize along the height coordinate, and uses
an orifice equation to compute the flow for each compartment.
</p>
<p>
The compartment area <code>dA</code> is a variable, which allows
using the model for a door that can be open or closed.
</p>
</html>",
<p>
This is a partial model for the bi-directional air flow through a door.
</p>
<p>
To compute the bi-directional flow,
the door is discretize along the height coordinate, and uses
an orifice equation to compute the flow for each compartment.
</p>
<p>
The compartment area <code>dA</code> is a variable, which allows
using the model for a door that can be open or closed.
</p>
</html>",
revisions="<html>
<ul>
<li>
January 8, 2019, by Michael Wetter:<br/>
Moved parameter <code>CD</code> from
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.DoorDiscretized\">
AixLib.Airflow.Multizone.BaseClasses.DoorDiscretized</a>
to
<a href=\"modelica://AixLib.Airflow.Multizone.DoorDiscretizedOpen\">
AixLib.Airflow.Multizone.DoorDiscretizedOpen</a>.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/971\">#971</a>.
</li>
<li>
June 27, 2018, by Michael Wetter:<br/>
Corrected old parameter annotation.
</li>
<li>
June 6, 2018, by Michael Wetter:<br/>
Removed term that assures non-zero flow rate in each path, and
reformulated flow balance to ensure that model is symmetric.
This is
for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/937\">#937</a>.
</li>
<li>
January 22, 2016, by Michael Wetter:<br/>
Corrected type declaration of pressure difference.
This is
for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/404\">#404</a>.
</li>
<li>
September 26, 2013 by Michael Wetter:<br/>
Added missing <code>each</code> keyword.
</li>
<li>
December 14, 2012 by Michael Wetter:<br/>
Renamed protected parameters for consistency with the naming conventions.
</li>
<li><i>December 6, 2011</i> by Michael Wetter:<br/>
Removed protected variable <code>rhoAve</code>.
</li>
<li><i>August 12, 2011</i> by Michael Wetter:<br/>
Changed model to use the new function
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.powerLawFixedM\">
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
</li>
<li><i>July 20, 2010</i> by Michael Wetter:<br/>
Migrated model to Modelica 3.1 and integrated it into the Buildings library.
</li>
<li><i>February 8, 2005</i> by Michael Wetter:<br/>
Released first version.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
<ul>
<li>
January 8, 2019, by Michael Wetter:<br/>
Moved parameter <code>CD</code> from
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.DoorDiscretized\">
AixLib.Airflow.Multizone.BaseClasses.DoorDiscretized</a>
to
<a href=\"modelica://AixLib.Airflow.Multizone.DoorDiscretizedOpen\">
AixLib.Airflow.Multizone.DoorDiscretizedOpen</a>.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/971\">#971</a>.
</li>
<li>
June 27, 2018, by Michael Wetter:<br/>
Corrected old parameter annotation.
</li>
<li>
June 6, 2018, by Michael Wetter:<br/>
Removed term that assures non-zero flow rate in each path, and
reformulated flow balance to ensure that model is symmetric.
This is
for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/937\">#937</a>.
</li>
<li>
January 22, 2016, by Michael Wetter:<br/>
Corrected type declaration of pressure difference.
This is
for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/404\">#404</a>.
</li>
<li>
September 26, 2013 by Michael Wetter:<br/>
Added missing <code>each</code> keyword.
</li>
<li>
December 14, 2012 by Michael Wetter:<br/>
Renamed protected parameters for consistency with the naming conventions.
</li>
<li><i>December 6, 2011</i> by Michael Wetter:<br/>
Removed protected variable <code>rhoAve</code>.
</li>
<li><i>August 12, 2011</i> by Michael Wetter:<br/>
Changed model to use the new function
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.powerLawFixedM\">
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>.
</li>
<li><i>July 20, 2010</i> by Michael Wetter:<br/>
Migrated model to Modelica 3.1 and integrated it into the Buildings library.
</li>
<li><i>February 8, 2005</i> by Michael Wetter:<br/>
Released first version.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
end DoorDiscretized;
72 changes: 36 additions & 36 deletions AixLib/Airflow/Multizone/BaseClasses/ErrorControl.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@ model ErrorControl "Interface that defines parameters for error control"
annotation(Dialog(tab="Advanced"));

annotation (Documentation(info="<html>
<p>
This is an interface that defines parameters used for error control.
</p>
<p>
Dymola does error control on state variables, such as temperature, pressure and
species concentration.
Flow variables such as <code>m_flow</code> are typically not checked during the error control.
This can give large errors in flow variables, as long as the error on the volume's state variables
that are coupled to the flow variables is small.
Obtaining accurate flow variables can be achieved by imposing an error control
on the exchanged mass, which can be defined as
</p>
<pre>
dm/dt = m_flow.
</pre>
<p>
By setting <code>forceErrorControlOnFlow = true</code>, such an equation is imposed
by models that extend this class.
</p>
</html>",
<p>
This is an interface that defines parameters used for error control.
</p>
<p>
Dymola does error control on state variables, such as temperature, pressure and
species concentration.
Flow variables such as <code>m_flow</code> are typically not checked during the error control.
This can give large errors in flow variables, as long as the error on the volume's state variables
that are coupled to the flow variables is small.
Obtaining accurate flow variables can be achieved by imposing an error control
on the exchanged mass, which can be defined as
</p>
<pre>
dm/dt = m_flow.
</pre>
<p>
By setting <code>forceErrorControlOnFlow = true</code>, such an equation is imposed
by models that extend this class.
</p>
</html>",
revisions="<html>
<ul>
<li>
June 27, 2018, by Michael Wetter:<br/>
Moved parameter <code>forceErrorControlOnFlow</code> to the Advanced tab.
</li>
<li>
July 20, 2010 by Michael Wetter:<br/>
Integrated model into the Buildings library.
</li>
<li>
November 1, 2005 by Michael Wetter:<br/>
Released first version.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
<ul>
<li>
June 27, 2018, by Michael Wetter:<br/>
Moved parameter <code>forceErrorControlOnFlow</code> to the Advanced tab.
</li>
<li>
July 20, 2010 by Michael Wetter:<br/>
Integrated model into the Buildings library.
</li>
<li>
November 1, 2005 by Michael Wetter:<br/>
Released first version.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
end ErrorControl;
30 changes: 15 additions & 15 deletions AixLib/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ equation
experiment(Tolerance=1e-6, StopTime=1.0),
__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos"
"Simulate and plot"), Documentation(info="<html>
<p>
This examples demonstrates the
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.powerLaw\">
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
function.
</p>
</html>",revisions="<html>
<ul>
<li>
August 12, 2011, by Michael Wetter:<br/>
First implementation.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
<p>
This examples demonstrates the
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.powerLaw\">
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
function.
</p>
</html>", revisions="<html>
<ul>
<li>
August 12, 2011, by Michael Wetter:<br/>
First implementation.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
end PowerLaw;
40 changes: 20 additions & 20 deletions AixLib/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,24 @@ equation
experiment(Tolerance=1e-6, StopTime=1.0),
__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos"
"Simulate and plot"), Documentation(info="<html>
<p>
This examples demonstrates the
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.powerLaw\">
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
and
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.powerLawFixedM\">
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>
functions.
They need to return the same function value.
This is verified by an <code>assert</code> statement.
</p>
</html>",revisions="<html>
<ul>
<li>
August 12, 2011, by Michael Wetter:<br/>
First implementation.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
<p>
This examples demonstrates the
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.powerLaw\">
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
and
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.powerLawFixedM\">
Buildings.Airflow.Multizone.BaseClasses.powerLawFixedM</a>
functions.
They need to return the same function value.
This is verified by an <code>assert</code> statement.
</p>
</html>", revisions="<html>
<ul>
<li>
August 12, 2011, by Michael Wetter:<br/>
First implementation.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
end PowerLawFixedM;
30 changes: 15 additions & 15 deletions AixLib/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ equation
experiment(StartTime=-2, Tolerance=1e-6, StopTime=2),
__Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos"
"Simulate and plot"), Documentation(info="<html>
<p>
This examples demonstrates the
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.windPressureLowRise\">
AixLib.Airflow.Multizone.BaseClasses.windPressureLowRise</a>
function.
</p>
</html>",revisions="<html>
<ul>
<li>
October 27, 2011, by Michael Wetter:<br/>
First implementation.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
<p>
This examples demonstrates the
<a href=\"modelica://AixLib.Airflow.Multizone.BaseClasses.windPressureLowRise\">
AixLib.Airflow.Multizone.BaseClasses.windPressureLowRise</a>
function.
</p>
</html>", revisions="<html>
<ul>
<li>
October 27, 2011, by Michael Wetter:<br/>
First implementation.
</li>
</ul>
</html>"),
__Dymola_LockedEditing="Model from IBPSA");
end WindPressureLowRise;
Loading

0 comments on commit 5c4857f

Please sign in to comment.