Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions IBPSA/Fluid/Actuators/package.mo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
within IBPSA.Fluid;
package Actuators "Package with actuator models such as valves and dampers"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;


package UsersGuide "User's Guide"
Expand Down Expand Up @@ -184,9 +184,20 @@ because it generates a state event whenever the valve position changes.
</html>"));

end UsersGuide;


annotation (preferredView="info", Documentation(info="<html>
annotation (preferredView="info", Documentation(info="<html>
<p>
This package contains component models for actuators.
</html>"));
</p>
</html>"),
Icon(graphics={Polygon(
points={{-40,40},{-40,-40},{0,0},{-40,40}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid), Polygon(
points={{40,40},{40,-40},{0,0},{40,40}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid)}));
end Actuators;
25 changes: 23 additions & 2 deletions IBPSA/Fluid/CHPs/package.mo
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
within IBPSA.Fluid;
package CHPs "Package with model for combined heat and power device"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
<p>
This package contains models for combined heat and power plant.
</p>
</html>"));
</html>"),
Icon(graphics={
Rectangle(
extent={{-60,60},{60,-60}},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
lineThickness=0.5),
Ellipse(
extent={{-40,40},{40,-40}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(
points={{12,-38},{32,24}},
color={0,0,0},
thickness=0.5),
Line(
points={{-12,-38},{-32,24}},
color={0,0,0},
thickness=0.5)}));
end CHPs;
31 changes: 28 additions & 3 deletions IBPSA/Fluid/Chillers/package.mo
Original file line number Diff line number Diff line change
@@ -1,10 +1,35 @@
within IBPSA.Fluid;
package Chillers "Package with chiller models"
extends Modelica.Icons.VariantsPackage;
package Chillers "Package with models for chillers"
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
<p>
This package contains component models for chillers.
</p>
</html>"));
<p>
For heat pump models, see
<a href=\"modelica://IBPSA.Fluid.HeatPumps\">IBPSA.Fluid.HeatPumps</a>.
</p>
</html>"),
Icon(graphics={
Rectangle(
extent={{-60,60},{60,-60}},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
lineThickness=0.5),
Ellipse(
extent={{-40,40},{40,-40}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(
points={{-12,38},{-32,-24}},
color={0,0,0},
thickness=0.5),
Line(
points={{12,38},{32,-24}},
color={0,0,0},
thickness=0.5)}));
end Chillers;
20 changes: 18 additions & 2 deletions IBPSA/Fluid/Delays/package.mo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
within IBPSA.Fluid;
package Delays "Package with delay models"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
<p>
Expand All @@ -13,5 +13,21 @@ The model
IBPSA.Fluid.Delays.DelayFirstOrder</a>
approximates transport delays using a first order differential equation.
</p>
</html>"));
</html>"),
Icon(graphics={
Rectangle(
extent={{-60,60},{60,-60}},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
lineThickness=0.5),
Line(
points={{-32,-34},{-24,-4},{-8,20},{20,34},{54,36}},
color={0,0,0},
thickness=0.5,
smooth=Smooth.Bezier),
Line(
points={{-32,-34},{-52,-34}},
color={0,0,0},
thickness=0.5)}));
end Delays;
33 changes: 31 additions & 2 deletions IBPSA/Fluid/FixedResistances/package.mo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
within IBPSA.Fluid;
package FixedResistances "Package with models for fixed flow resistances"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
<p>
Expand Down Expand Up @@ -46,5 +46,34 @@ The model
IBPSA.Fluid.FixedResistances.Junction</a>
can be used to model flow splitters or flow merges.
</p>
</html>"));
</html>"),
Icon(graphics={
Ellipse(
extent={{-45,19},{45,-19}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
startAngle=0,
endAngle=180,
origin={59,1},
rotation=90),
Rectangle(
extent={{-60,46},{60,-44}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Ellipse(
extent={{-80,46},{-40,-44}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Rectangle(
extent={{52,45.4},{60,-43.2}},
lineColor={255,255,255},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid)}));
end FixedResistances;
27 changes: 25 additions & 2 deletions IBPSA/Fluid/Geothermal/Borefields/package.mo
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
within IBPSA.Fluid.Geothermal;
package Borefields "Package with borefield models"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
<p>
Package with models for geothermal borefields.
</p>
</html>"));
</html>"),
Icon(graphics={
Rectangle(
extent={{-80,60},{80,-60}},
lineColor={255,255,255},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(
points={{-80,60},{80,60}},
color={0,0,0},
thickness=1),
Line(
points={{-60,60},{-60,-40},{-48,-40},{-48,60}},
color={0,0,0},
thickness=0.5),
Line(
points={{-6,60},{-6,-40},{6,-40},{6,60}},
color={0,0,0},
thickness=0.5),
Line(
points={{48,60},{48,-40},{60,-40},{60,60}},
color={0,0,0},
thickness=0.5)}));
end Borefields;
27 changes: 25 additions & 2 deletions IBPSA/Fluid/Geothermal/package.mo
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
within IBPSA.Fluid;
package Geothermal "Package with models for geothermal heat exchange"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
<p>
Package with models for geothermal heat exchange.
</p>
</html>"));
</html>"),
Icon(graphics={
Rectangle(
extent={{-80,60},{80,-60}},
lineColor={255,255,255},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(
points={{-80,60},{80,60}},
color={0,0,0},
thickness=1),
Line(
points={{-60,60},{-60,-40},{-48,-40},{-48,60}},
color={0,0,0},
thickness=0.5),
Line(
points={{-6,60},{-6,-40},{6,-40},{6,60}},
color={0,0,0},
thickness=0.5),
Line(
points={{48,60},{48,-40},{60,-40},{60,60}},
color={0,0,0},
thickness=0.5)}));
end Geothermal;
25 changes: 23 additions & 2 deletions IBPSA/Fluid/HeatExchangers/package.mo
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
within IBPSA.Fluid;
package HeatExchangers "Package with heat exchanger models"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
This package contains models for heat exchangers with and without humidity condensation.
</html>"));
</html>"),
Icon(graphics={
Rectangle(
extent={{-82,63},{86,56}},
lineColor={0,0,255},
pattern=LinePattern.None,
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Rectangle(
extent={{-84,-57},{84,-64}},
lineColor={0,0,255},
pattern=LinePattern.None,
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Rectangle(
extent={{-54,88},{56,-84}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(points={{56,88},{-54,-84}}, color={0,0,0},
thickness=0.5)}));
end HeatExchangers;
29 changes: 27 additions & 2 deletions IBPSA/Fluid/HeatPumps/package.mo
Original file line number Diff line number Diff line change
@@ -1,10 +1,35 @@
within IBPSA.Fluid;
package HeatPumps "Package with models for heat pumps"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
<p>
This package contains component models for heat pumps.
</p>
</html>"));
<p>
For chiller models, see
<a href=\"modelica://IBPSA.Fluid.Chillers\">IBPSA.Fluid.Chillers</a>.
</p>
</html>"),
Icon(graphics={
Rectangle(
extent={{-60,60},{60,-60}},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
lineThickness=0.5),
Ellipse(
extent={{-40,40},{40,-40}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(
points={{-12,38},{-32,-24}},
color={0,0,0},
thickness=0.5),
Line(
points={{12,38},{32,-24}},
color={0,0,0},
thickness=0.5)}));
end HeatPumps;
46 changes: 44 additions & 2 deletions IBPSA/Fluid/MassExchangers/package.mo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
within IBPSA.Fluid;
package MassExchangers "Package with mass exchanger models"
extends Modelica.Icons.VariantsPackage;
extends Modelica.Icons.Package;

annotation (preferredView="info", Documentation(info="<html>
<p>
Expand All @@ -9,5 +9,47 @@ For heat exchanger models without humidity transfer, see the package
<a href=\"modelica://IBPSA.Fluid.HeatExchangers\">
IBPSA.Fluid.HeatExchangers</a>.
</p>
</html>"));
</html>"),
Icon(graphics={
Rectangle(
extent={{-82,63},{86,56}},
lineColor={0,0,255},
pattern=LinePattern.None,
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Rectangle(
extent={{-84,-57},{84,-64}},
lineColor={0,0,255},
pattern=LinePattern.None,
fillColor={0,0,0},
fillPattern=FillPattern.Solid),
Rectangle(
extent={{-54,88},{56,-84}},
lineColor={0,0,0},
lineThickness=0.5,
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Line(points={{56,88},{-24,-40}}, color={0,0,0},
thickness=0.5),
Line(
points={{34,-24},{24,-44},{22,-48},{20,-54},{22,-60},{28,-64},{36,-64},
{44,-60},{46,-54},{44,-46},{34,-24}},
color={0,0,0},
thickness=0.5,
smooth=Smooth.Bezier),
Line(
points={{0,-24},{-10,-44},{-12,-48},{-14,-54},{-12,-60},{-6,-64},{2,-64},
{10,-60},{12,-54},{10,-46},{0,-24}},
color={0,0,0},
thickness=0.5,
smooth=Smooth.Bezier),
Line(
points={{-32,-24},{-42,-44},{-44,-48},{-46,-54},{-44,-60},{-38,-64},{-30,
-64},{-22,-60},{-20,-54},{-22,-46},{-32,-24}},
color={0,0,0},
thickness=0.5,
smooth=Smooth.Bezier),
Line(points={{-40,-62},{-54,-84}},
color={0,0,0},
thickness=0.5)}));
end MassExchangers;
Loading