Skip to content

Commit

Permalink
removed trailing spaces
Browse files Browse the repository at this point in the history 
HeatPumps/ModularReversible$ sed -i 's/ *$//gm' $(find . -iname '*.mo')
  • Loading branch information
@hcasperfu
hcasperfu committed Nov 17, 2023
1 parent 9b07fb9 commit 37680cd
Show file tree
Hide file tree
Showing 16 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/LargeScaleWaterToWaterDeclarations.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ initial equation
coordinateSystem(preserveAspectRatio=false)),
Documentation(info="<html>
<p>
This model provides declarations that auto-populate nominal mass flow rates
and time constants (i.e. volumes) of the heat exchange based on
This model provides declarations that auto-populate nominal mass flow rates
and time constants (i.e. volumes) of the heat exchange based on
the nominal electric power consumption of the chiller or heat pump.
It is based on more than 20 datasets of water-to-water heat pumps
from multiple manufacturers ranging from about 25 kW
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ protected
{-90,-26}})));

parameter Boolean use_busConOnl=false
"=true to allow input to bus connector,
"=true to allow input to bus connector,
not applicable with internal safety control"
annotation(choices(checkBox=true), Dialog(group="Input Connectors", enable=not
use_intSafCtr));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ equation
to the partial refrigerant cylce.
</p>
<p>
Further, an asseration warning is raised if the model approaches or
sources for performance data differ. This indicates that they are not
Further, an asseration warning is raised if the model approaches or
sources for performance data differ. This indicates that they are not
for the same device.
</p>
<p>
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/OperationalEnvelope.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ equation
the given boundaries. If not, the heat pump or chiller will switch off.
</p>
<p>
Read the documentation of
Read the documentation of
<a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.BaseClasses.PartialOperationalEnvelope\">
IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.BaseClasses.PartialOperationalEnvelope</a>
for more information.
for more information.
</p>
</html>"));
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/SingleSplitRXM20R.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Daikin, Technical data book RXM-R
<a href=\"https://www.heizman24.de/media/pdf/fa/50/2c/Daikin-RXM-R-Produktdatenbuch.pdf\">
https://www.heizman24.de/media/pdf/fa/50/2c/Daikin-RXM-R-Produktdatenbuch.pdf</a>
</p>
</html>", revisions="<html>
<ul>
<li>
Expand Down
10 changes: 5 additions & 5 deletions IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/Vitocal251A08.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ record Vitocal251A08 "A2W Vitocal 251 by Viessmann"
devIde="Vitocal251A08");
annotation (Documentation(info="<html>
<p>
Data from the planning book (Planungshandbuch) from Viessmann.
Data from the planning book (Planungshandbuch) from Viessmann.
</p>
<p>
While the product exists in different sizes,
While the product exists in different sizes,
this record contains the data for the subtype 251-A08.
If you want to model the pressure losses of the device,
check out the data sheet and the installed pumps.
If you want to model the pressure losses of the device,
check out the data sheet and the installed pumps.
The pressure loss depends mostly on the hydraulic system
according to the datasheet.
</p>
Expand All @@ -47,6 +47,6 @@ Viessmann, Planungshandbuch.
<a href=\"https://www.haustechnik-handrich.de/media/pdf/54/c4/14/vie-pa-z022164.pdf\">
https://www.haustechnik-handrich.de/media/pdf/54/c4/14/vie-pa-z022164.pdf</a>.
</p>
</html>"));
end Vitocal251A08;
4 changes: 2 additions & 2 deletions IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ record WAMAK_WaterToWater_220kW "220 kW water to water with R513A"
use_TEvaOutForTab=false);
annotation (Documentation(info="<html>
<p>
Data for large scale (220 kW) water-to-water heat pump from WAMAK.
Data for large scale (220 kW) water-to-water heat pump from WAMAK.
Nominal pressure losses are the maximal values given in the datasheet,
same for the nominal mass flow rates.
same for the nominal mass flow rates.
</p>
<h4>References</h4>
Expand Down
16 changes: 8 additions & 8 deletions IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/Generic.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ record Generic "Partial two-dimensional data of refrigerant machines"
</p>
<p>
The nominal mass flow rates in the condenser and evaporator
are also defined as parameters. If nominal pressure curves are provided
in the datasheets, be sure to match the two parameters.
Aside from that, the nominal mass flow rates are compared to the values specified
are also defined as parameters. If nominal pressure curves are provided
in the datasheets, be sure to match the two parameters.
Aside from that, the nominal mass flow rates are compared to the values specified
by the user. If the deviation is too great, a warning indicates a possible mismatch of
system mass flow rate and table data.
</p>
Expand All @@ -56,18 +56,18 @@ record Generic "Partial two-dimensional data of refrigerant machines"
matching records will be used. This parameter is mainly to avoid manual input
errors.
</p>
<h4>Where to get the data?</h4>
<h4>Where to get the data?</h4>
<p>
Manufacturers often provide table data for heating / cooling capacity and
Manufacturers often provide table data for heating / cooling capacity and
electrical power consumption, e.g. based on EN 14511.
While the usual datasheets only contain some nominal points,
While the usual datasheets only contain some nominal points,
the documents for installers and planners are often more specific.
Keywords for a search should be <i>technical guide</i>, <i>planning handbook</i>,
Keywords for a search should be <i>technical guide</i>, <i>planning handbook</i>,
or similar, together with the manufacturer and possibly the device id.
</p>
<h4>References</h4>
<p>
EN 14511-2018: Air conditioners, liquid chilling packages and heat pumps for space
EN 14511-2018: Air conditioners, liquid chilling packages and heat pumps for space
heating and cooling and process chillers, with electrically driven compressors
<a href=\"https://www.beuth.de/de/norm/din-en-14511-1/298537524\">
https://www.beuth.de/de/norm/din-en-14511-1/298537524</a>
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ model LargeScaleWaterToWater
the parameters are based on an automatic estimation, see:
<a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.LargeScaleWaterToWaterDeclarations\">
IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.LargeScaleWaterToWaterDeclarations</a>.
</p>
</p>
<p>
For more information on the approach, please read the
<a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.ModularReversibleUsersGuide\">
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/CalculateCOP.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ model CalculateCOP
annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
initial equation
assert(PEleMin > 0,
"PEleMin must be greater than zero. Disable efficiency calculation using
"PEleMin must be greater than zero. Disable efficiency calculation using
calEff=false to debug why PEle_nominal is lower than zero.",
AssertionLevel.error);

Expand Down
6 changes: 3 additions & 3 deletions IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ equation
<code>TAppEva</code> define the approach (pinch) temperature differences.
</p>
<p>
The approach temperatures
The approach temperatures
are calculated using the following equation:
</p>
<p>
Expand All @@ -121,8 +121,8 @@ equation
</code>
</p>
<p>
This introduces nonlinear equations to the model, which
can lead to solver issues for reversible operation.
This introduces nonlinear equations to the model, which
can lead to solver issues for reversible operation.
You can fix the approach temperature at the nominal value by
setting <code>use_constAppTem</code>
</p>
Expand Down
2 changes: 1 addition & 1 deletion ...Fluid/HeatPumps/ModularReversible/RefrigerantCycle/Inertias/BaseClasses/PartialInertia.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Suggested change
Modelica.Blocks.Interfaces.SISO</a>
and is made to constrain the replaceable inertia module
within other inertia models.
</p>
</p>
</html>", revisions="<html><ul>
<li>
<i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
Expand Down
12 changes: 6 additions & 6 deletions IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ equation
</ul>
</html>", info="<html>
<p>
This model uses two-dimensional table data typically given
by manufacturers as required by e.g. European Norm 14511
This model uses two-dimensional table data typically given
by manufacturers as required by e.g. European Norm 14511
or ASHRAE 205 to calculate
<code>QCon_flow</code> and <code>PEle</code>.
</p>
Expand Down Expand Up @@ -168,9 +168,9 @@ This implies a constant COP over different design sizes:
Manufacturers are not required to provide the compressor speed at which
the data are measured. Thus, nominal values may be obtained at different
compressor speeds and, thus, efficiencies.
To accurately model the available thermal output,
please check that you use tables of the maximal thermal output,
which is often provided in the data sheets from the manufacturers.
To accurately model the available thermal output,
please check that you use tables of the maximal thermal output,
which is often provided in the data sheets from the manufacturers.
This limitation only holds for inverter driven heat pumps.
</li>
<li>
Expand All @@ -187,7 +187,7 @@ This implies a constant COP over different design sizes:
</ul>
<h4>References</h4>
<p>
EN 14511-2018: Air conditioners, liquid chilling packages and heat pumps for space
EN 14511-2018: Air conditioners, liquid chilling packages and heat pumps for space
heating and cooling and process chillers, with electrically driven compressors
<a href=\"https://www.beuth.de/de/norm/din-en-14511-1/298537524\">
https://www.beuth.de/de/norm/din-en-14511-1/298537524</a>
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/HeatPumps/ModularReversible/ReversibleAirToWaterTableData2D.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ model ReversibleAirToWaterTableData2D
</p>
<h4>References</h4>
<p>
EN 14511-2018: Air conditioners, liquid chilling packages and heat pumps for space
EN 14511-2018: Air conditioners, liquid chilling packages and heat pumps for space
heating and cooling and process chillers, with electrically driven compressors
<a href=\"https://www.beuth.de/de/norm/din-en-14511-1/298537524\">
https://www.beuth.de/de/norm/din-en-14511-1/298537524</a>
Expand Down
28 changes: 14 additions & 14 deletions IBPSA/Fluid/HeatPumps/ModularReversible/UsersGuide.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,20 +174,20 @@ to the section <b>Refrigerant cycle models</b>.
<h4>Reversible operation</h4>
<p>
Simulating reversible heat pumps and chillers can get confusing, as the same heat
exchanger model has to be used for both condensation and evaporation.
Simulating reversible heat pumps and chillers can get confusing, as the same heat
exchanger model has to be used for both condensation and evaporation.
</p>
<p>
In most cases, heat pumps and chillers extract/exhaust heat from/to
an ambient source (air, soil, ground-water, etc.),
an ambient source (air, soil, ground-water, etc.),
and, consuming electrical energy, provide heating or cooling on the <i>useful side</i>.
For building applications, this <i>useful side</i> is inside the building.
For building applications, this <i>useful side</i> is inside the building.
The ambient heat is outside of the building, on the <i>ambient side</i>.
</p>
<p>
However, vapor compression machines can also be used to provide heating and cooling simultaniously.
In this case, both sides provide utility to the energy system. Hence, both sides
In this case, both sides provide utility to the energy system. Hence, both sides
are <i>useful sides</i>.
</p>
<p>
Expand All @@ -196,13 +196,13 @@ of the heat pump or chiller. The main operation of a heat pump is heating, for
a chiller, cooling. When reversed, the condenser becomes the evaporator and
vice versa. As renaming instances after translation is not possible, you always
have to think about the names <code>con</code> and <code>eva</code> in terms of
the main operation of the device.
the main operation of the device.
This applies to the instances <code>con</code> and <code>eva</code> as well as
all sensor values, like <code>TConOutMea</code> or <code>TEvaInMea</code>.
As the temperature values are for table-based performance data
and the operational envelope model,
As the temperature values are for table-based performance data
and the operational envelope model,
you also have to think about the <i>useful</i>
and <i>ambient side</i> in the datasheets and how they translate to
and <i>ambient side</i> in the datasheets and how they translate to
heat pumps and chillers in both main and reversed operation.
The following tables summarizes the possible options.
</p>
Expand Down Expand Up @@ -446,15 +446,15 @@ for heating and cooling.
<a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Safety\">
IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Safety</a>
</p>
<p>
Probably the most important safety control with regard to
system interaction is the operation envelope. Read the documentation of
Probably the most important safety control with regard to
system interaction is the operation envelope. Read the documentation of
<a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.BaseClasses.PartialOperationalEnvelope\">
IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.BaseClasses.PartialOperationalEnvelope</a>
for more information on this model and how it affects device operation.
</p>
</p>
<h4>Refrigerant cycle inertia</h4>
Expand Down
2 changes: 1 addition & 1 deletion ...Fluid/HeatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialComparison.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ First implementation.
</ul>
</html>", info="<html>
<p>
Partial model which is based on
Partial model which is based on
<a href=\"modelica://IBPSA.Fluid.HeatPumps.Examples.Carnot_y\">
IBPSA.Fluid.HeatPumps.Examples.Carnot_y</a>
to validate the modular reversible models by means of
Expand Down

0 comments on commit 37680cd

Please sign in to comment.