Skip to content

Corrected HTML Code in branch correct_HTML_phe_UseCase_Ashrae #1576

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

Open
ebc-aixlib-bot wants to merge 1 commit into
base: phe_UseCase_Ashrae
Choose a base branch
from
Open

Corrected HTML Code in branch correct_HTML_phe_UseCase_Ashrae #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions AixLib/DataBase/Storage/Generic_4000l.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,20 @@ record Generic_4000l "Pseudo storage with 4000 l (standing)"
lengthHC1=1500,
lengthHC2=1500);

annotation (Icon(graphics), Documentation(info="<html>
<h4><font color=\"#008000\">Overview</font></h4>
<p>Buffer Storage: Generic 2000 l</p>
<h4><font color=\"#008000\">References</font></h4>
<p>Base data definition for record used with <a
href=\"AixLib.Fluid.Storage.Storage\">AixLib.Fluid.Storage.Storage</a> and <a
href=\"AixLib.Fluid.Storage.BufferStorage\">AixLib.Fluid.Storage.BufferStorage</a> </p>
annotation (Icon(graphics), Documentation(info="<html><h4>
<font color=\"#008000\">Overview</font>
</h4>
<p>
Buffer Storage: Generic 2000 l
</p>
<h4>
<font color=\"#008000\">References</font>
</h4>
<p>
Base data definition for record used with <a href=
\"AixLib.Fluid.Storage.Storage\">AixLib.Fluid.Storage.Storage</a> and
<a href=
\"AixLib.Fluid.Storage.BufferStorage\">AixLib.Fluid.Storage.BufferStorage</a>
</p>
</html>"));
end Generic_4000l;
22 changes: 15 additions & 7 deletions AixLib/DataBase/Storage/Generic_5000l.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,20 @@ record Generic_5000l "Pseudo storage with 5000 l (standing)"
lengthHC1=1500,
lengthHC2=1500);

annotation (Icon(graphics), Documentation(info="<html>
<h4><font color=\"#008000\">Overview</font></h4>
<p>Buffer Storage: Generic 2000 l</p>
<h4><font color=\"#008000\">References</font></h4>
<p>Base data definition for record used with <a
href=\"AixLib.Fluid.Storage.Storage\">AixLib.Fluid.Storage.Storage</a> and <a
href=\"AixLib.Fluid.Storage.BufferStorage\">AixLib.Fluid.Storage.BufferStorage</a> </p>
annotation (Icon(graphics), Documentation(info="<html><h4>
<font color=\"#008000\">Overview</font>
</h4>
<p>
Buffer Storage: Generic 2000 l
</p>
<h4>
<font color=\"#008000\">References</font>
</h4>
<p>
Base data definition for record used with <a href=
\"AixLib.Fluid.Storage.Storage\">AixLib.Fluid.Storage.Storage</a> and
<a href=
\"AixLib.Fluid.Storage.BufferStorage\">AixLib.Fluid.Storage.BufferStorage</a>
</p>
</html>"));
end Generic_5000l;
75 changes: 48 additions & 27 deletions AixLib/Fluid/Examples/ERCBuilding/BaseClasses/Controllers/DelayedOnOffController.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,33 +331,54 @@ equation
fillPattern=FillPattern.Solid,
textString=
"On/Off")}),
Documentation(info="<html>
<p><h4><font color=\"#008000\">Overview</font></h4></p>
<p>This is model is the decision maker in the CHP model. According to different
conditions and timings it decides if the CHP can be turned on or off.</p>
<p><h4><font color=\"#008000\">Concept</font></h4></p>
<p>The following control decisions are implemented:</p>
<p><ul>
<li>Switch On when the flow temperature is lower than a setpoint.</li>
<li>Switch Off when the CHP should work in a range lower than its minimum
allowable capacity.</li>
<li>Allow the CHP to be switched On only if it was Off for more than a certain
amount of time (delay) or it was On beforehand.</li>
<li>Allow the CHP to be switched Off only if it was On for more than a certain
amount of time (delay) or it was Off beforehand. </li>
<li>Emergency measures such as maximum allowable flow and return temperatures
are implemented.</li>
</ul></p>
Documentation(info="<html><h4>
<font color=\"#008000\">Overview</font>
</h4>
<p>
This is model is the decision maker in the CHP model. According to
different conditions and timings it decides if the CHP can be turned
on or off.
</p>
<h4>
<font color=\"#008000\">Concept</font>
</h4>
<p>
The following control decisions are implemented:
</p>
<ul>
<li>Switch On when the flow temperature is lower than a setpoint.
</li>
<li>Switch Off when the CHP should work in a range lower than its
minimum allowable capacity.
</li>
<li>Allow the CHP to be switched On only if it was Off for more than
a certain amount of time (delay) or it was On beforehand.
</li>
<li>Allow the CHP to be switched Off only if it was On for more than
a certain amount of time (delay) or it was Off beforehand.
</li>
<li>Emergency measures such as maximum allowable flow and return
temperatures are implemented.
</li>
</ul>
</html>",
revisions="<html>
<p><ul>
<li><i>December 08, 2016&nbsp;</i> by Moritz Lauster:<br/>Adapted to AixLib
conventions</li>
<li><i>October 11, 2016&nbsp;</i> by Pooyan Jahangiri:<br/>Variable names
updated and merged with AixLib</li>
<li><i>January 23, 2014&nbsp;</i> by Pooyan Jahangiri:<br/>Formatted
documentation appropriately</li>
<li><i>January 31, 2011</i> by Pooyan Jahangiri:<br/>Implemented</li>
</ul></p>
revisions="<html><ul>
<li>
<i>December 08, 2016&#160;</i> by Moritz Lauster:<br/>
Adapted to AixLib conventions
</li>
<li>
<i>October 11, 2016&#160;</i> by Pooyan Jahangiri:<br/>
Variable names updated and merged with AixLib
</li>
<li>
<i>January 23, 2014&#160;</i> by Pooyan Jahangiri:<br/>
Formatted documentation appropriately
</li>
<li>
<i>January 31, 2011</i> by Pooyan Jahangiri:<br/>
Implemented
</li>
</ul>
</html>"));
end DelayedOnOffController;
64 changes: 43 additions & 21 deletions AixLib/Fluid/Examples/ERCBuilding/BaseClasses/Controllers/ExternalControlNightDayHC.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,29 +256,51 @@ equation
fillColor={255,255,170},
fillPattern=FillPattern.Solid,
textString="%name")}),
Documentation(info="<html>
<h4><span style=\"color:#008000\">Overview</span></h4>
<p>This is a controller model, modelled after the <a href=\"DataBase.Boiler.DayNightMode.HeatingCurves_Vitotronic_Day25_Night10\">Vitotronic 200</a>. </p>
<h4><span style=\"color:#008000\">Concept</span></h4>
<p>The following control decisions are implemented:</p>
Documentation(info="<html><h4>
<span style=\"color:#008000\">Overview</span>
</h4>
<p>
This is a controller model, modelled after the <a href=
\"DataBase.Boiler.DayNightMode.HeatingCurves_Vitotronic_Day25_Night10\">
Vitotronic 200</a>.
</p>
<h4>
<span style=\"color:#008000\">Concept</span>
</h4>
<p>
The following control decisions are implemented:
</p>
<ul>
<li>Switch on/off when the fluid temperature is under/over the set fluid
temperature </li>
<li>Heating curve: fluid temperature depending on the outside temperature</li>
<li>Average outside temperature</li>
<li>Increase the set fluid temperature when going to day mode in order to
shorten the heating up period </li>
<li>Switch on/off when the fluid temperature is under/over the set
fluid temperature
</li>
<li>Heating curve: fluid temperature depending on the outside
temperature
</li>
<li>Average outside temperature
</li>
<li>Increase the set fluid temperature when going to day mode in
order to shorten the heating up period
</li>
</ul>
</html>",
revisions="<html>
<p><ul>
<li><i>December 08, 2016&nbsp;</i> by Moritz Lauster:<br/>Adapted to AixLib
conventions</li>
<li><i>October 11, 2016&nbsp;</i> by Pooyan Jahangiri:<br/>Merged with
AixLib</li>
<li><i>October 7, 2013&nbsp;</i> by Ole Odendahl:<br/>Formatted documentation
appropriately</li>
<li><i>October 12, 2011</i> by Ana Constantin:<br/>Implemented</li>
</ul></p>
revisions="<html><ul>
<li>
<i>December 08, 2016&#160;</i> by Moritz Lauster:<br/>
Adapted to AixLib conventions
</li>
<li>
<i>October 11, 2016&#160;</i> by Pooyan Jahangiri:<br/>
Merged with AixLib
</li>
<li>
<i>October 7, 2013&#160;</i> by Ole Odendahl:<br/>
Formatted documentation appropriately
</li>
<li>
<i>October 12, 2011</i> by Ana Constantin:<br/>
Implemented
</li>
</ul>
</html>"));
end ExternalControlNightDayHC;
66 changes: 44 additions & 22 deletions AixLib/Fluid/Examples/ERCBuilding/BaseClasses/Controllers/InternalControl.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,28 +140,50 @@ equation
fillColor={255,255,170},
fillPattern=FillPattern.Solid,
textString="%name")}),
Documentation(info="<html>
<h4><span style=\"color: #008000\">Overview</span></h4>
<p>Internal control of the boiler</p>
<h4><span style=\"color: #008000\">Concept</span></h4>
<p>This model is a derivation of BoilerTaktTable.</p>
<p>There is a differentiation made between primary and secondary energy
consumption.</p>
<p>The primary power output can be read at the output of <b>ControlerHeater.
</b>It is then multiplied with an efficienca factor to calculate the the
effective heat flow that heats up the fluid in the boiler<b>.</b></p>
<p>There are two energy meters: one for the primary energy and one for the
secondary. </p>
Documentation(info="<html><h4>
<span style=\"color: #008000\">Overview</span>
</h4>
<p>
Internal control of the boiler
</p>
<h4>
<span style=\"color: #008000\">Concept</span>
</h4>
<p>
This model is a derivation of BoilerTaktTable.
</p>
<p>
There is a differentiation made between primary and secondary energy
consumption.
</p>
<p>
The primary power output can be read at the output of
<b>ControlerHeater.</b> It is then multiplied with an efficienca
factor to calculate the the effective heat flow that heats up the
fluid in the boiler<b>.</b>
</p>
<p>
There are two energy meters: one for the primary energy and one for
the secondary.
</p>
</html>",
revisions="<html>
<p><ul>
<li><i>December 08, 2016&nbsp;</i> by Moritz Lauster:<br/>Adapted to AixLib
conventions</li>
<li><i>October 11, 2016&nbsp;</i> by Pooyan Jahangiri:<br/>Merged with
AixLib</li>
<li><i>October 7, 2013&nbsp;</i> by Ole Odendahl:<br/>Formatted documentation
appropriately</li>
<li><i>July 12, 2011</i> by Ana Constantin:<br/>Implemented</li>
</ul></p>
revisions="<html><ul>
<li>
<i>December 08, 2016&#160;</i> by Moritz Lauster:<br/>
Adapted to AixLib conventions
</li>
<li>
<i>October 11, 2016&#160;</i> by Pooyan Jahangiri:<br/>
Merged with AixLib
</li>
<li>
<i>October 7, 2013&#160;</i> by Ole Odendahl:<br/>
Formatted documentation appropriately
</li>
<li>
<i>July 12, 2011</i> by Ana Constantin:<br/>
Implemented
</li>
</ul>
</html>"));
end InternalControl;
55 changes: 35 additions & 20 deletions AixLib/Fluid/Examples/ERCBuilding/BaseClasses/Controllers/PIController.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,26 +118,41 @@ equation
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
textString="PI Controller")}),
Documentation(info="<html>
<p><h4><font color=\"#008000\">Overview</font></h4></p>
<p>This is model consists of two PI controllers to control the system both when
in operation as well as when shutting down.</p>
<p><h4><font color=\"#008000\">Concept</font></h4></p>
<p>Because changing the controller signal from a certain value to zero is not
continuous it will result in unstabilities in the simulation. Therefore, two
controllers are implemented. One for the operation as a normal controller and
one that change the output signal smoothly from the output of the other
controller to zero.</p>
Documentation(info="<html><h4>
<font color=\"#008000\">Overview</font>
</h4>
<p>
This is model consists of two PI controllers to control the system
both when in operation as well as when shutting down.
</p>
<h4>
<font color=\"#008000\">Concept</font>
</h4>
<p>
Because changing the controller signal from a certain value to zero
is not continuous it will result in unstabilities in the simulation.
Therefore, two controllers are implemented. One for the operation as
a normal controller and one that change the output signal smoothly
from the output of the other controller to zero.
</p>
</html>",
revisions="<html>
<p><ul>
<li><i>December 08, 2016&nbsp;</i> by Moritz Lauster:<br/>Adapted to AixLib
conventions</li>
<li><i>October 11, 2016&nbsp;</i> by Pooyan Jahangiri:<br/>Variable names
updated and merged with AixLib</li>
<li><i>January 23, 2014&nbsp;</i> by Pooyan Jahangiri:<br/>Formatted
documentation appropriately</li>
<li><i>January 31, 2011</i> by Pooyan Jahangiri:<br/>Implemented</li>
</ul></p>
revisions="<html><ul>
<li>
<i>December 08, 2016&#160;</i> by Moritz Lauster:<br/>
Adapted to AixLib conventions
</li>
<li>
<i>October 11, 2016&#160;</i> by Pooyan Jahangiri:<br/>
Variable names updated and merged with AixLib
</li>
<li>
<i>January 23, 2014&#160;</i> by Pooyan Jahangiri:<br/>
Formatted documentation appropriately
</li>
<li>
<i>January 31, 2011</i> by Pooyan Jahangiri:<br/>
Implemented
</li>
</ul>
</html>"));
end PIController;
Loading