Skip to content

Commit

Permalink
renamed model
Browse files Browse the repository at this point in the history
  • Loading branch information
hcasperfu committed Oct 7, 2024
1 parent a7934de commit 6612f5a
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ This model computes the pinch points and the energy exchange,
and interfaces with the input and output variables.
The evaporating temperature is fixed as a parameter.
See the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
for more details.
</html>", revisions="<html>
<ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ protected
<p>
This model performs the property interpolations of a given working fluid.
See the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
for more details.
</html>", revisions="<html>
<ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ except that it validates the handling of wet working fluids.
As a result, a superheating temperature is computed that ensures
the expansion does not land under the dome.
How this superheating temperature is found is explained in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>.
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>.
</p>
</html>",revisions="<html>
<ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
within IBPSA.Fluid.CHPs.OrganicRankine;
model Cycle "Organic Rankine cycle as a bottoming cycle"
model ConstantEvaporation "Organic Rankine cycle as a bottoming cycle"

extends IBPSA.Fluid.Interfaces.FourPortHeatMassExchanger(
final m1_flow_nominal = mHot_flow_nominal,
Expand Down Expand Up @@ -240,7 +240,7 @@ An important assumption is that all heat is dissipated, i.e.,
the cycle is not controlled by thermal load.
</p>
<p align=\"center\">
<img src=\"modelica://IBPSA/Resources/Images/Fluid/CHPs/OrganicRankine/CycleArchitecture.png\"
<img src=\"modelica://IBPSA/Resources/Images/Fluid/CHPs/OrganicRankine/ConstantEvaporationArchitecture.png\"
alt=\"CycleArchitecture\" width=\"800\" height=\"300\"/></p>
<p>
The cycle processes the heat at a fixed
Expand Down Expand Up @@ -498,4 +498,4 @@ First implementation. This is for
</li>
</ul>
</html>"));
end Cycle;
end ConstantEvaporation;
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/Generic.mo
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ annotation (
<p>
Record containing parameters for working fluid properties.
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Acetone.mo
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ record Acetone "Data record for acetone"
Record containing properties of acetone.
Its name in CoolProp is \"Acetone\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Ethanol.mo
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ record Ethanol "Data record for ethanol"
Record containing properties of ethanol.
Its name in CoolProp is \"Ethanol\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Heptane.mo
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ record Heptane "Data record for n-heptane"
Record containing properties of n-heptane.
Its name in CoolProp is \"n-Heptane\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Pentane.mo
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ record Pentane "Data record for n-pentane (R601)"
Record containing properties of n-pentane (R601).
Its name in CoolProp is \"n-Pentane\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Propane.mo
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ record Propane "Data record for propane (R290)"
Record containing properties of propane (R290).
Its name in CoolProp is \"Propane\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R123.mo
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ record R123 "Data record for R123"
Record containing properties of R123.
Its name in CoolProp is \"R123\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R134a.mo
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ record R134a "Data record for R134a"
Record containing properties of R134a.
Its name in CoolProp is \"R134a\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R245fa.mo
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ record R245fa "Data record for R245fa"
Record containing properties of R245fa.
Its name in CoolProp is \"R245fa\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R32.mo
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ record R32 "Data record for R32"
Record containing properties of R32.
Its name in CoolProp is \"R32\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Toluene.mo
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ record Toluene "Data record for toluene"
Record containing properties of toluene.
Its name in CoolProp is \"Toluene\".
A figure in the documentation of
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
shows which lines these arrays represent.
</p>
</html>"));
Expand Down
6 changes: 3 additions & 3 deletions IBPSA/Fluid/CHPs/OrganicRankine/Examples/ORCHotWater.mo
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ model ORCHotWater "ORC that outputs hot water at a fixed temperature"
parameter Modelica.Units.SI.ThermodynamicTemperature TCol_start = 35 + 273.15
"Start value for cold fluid temperature";

IBPSA.Fluid.CHPs.OrganicRankine.Cycle orc(
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation orc(
redeclare final package Medium1 = MediumHot,
redeclare final package Medium2 = MediumCol,
T2_start=TCol_start,
Expand Down Expand Up @@ -204,8 +204,8 @@ annotation(experiment(StopTime=900,Tolerance=1E-6),
Documentation(info="<html>
<p>
This example model demonstrates how
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.Cycle\">
IBPSA.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
can be integrated in a system.
The three-way valve is controlled to track the hot water
output temperature, which is the cold fluid of the ORC,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ model VariableSource
parameter Modelica.Units.SI.MassFlowRate mCol_flow_nominal = 1
"Nominal mass flow rate of condenser cold fluid";

IBPSA.Fluid.CHPs.OrganicRankine.Cycle orc(
IBPSA.Fluid.CHPs.OrganicRankine.ConstantEvaporation orc(
redeclare package Medium1 = MediumHot,
redeclare package Medium2 = MediumCol,
pro=pro,
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/CHPs/OrganicRankine/package.order
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Cycle
ConstantEvaporation
Data
Examples
Validation
Expand Down

0 comments on commit 6612f5a

Please sign in to comment.