diff --git a/IBPSA/Fluid/Actuators/package.mo b/IBPSA/Fluid/Actuators/package.mo index b177479135..bd51876128 100644 --- a/IBPSA/Fluid/Actuators/package.mo +++ b/IBPSA/Fluid/Actuators/package.mo @@ -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" @@ -184,9 +184,20 @@ because it generates a state event whenever the valve position changes. ")); end UsersGuide; - - -annotation (preferredView="info", Documentation(info=" + annotation (preferredView="info", Documentation(info=" +

This package contains component models for actuators. -")); +

+"), + 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; diff --git a/IBPSA/Fluid/CHPs/package.mo b/IBPSA/Fluid/CHPs/package.mo index 91192f873f..b25dee8b6b 100644 --- a/IBPSA/Fluid/CHPs/package.mo +++ b/IBPSA/Fluid/CHPs/package.mo @@ -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="

This package contains models for combined heat and power plant.

-")); +"), + 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; diff --git a/IBPSA/Fluid/Chillers/package.mo b/IBPSA/Fluid/Chillers/package.mo index 315b1563ed..184b0ddcff 100644 --- a/IBPSA/Fluid/Chillers/package.mo +++ b/IBPSA/Fluid/Chillers/package.mo @@ -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="

This package contains component models for chillers.

-")); +

+For heat pump models, see +IBPSA.Fluid.HeatPumps. +

+"), + 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; diff --git a/IBPSA/Fluid/Delays/package.mo b/IBPSA/Fluid/Delays/package.mo index 01e7b453c3..a590b649d1 100644 --- a/IBPSA/Fluid/Delays/package.mo +++ b/IBPSA/Fluid/Delays/package.mo @@ -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="

@@ -13,5 +13,21 @@ The model IBPSA.Fluid.Delays.DelayFirstOrder approximates transport delays using a first order differential equation.

-")); +"), + 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; diff --git a/IBPSA/Fluid/FixedResistances/package.mo b/IBPSA/Fluid/FixedResistances/package.mo index 0a7684018d..5313c35605 100644 --- a/IBPSA/Fluid/FixedResistances/package.mo +++ b/IBPSA/Fluid/FixedResistances/package.mo @@ -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="

@@ -46,5 +46,34 @@ The model IBPSA.Fluid.FixedResistances.Junction can be used to model flow splitters or flow merges.

-")); +"), + 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; diff --git a/IBPSA/Fluid/Geothermal/Borefields/package.mo b/IBPSA/Fluid/Geothermal/Borefields/package.mo index 03994ffa58..44e257759e 100644 --- a/IBPSA/Fluid/Geothermal/Borefields/package.mo +++ b/IBPSA/Fluid/Geothermal/Borefields/package.mo @@ -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="

Package with models for geothermal borefields.

-")); +"), + 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; diff --git a/IBPSA/Fluid/Geothermal/package.mo b/IBPSA/Fluid/Geothermal/package.mo index c240858c92..b2d3c1dc7a 100644 --- a/IBPSA/Fluid/Geothermal/package.mo +++ b/IBPSA/Fluid/Geothermal/package.mo @@ -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="

Package with models for geothermal heat exchange.

-")); +"), + 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; diff --git a/IBPSA/Fluid/HeatExchangers/package.mo b/IBPSA/Fluid/HeatExchangers/package.mo index 03b3530455..04457761ec 100644 --- a/IBPSA/Fluid/HeatExchangers/package.mo +++ b/IBPSA/Fluid/HeatExchangers/package.mo @@ -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=" This package contains models for heat exchangers with and without humidity condensation. -")); +"), + 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; diff --git a/IBPSA/Fluid/HeatPumps/package.mo b/IBPSA/Fluid/HeatPumps/package.mo index 910fe45086..717882e80c 100644 --- a/IBPSA/Fluid/HeatPumps/package.mo +++ b/IBPSA/Fluid/HeatPumps/package.mo @@ -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="

This package contains component models for heat pumps.

-")); +

+For chiller models, see +IBPSA.Fluid.Chillers. +

+"), + 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; diff --git a/IBPSA/Fluid/MassExchangers/package.mo b/IBPSA/Fluid/MassExchangers/package.mo index 54f85c3309..002b3fc3aa 100644 --- a/IBPSA/Fluid/MassExchangers/package.mo +++ b/IBPSA/Fluid/MassExchangers/package.mo @@ -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="

@@ -9,5 +9,47 @@ For heat exchanger models without humidity transfer, see the package IBPSA.Fluid.HeatExchangers.

-")); +"), + 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; diff --git a/IBPSA/Fluid/MixingVolumes/package.mo b/IBPSA/Fluid/MixingVolumes/package.mo index 1768d04c8d..b9177cddc1 100644 --- a/IBPSA/Fluid/MixingVolumes/package.mo +++ b/IBPSA/Fluid/MixingVolumes/package.mo @@ -1,6 +1,6 @@ within IBPSA.Fluid; package MixingVolumes "Package with mixing volumes" - extends Modelica.Icons.VariantsPackage; + extends Modelica.Icons.Package; annotation (Documentation(info="

@@ -14,5 +14,24 @@ The other models are only of interest if water should be added to or subtracted from the fluid volume, such as in a coil with water vapor condensation.

-")); +"), Icon(graphics={ + Ellipse( + extent={{-80,80},{80,-80}}, + lineColor={0,0,0}, + lineThickness=0.5, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid), + Ellipse( + extent={{-58,10},{0,-8}}, + lineColor={0,0,0}, + lineThickness=0.5), + Ellipse( + extent={{0,10},{58,-8}}, + lineColor={0,0,0}, + lineThickness=0.5), + Line( + points={{0,0},{0,42}}, + color={0,0,0}, + thickness=0.5, + smooth=Smooth.Bezier)})); end MixingVolumes; diff --git a/IBPSA/Fluid/Storage/package.mo b/IBPSA/Fluid/Storage/package.mo index 5a7f60b307..7a05f7d429 100644 --- a/IBPSA/Fluid/Storage/package.mo +++ b/IBPSA/Fluid/Storage/package.mo @@ -1,8 +1,42 @@ within IBPSA.Fluid; package Storage "Package with thermal energy storage models" - extends Modelica.Icons.VariantsPackage; + extends Modelica.Icons.Package; annotation (preferredView="info", Documentation(info=" +

This package contains thermal energy storage models. -")); +

+"), + Icon(graphics={ + Ellipse( + extent={{-60,20},{60,-20}}, + lineColor={0,0,0}, + lineThickness=0.5, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid, + startAngle=0, + endAngle=180, + origin={0,-60}, + rotation=360), + Rectangle( + extent={{-60,60},{60,-60}}, + lineColor={0,0,0}, + lineThickness=0.5, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid, + rotation=180), + Ellipse( + extent={{-20,60},{20,-60}}, + lineColor={0,0,0}, + lineThickness=0.5, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid, + origin={0,60}, + rotation=90), + Rectangle( + extent={{-59,-50},{59,-60}}, + lineColor={255,255,255}, + lineThickness=0.5, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid)})); end Storage;