Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ibpsa merge custom errors #1517

Merged
merged 35 commits into from
Jul 25, 2024
Merged

Ibpsa merge custom errors #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ccfdc5c
manual ibpsa merge
FWuellhorst Jul 22, 2024
a9647ea
rm unused files and save all records as a single file
FWuellhorst Jul 22, 2024
f4ff948
re-create Nrpm for the moment
FWuellhorst Jul 22, 2024
3858f17
move old files to obsolete and fix efficiency in systems
FWuellhorst Jul 22, 2024
b5a4982
fix missing files
FWuellhorst Jul 22, 2024
e2b1653
Add dp_nomimal to avoid pump error
FWuellhorst Jul 22, 2024
8337d0d
Merge branch 'IBPSA_MergeCustim' into IBPSA_MergeCustomErrors
FWuellhorst Jul 23, 2024
a7f4b5e
rm usage of SpeedControllerNrpm adjust interface, setting speed_rpm_n…
FWuellhorst Jul 23, 2024
32ecae0
rm reference result files
FWuellhorst Jul 23, 2024
a7b5c3b
also remove scripts
FWuellhorst Jul 23, 2024
1cc520b
stage new file
FWuellhorst Jul 23, 2024
9920d89
fix missing file
FWuellhorst Jul 23, 2024
286c665
fix new translation statistics
FWuellhorst Jul 23, 2024
4106205
fix old unit
FWuellhorst Jul 23, 2024
5ef42ea
rm power specification which is not used
FWuellhorst Jul 23, 2024
c069c81
re-create wrong regression results
FWuellhorst Jul 23, 2024
5d3db64
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
DaJansenGit Jul 23, 2024
5513fc9
Merge branch 'main' into IBPSA_MergeCustim
FWuellhorst Jul 24, 2024
3ccd845
lock models [ci skip]
FWuellhorst Jul 24, 2024
9a2f6af
Merge branch 'IBPSA_MergeCustim' into IBPSA_MergeCustomErrors
FWuellhorst Jul 24, 2024
a5c3a0e
re-add deleted files
FWuellhorst Jul 24, 2024
6af151d
Update reference result and rename file to see error during regression
FWuellhorst Jul 24, 2024
b30417f
fix order and extends
FWuellhorst Jul 24, 2024
fad90b9
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
DaJansenGit Jul 24, 2024
10fab08
re-create reference results for changed models to to new, lower effic…
FWuellhorst Jul 25, 2024
16e4162
Merge branch 'IBPSA_MergeCustomErrors' of https://github.com/RWTH-EBC…
FWuellhorst Jul 25, 2024
43d3fee
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
DaJansenGit Jul 25, 2024
23905e5
use cvode [ci skip]
FWuellhorst Jul 25, 2024
1b7341c
Merge branch 'IBPSA_MergeCustomErrors' of https://github.com/RWTH-EBC…
FWuellhorst Jul 25, 2024
77cbbbe
Use CVode instead of radau as CVode is also used in teaser export and…
FWuellhorst Jul 25, 2024
d732d7e
new results for equipped models
FWuellhorst Jul 25, 2024
e8bb00f
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
DaJansenGit Jul 25, 2024
674b824
revert change from IBPSA [ci skip]
FWuellhorst Jul 25, 2024
a1d5ece
add conversion script and increase version
FWuellhorst Jul 25, 2024
8913409
Merge branch 'IBPSA_MergeCustomErrors' of https://github.com/RWTH-EBC…
FWuellhorst Jul 25, 2024
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
  •  
  •  
  •  
26 changes: 13 additions & 13 deletions AixLib/Airflow/Multizone/BaseClasses/Door.mo
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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