Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
FWuellhorst committed Dec 7, 2023
1 parent 1bc6f54 commit df5cba1
Show file tree
Hide file tree
Showing 18 changed files with 251 additions and 251 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ record Generic "Basic chiller data"
extends IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D.Generic;

parameter Real tabQEva_flow[:,:]
"Cooling power consumption table, T in degC, Q_flow in W";
"Cooling power consumption table, T in K, Q_flow in W";
parameter Real tabLowBou[:,2]
"Points to define lower boundary for source temperature";
parameter Boolean use_TEvaOutForOpeEnv=false
Expand Down
10 changes: 2 additions & 8 deletions IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ model LargeScaleWaterToWater "Large scale water to water chiller"
final autCalVCon=max(2E-7*QUse_flow_nominal - 84E-4, autCalVMin),
final autCalVEva=max(1E-7*QUse_flow_nominal - 66E-4, autCalVMin));
replaceable parameter
IBPSA.Fluid.Chillers.ModularReversible.Data.TableData2D.EN14511.Carrier30XWP1012_1MW
IBPSA.Fluid.Chillers.ModularReversible.Data.TableData2D.Generic
datTab constrainedby Data.TableData2D.Generic "Data Table of Chiller"
annotation (choicesAllMatching=true,
Placement(transformation(extent={{42,12},{58,28}})));
Expand Down Expand Up @@ -75,16 +75,10 @@ model LargeScaleWaterToWater "Large scale water to water chiller"
UsersGuide</a>.
</p>
<p>
The documentation of the model for heating is at
The documentation of the model for cooling is at
<a href=\"modelica://IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.TableData2D\">
IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.TableData2D</a>.
</p>
<p>
Currently the only data sheets for chillers that large is the record
<a href=\"modelica://IBPSA.Fluid.Chillers.ModularReversible.Data.TableData2D.EN14511.Carrier30XWP1012_1MW\">
IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.TableData2DData.EN14511.Carrier30XWP1012_1MW</a>,
hence, the default value.
</p>
<h4>Assumptions</h4>
<ul>
<li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,25 @@ partial model PartialChillerCycle
IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.CalculateCOP
calEER(PEleMin=PEle_nominal*0.1) if calEff
"Calculate the EER"
annotation (Placement(transformation(extent={{-60,-60},{-80,-80}})));
annotation (Placement(transformation(extent={{-80,-80},{-100,-100}})));
equation
connect(iceFacCal.iceFac, sigBus.iceFacChiMea) annotation (Line(points={{-69,-40},
{-72,-40},{-72,-26},{-102,-26},{-102,104},{1,104}}, color={0,0,
connect(iceFacCal.iceFac, sigBus.iceFacChiMea) annotation (Line(points={{-81.2,-50},
{-72,-50},{-72,-30},{-110,-30},{-110,120},{1,120}}, color={0,0,
127}), Text(
string="%second",
index=1,
extent={{6,3},{6,3}},
horizontalAlignment=TextAlignment.Left));
connect(calEER.COP, sigBus.EER) annotation (Line(points={{-81,-70},{-102,-70},{
-102,104},{1,104}}, color={0,0,127}), Text(
connect(calEER.COP, sigBus.EER) annotation (Line(points={{-101,-90},{-110,-90},{
-110,120},{1,120}}, color={0,0,127}), Text(
string="%second",
index=1,
extent={{6,3},{6,3}},
horizontalAlignment=TextAlignment.Left));
connect(calEER.QUse_flow, proRedQEva.y) annotation (Line(points={{-58,-74},{-46,
-74},{-46,-88},{-20,-88},{-20,-81}}, color={0,0,127}));
annotation (Icon(graphics={Rectangle(
extent={{-100,-100},{100,100}},
lineColor={0,0,255},
fillColor={255,255,255},
fillPattern=FillPattern.Solid)}),
Documentation(
connect(calEER.QUse_flow, proRedQEva.y) annotation (Line(points={{-78,-94},{-60,
-94},{-60,-108},{-30,-108},{-30,-101}},
color={0,0,127}));
annotation (Documentation(
info="<html>
<p>
Partial refrigerant cycle model for chillers.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,59 +18,65 @@ model ConstantQualityGrade "Carnot EER with a constant qualtiy grade"
"Nominal EER";

equation
connect(swiQUse.u2, sigBus.onOffMea) annotation (Line(points={{-50,22},{-26,
22},{-26,34},{1,34},{1,104}}, color={255,0,255}), Text(
connect(swiQUse.u2, sigBus.onOffMea) annotation (Line(points={{-50,22},{-50,30},
{0,30},{0,120},{1,120}}, color={255,0,255}), Text(
string="%second",
index=1,
extent={{6,3},{6,3}},
horizontalAlignment=TextAlignment.Left));
connect(swiPEle.y, redQCon.u2) annotation (Line(points={{50,-1},{50,-36},{64,
-36},{64,-58}}, color={0,0,127}));
connect(swiPEle.y, PEle) annotation (Line(points={{50,-1},{50,-8},{0,-8},{0,-110}},
-36},{64,-78}}, color={0,0,127}));
connect(swiPEle.y, PEle) annotation (Line(points={{50,-1},{50,-8},{0,-8},{0,
-130}},
color={0,0,127}));
connect(swiPEle.u2, sigBus.onOffMea) annotation (Line(points={{50,22},{50,48},
{1,48},{1,104}}, color={255,0,255}), Text(
connect(swiPEle.u2, sigBus.onOffMea) annotation (Line(points={{50,22},{50,30},{
0,30},{0,120},{1,120}},
color={255,0,255}), Text(
string="%second",
index=1,
extent={{-3,6},{-3,6}},
horizontalAlignment=TextAlignment.Right));
connect(pasThrYSet.u, sigBus.ySet) annotation (Line(points={{18,70},{1,70},{1,
104}}, color={0,0,127}), Text(
120}}, color={0,0,127}), Text(
string="%second",
index=1,
extent={{-6,3},{-6,3}},
horizontalAlignment=TextAlignment.Right));
if useInChi then
connect(pasThrTCon.u, sigBus.TConOutMea) annotation (Line(points={{-30,90},{-30,
104},{1,104}}, color={0,0,127}), Text(
connect(pasThrTCon.u, sigBus.TConOutMea) annotation (Line(points={{-30,102},{
-30,120},{1,120}},
color={0,0,127}), Text(
string="%second",
index=1,
extent={{-3,6},{-3,6}},
horizontalAlignment=TextAlignment.Right));
connect(pasThrTEva.u, sigBus.TEvaOutMea) annotation (Line(points={{-70,90},{-70,
104},{1,104}}, color={0,0,127}), Text(
connect(pasThrTEva.u, sigBus.TEvaOutMea) annotation (Line(points={{-70,102},{
-70,120},{1,120}},
color={0,0,127}), Text(
string="%second",
index=1,
extent={{-3,6},{-3,6}},
horizontalAlignment=TextAlignment.Right));
else
connect(pasThrTCon.u, sigBus.TEvaOutMea) annotation (Line(points={{-30,90},{-30,
104},{1,104}}, color={0,0,127}), Text(
connect(pasThrTCon.u, sigBus.TEvaOutMea) annotation (Line(points={{-30,102},{
-30,120},{1,120}},
color={0,0,127}), Text(
string="%second",
index=1,
extent={{-3,6},{-3,6}},
horizontalAlignment=TextAlignment.Right));
connect(pasThrTEva.u, sigBus.TConOutMea) annotation (Line(points={{-70,90},{-70,
104},{1,104}}, color={0,0,127}), Text(
connect(pasThrTEva.u, sigBus.TConOutMea) annotation (Line(points={{-70,102},{
-70,120},{1,120}},
color={0,0,127}), Text(
string="%second",
index=1,
extent={{-3,6},{-3,6}},
horizontalAlignment=TextAlignment.Right));
end if;
connect(swiQUse.y, proRedQEva.u2) annotation (Line(points={{-50,-1},{-50,-30},{
-14,-30},{-14,-58}}, color={0,0,127}));
connect(calEER.PEle, swiPEle.y) annotation (Line(points={{-78,-66},{-50,-66},{
-50,-52},{0,-52},{0,-8},{50,-8},{50,-1}}, color={0,0,127}));
-24,-30},{-24,-78}}, color={0,0,127}));
connect(calEER.PEle, swiPEle.y) annotation (Line(points={{-78,-86},{-60,-86},{
-60,-60},{0,-60},{0,-8},{50,-8},{50,-1}}, color={0,0,127}));
annotation (Documentation(revisions="<html><ul>
<li>
<i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,84 +30,81 @@ model TableData2D
equation

connect(scaFacTimPel.y, PEle) annotation (Line(points={{-40,-9},{-40,-26},{-30,
-26},{-30,-94},{0,-94},{0,-110}}, color={0,0,127}));
-26},{-30,-94},{0,-94},{0,-130}}, color={0,0,127}));
connect(scaFacTimPel.y, redQCon.u2) annotation (Line(points={{-40,-9},{-40,-26},
{-30,-26},{-30,-48},{64,-48},{64,-58}}, color={0,0,127}));
{-30,-26},{-30,-48},{64,-48},{64,-78}}, color={0,0,127}));
connect(scaFacTimQUse_flow.y, proRedQEva.u2) annotation (Line(points={{40,-9},{
40,-40},{-14,-40},{-14,-58}}, color={0,0,127}));
connect(ySetTimScaFac.u1, sigBus.ySet) annotation (Line(points={{-64,48},{-64,
100},{-10,100},{-10,104},{1,104}}, color={0,0,127}), Text(
40,-40},{-24,-40},{-24,-78}}, color={0,0,127}));
connect(ySetTimScaFac.u1, sigBus.ySet) annotation (Line(points={{-54,62},{-54,
72},{-70,72},{-70,120},{1,120}}, color={0,0,127}), Text(
string="%second",
index=1,
extent={{-3,6},{-3,6}},
horizontalAlignment=TextAlignment.Right));
connect(reaPasThrTEvaOut.u, sigBus.TEvaOutMea) annotation (Line(points={{-20,92},
{-20,104},{1,104}}, color={0,0,127}), Text(
connect(reaPasThrTEvaOut.u, sigBus.TEvaOutMea) annotation (Line(points={{-10,102},
{-10,120},{1,120}}, color={0,0,127}), Text(
string="%second",
index=1,
extent={{6,3},{6,3}},
horizontalAlignment=TextAlignment.Left));
connect(reaPasThrTEvaIn.u, sigBus.TEvaInMea) annotation (Line(points={{-50,92},
{-50,106},{0,106},{0,104},{1,104}}, color={0,0,127}), Text(
connect(reaPasThrTEvaIn.u, sigBus.TEvaInMea) annotation (Line(points={{-50,102},
{-50,120},{1,120}}, color={0,0,127}), Text(
string="%second",
index=1,
extent={{6,3},{6,3}},
horizontalAlignment=TextAlignment.Left));
connect(reaPasThrTConIn.u, sigBus.TConInMea) annotation (Line(points={{40,92},{
40,104},{1,104}}, color={0,0,127}), Text(
connect(reaPasThrTConIn.u, sigBus.TConInMea) annotation (Line(points={{50,102},
{50,120},{1,120}}, color={0,0,127}), Text(
string="%second",
index=1,
extent={{-6,3},{-6,3}},
horizontalAlignment=TextAlignment.Right));
connect(reaPasThrTConOut.u, sigBus.TConOutMea) annotation (Line(points={{70,92},
{70,104},{1,104}}, color={0,0,127}), Text(
connect(reaPasThrTConOut.u, sigBus.TConOutMea) annotation (Line(points={{90,102},
{90,120},{1,120}}, color={0,0,127}), Text(
string="%second",
index=1,
extent={{-6,3},{-6,3}},
horizontalAlignment=TextAlignment.Right));
connect(scaFacTimPel.y, calEER.PEle) annotation (Line(points={{-40,-9},{-40,-66},
{-58,-66}}, color={0,0,127}));
connect(scaFacTimPel.y, calEER.PEle) annotation (Line(points={{-40,-9},{-40,-26},
{-60,-26},{-60,-86},{-78,-86}}, color={0,0,127}));

if useInChi then
connect(reaPasThrTConOut.y, tabPEle.u2)
annotation (Line(points={{70,69},{70,48},{74,48},{74,42}}, color={0,0,127}));
annotation (Line(points={{90,79},{90,70},{84,70},{84,62}}, color={0,0,127}));
connect(reaPasThrTConIn.y, tabPEle.u2)
annotation (Line(points={{40,69},{40,48},{74,48},{74,42}}, color={0,0,127}));
annotation (Line(points={{50,79},{50,70},{84,70},{84,62}}, color={0,0,127}));
connect(reaPasThrTConIn.y, tabQUse_flow.u2)
annotation (Line(points={{40,69},{40,48},{34,48},{34,42}}, color={0,0,127}));
annotation (Line(points={{50,79},{50,70},{44,70},{44,62}}, color={0,0,127}));
connect(reaPasThrTConOut.y, tabQUse_flow.u2)
annotation (Line(points={{70,69},{70,48},{34,48},{34,42}}, color={0,0,127}));
connect(reaPasThrTEvaOut.y, tabQUse_flow.u1) annotation (Line(points={{-20,69},
{-20,66},{40,66},{40,48},{46,48},{46,42}},
color={0,0,127}));
connect(reaPasThrTEvaIn.y, tabQUse_flow.u1) annotation (Line(points={{-50,69},
{-50,62},{40,62},{40,48},{46,48},{46,42}},
annotation (Line(points={{90,79},{90,70},{44,70},{44,62}}, color={0,0,127}));
connect(reaPasThrTEvaOut.y, tabQUse_flow.u1) annotation (Line(points={{-10,79},
{-10,70},{56,70},{56,62}},color={0,0,127}));
connect(reaPasThrTEvaIn.y, tabQUse_flow.u1) annotation (Line(points={{-50,79},
{-50,70},{56,70},{56,62}},
color={0,0,127}));
connect(reaPasThrTEvaOut.y, tabPEle.u1) annotation (Line(points={{-20,69},{
-20,66},{86,66},{86,42}},
connect(reaPasThrTEvaOut.y, tabPEle.u1) annotation (Line(points={{-10,79},{
-10,70},{96,70},{96,62}},
color={0,0,127}));
connect(reaPasThrTEvaIn.y, tabPEle.u1) annotation (Line(points={{-50,69},{-50,
62},{86,62},{86,42}},
connect(reaPasThrTEvaIn.y, tabPEle.u1) annotation (Line(points={{-50,79},{-50,
70},{96,70},{96,62}},
color={0,0,127}));
else
connect(reaPasThrTConOut.y, tabPEle.u1)
annotation (Line(points={{70,69},{70,48},{86,48},{86,42}}, color={0,0,127}));
annotation (Line(points={{90,79},{90,70},{96,70},{96,62}}, color={0,0,127}));
connect(reaPasThrTConOut.y, tabQUse_flow.u1)
annotation (Line(points={{70,69},{70,48},{46,48},{46,42}}, color={0,0,127}));
annotation (Line(points={{90,79},{90,70},{56,70},{56,62}}, color={0,0,127}));
connect(reaPasThrTConIn.y, tabQUse_flow.u1)
annotation (Line(points={{40,69},{40,48},{46,48},{46,42}}, color={0,0,127}));
annotation (Line(points={{50,79},{50,70},{56,70},{56,62}}, color={0,0,127}));
connect(reaPasThrTConIn.y, tabPEle.u1)
annotation (Line(points={{40,69},{40,48},{86,48},{86,42}}, color={0,0,127}));
connect(reaPasThrTEvaOut.y, tabPEle.u2) annotation (Line(points={{-20,69},{
-20,66},{40,66},{40,48},{74,48},{74,42}},
color={0,0,127}));
connect(reaPasThrTEvaOut.y, tabQUse_flow.u2) annotation (Line(points={{-20,69},
{-20,66},{40,66},{40,48},{34,48},{34,42}},color={0,0,127}));
connect(reaPasThrTEvaIn.y, tabQUse_flow.u2) annotation (Line(points={{-50,69},
{-50,62},{40,62},{40,48},{34,48},{34,42}},
color={0,0,127}));
connect(reaPasThrTEvaIn.y, tabPEle.u2) annotation (Line(points={{-50,69},{-50,
62},{74,62},{74,42}}, color={0,0,127}));
annotation (Line(points={{50,79},{50,70},{96,70},{96,62}}, color={0,0,127}));
connect(reaPasThrTEvaOut.y, tabPEle.u2) annotation (Line(points={{-10,79},{
-10,70},{84,70},{84,62}}, color={0,0,127}));
connect(reaPasThrTEvaOut.y, tabQUse_flow.u2) annotation (Line(points={{-10,79},
{-10,70},{44,70},{44,62}}, color={0,0,127}));
connect(reaPasThrTEvaIn.y, tabQUse_flow.u2) annotation (Line(points={{-50,79},
{-50,70},{44,70},{44,62}}, color={0,0,127}));
connect(reaPasThrTEvaIn.y, tabPEle.u2) annotation (Line(points={{-50,79},{-50,
70},{84,70},{84,62}}, color={0,0,127}));
end if;
annotation (Icon(graphics={
Line(points={{-60.0,40.0},{-60.0,-40.0},{60.0,-40.0},{60.0,40.0},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ model RefrigerantCycle
annotation (Placement(transformation(extent={{60,40},{20,80}}, rotation=0)));
RefrigerantCycleHeatPumpCooling refCycHeaPumCoo
"Refrigerant cycle instance for cooling"
annotation (Placement(transformation(extent={{-19,42},{-60,82}}, rotation=0)));
annotation (Placement(transformation(extent={{-19,40},{-60,80}}, rotation=0)));
Modelica.Blocks.Math.Gain gainEva(final k=-1)
"Negate QEva to match definition of heat flow direction" annotation (
Placement(transformation(
extent={{-8,-8},{8,8}},
extent={{-10,-10},{10,10}},
rotation=180,
origin={-32,8})));
origin={-30,10})));
Modelica.Blocks.Math.Gain gainCon(final k=-1)
"Negate QCon to match definition of heat flow direction" annotation (
Placement(transformation(
extent={{-8,-8},{8,8}},
extent={{-10,-10},{10,10}},
rotation=0,
origin={30,-8})));
origin={30,-10})));
protected
IBPSA.Utilities.IO.Strings.StringPassThrough strPasThr
"String pass through to enable conditional string data";
Expand All @@ -56,36 +56,39 @@ equation
end if;
connect(pasTrhModSet.u, sigBus.hea);
connect(refCycHeaPumHea.QCon_flow, swiQCon.u1)
annotation (Line(points={{56,38},{56,8},{58,8}}, color={0,0,127}));
connect(refCycHeaPumHea.PEle, swiPEle.u1) annotation (Line(points={{40,38},{
40,30},{86,30},{86,-52},{8,-52},{8,-58}}, color={0,0,127}));
annotation (Line(points={{53.3333,38.3333},{53.3333,8},{58,8}},
color={0,0,127}));
connect(refCycHeaPumHea.PEle, swiPEle.u1) annotation (Line(points={{40,38.3333},
{40,30},{86,30},{86,-52},{8,-52},{8,-58}},color={0,0,127}));
connect(refCycHeaPumCoo.PEle, swiPEle.u3) annotation (Line(
points={{-39.5,40},{-40,40},{-40,30},{-90,30},{-90,-50},{-8,-50},{-8,-58}},
points={{-39.5,38.3333},{-40,38.3333},{-40,30},{-90,30},{-90,-50},{-8,-50},
{-8,-58}},
color={0,0,127},
pattern=LinePattern.Dash));

connect(refCycHeaPumCoo.QEva_flow, swiQEva.u3) annotation (Line(
points={{-55.9,40},{-56,40},{-56,24},{-52,24},{-52,-8},{-58,-8}},
points={{-53.1667,38.3333},{-52,38.3333},{-52,-8},{-58,-8}},
color={0,0,127},
pattern=LinePattern.Dash));
connect(gainEva.y, swiQEva.u1)
annotation (Line(points={{-40.8,8},{-58,8}}, color={0,0,127}));
annotation (Line(points={{-41,10},{-50,10},{-50,8},{-58,8}},
color={0,0,127}));
connect(swiQCon.u3, gainCon.y) annotation (Line(
points={{58,-8},{38.8,-8}},
points={{58,-8},{50,-8},{50,-10},{41,-10}},
color={0,0,127},
pattern=LinePattern.Dash));
connect(refCycHeaPumCoo.QCon_flow, gainCon.u) annotation (Line(
points={{-23.1,40},{-24,40},{-24,32},{10,32},{10,-8},{20.4,-8}},
points={{-25.8333,38.3333},{-26,38.3333},{-26,30},{10,30},{10,-10},{18,-10}},
color={0,0,127},
pattern=LinePattern.Dash));
connect(refCycHeaPumHea.QEva_flow, gainEva.u) annotation (Line(points={{24,38},
{24,8},{-22.4,8}}, color={0,0,127}));
connect(refCycHeaPumHea.QEva_flow, gainEva.u) annotation (Line(points={{26.6667,
38.3333},{26.6667,10},{-18,10}}, color={0,0,127}));
connect(sigBus,refCycHeaPumCoo.sigBus) annotation (Line(
points={{0,100},{0,90},{-40,90},{-40,86},{-39.705,86},{-39.705,82.8}},
points={{0,100},{0,90},{-40,90},{-40,86},{-39.6708,86},{-39.6708,80}},
color={255,204,51},
thickness=0.5));
connect(sigBus,refCycHeaPumHea.sigBus) annotation (Line(
points={{0,100},{0,90},{39.8,90},{39.8,80.8}},
points={{0,100},{0,90},{39.8333,90},{39.8333,80}},
color={255,204,51},
thickness=0.5));
connect(swiQCon.u2, sigBus.hea) annotation (Line(points={{58,0},{0,0},{0,100}},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
partial model PartialOperationalEnvelope
"Indicates if the device operation is within a defined envelope"
extends BaseClasses.PartialSafetyWithCounter;
parameter Real tabUppHea[:,2]
parameter Modelica.Units.SI.Temperature tabUppHea[:,2]
"Upper boundary for heating with second column as useful temperature side";
parameter Real tabLowCoo[:,2]
parameter Modelica.Units.SI.Temperature tabLowCoo[:,2]
"Lower boundary for cooling with second column as useful temperature side";
parameter Boolean use_TUseSidOut=false
"=true to use useful side outlet temperature for envelope, false for inlet";
Expand Down
Loading

0 comments on commit df5cba1

Please sign in to comment.