Skip to content

Commit

Permalink
Merge branch 'issue1576_heatPumpModelIntegration' of https://github.c…
Browse files Browse the repository at this point in the history 
…om/ibpsa/modelica-ibpsa into issue1576_heatPumpModelIntegration
  • Loading branch information
@FWuellhorst
FWuellhorst committed Mar 16, 2024
2 parents 5fe814d + 21d6833 commit 3c244ab
Show file tree
Hide file tree
Showing 20 changed files with 60 additions and 56 deletions.
4 changes: 4 additions & 0 deletions IBPSA/Resources/Scripts/BuildingsPy/conf.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
openmodelica:
comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
simulate: false
- model_name: IBPSA.Fluid.HeatPumps.ModularReversible.Examples.ReversibleAirToWater2D_OneRoomRadiator
openmodelica:
comment: Could not evaluate structural parameter (or constant)
translate: false
- model_name: IBPSA.ThermalZones.ReducedOrder.Validation.VDI6007.TestCase11
openmodelica:
comment: returned non-zero exit status 139
Expand Down
6 changes: 3 additions & 3 deletions ...urces/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/LargeScaleWaterToWater.mos
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Examples.LargeScaleWaterToWater", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="LargeScaleWaterToWater");
createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="LargeScaleWaterToWater.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QCon_flow", "chi.QEva_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.refCyc.sigBus.ySet", "chi.refCyc.sigBus.yMea"}, range={0.0, 3600.0, 0.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="LargeScaleWaterToWater.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.QCon_flow", "chi.QEva_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.ySet", "chi.refCyc.sigBus.yMea"}, range={0.0, 3600.0, 0.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
6 changes: 3 additions & 3 deletions .../Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ModularReversible.mos
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Examples.ModularReversible", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="ModularReversible");
createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="ModularReversible.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QCon_flow", "chi.QEva_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.refCyc.sigBus.ySet", "chi.refCyc.sigBus.yMea"}, range={0.0, 3600.0, 0.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="ModularReversible.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.QCon_flow", "chi.QEva_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.ySet", "chi.refCyc.sigBus.yMea"}, range={0.0, 3600.0, 0.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
6 changes: 3 additions & 3 deletions ...s/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ReversibleCarnotWithLosses.mos
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Examples.ReversibleCarnotWithLosses", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="ReversibleCarnotWithLosses");
createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="ReversibleCarnotWithLosses.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QCon_flow", "chi.QEva_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.refCyc.sigBus.ySet", "chi.refCyc.sigBus.yMea"}, range={0.0, 3600.0, 0.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="ReversibleCarnotWithLosses.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.QCon_flow", "chi.QEva_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.ySet", "chi.refCyc.sigBus.yMea"}, range={0.0, 3600.0, 0.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
8 changes: 4 additions & 4 deletions IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mos
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Validation.Carnot_y", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Chiller_Carnot_y");
createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.sta_a1.T", "chi.sta_b1.T", "chi.sta_a2.T", "chi.sta_b2.T"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Chiller_Carnot_y.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={75, 70, 1210, 241}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.COP_nominal", "chi.COP"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.sta_a1.T", "chi.sta_b1.T", "chi.sta_a2.T", "chi.sta_b2.T"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Chiller_Carnot_y.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.COP_nominal", "chi.COP"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
8 changes: 4 additions & 4 deletions ...cripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Validation.ConstantCarnotEffectiveness", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Chiller_ConstantCarnotEffectiveness");
createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaInMea", "chi.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Chiller_ConstantCarnotEffectiveness.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={75, 70, 1210, 241}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.refCyc.refCycChiCoo.EER_nominal", "chi.EER"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaInMea", "chi.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Chiller_ConstantCarnotEffectiveness.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.refCycChiCoo.EER_nominal", "chi.EER"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
8 changes: 4 additions & 4 deletions IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/TableData2D.mos
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Validation.TableData2D", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="TableData2D");
createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaInMea", "chi.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="TableData2D.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={75, 70, 1210, 241}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.EER"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaInMea", "chi.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="TableData2D.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"chi.EER"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{238,46,47}});
4 changes: 2 additions & 2 deletions .../Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/AntiFreeze.mos
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Examples.AntiFreeze", stopTime=100, method="CVode", tolerance=1e-08, resultFile="AntiFreeze");
createPlot(id = 1,
position = {19, 32, 798, 500},
position = {19, 32, 826, 408},
y = {"ySet", "yOut"},
range = {0.0, 100.0, 0.0, 1.0},
autoscale = true,
Expand All @@ -15,7 +15,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 826, 408},
y = {"antFre.sigBus.TConInMea", "antFre.sigBus.TEvaOutMea", "antFre.TAntFre"},
range = {0.0, 100.0, 0.0, 15.0},
autoscale = true,
Expand Down
4 changes: 2 additions & 2 deletions ...pts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/MinimalFlowRate.mos
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Examples.MinimalFlowRate", stopTime=100, method="CVode", tolerance=1e-08, resultFile="MinimalFlowRate");
createPlot(id = 1,
position = {19, 32, 798, 500},
position = {19, 32, 826, 408},
y = {"ySet", "yOut"},
range = {0.0, 100.0, 0.0, 1.0},
autoscale = true,
Expand All @@ -15,7 +15,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 826, 408},
y = {"minFloRatSaf.sigBus.mEvaMea_flow", "minFloRatSaf.sigBus.mConMea_flow", "minFloRatSaf.mEvaMin_flow", "minFloRatSaf.mConMin_flow"},
range = {0.0, 100.0, 0.0, 1.0},
autoscale = true,
Expand Down
4 changes: 2 additions & 2 deletions ...Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OperationalEnvelope.mos
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Examples.OperationalEnvelope", stopTime=100, method="CVode", tolerance=1e-08, resultFile="OperationalEnvelope");
createPlot(id = 1,
position = {19, 32, 798, 500},
position = {19, 32, 826, 408},
y = {"ySet", "yOut"},
range = {0.0, 100.0, 0.0, 1.0},
autoscale = true,
Expand All @@ -15,7 +15,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 826, 408},
y = {"sigBus.TConInMea", "opeEnv.bouMapHea.tabBou.y[1]", "opeEnv.bouMapCoo.tab[2, 2]"},
range = {0.0, 100.0, 0.0, 15.0},
displayUnits = {"K", "", ""},
Expand Down
4 changes: 2 additions & 2 deletions ...rces/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mos
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Examples.Safety", stopTime=100, method="CVode", tolerance=1e-08, resultFile="Safety");
createPlot(id = 1,
position = {19, 32, 798, 500},
position = {19, 32, 826, 408},
y = {"ySet", "yOut"},
range = {0.0, 100.0, 0.0, 1.0},
autoscale = true,
Expand All @@ -15,7 +15,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 826, 408},
y = {"safCtr.minFlowErr", "safCtr.opeEnvErr", "safCtr.antFreErr"},
range = {0.0, 100.0, 0.0, 15.0},
autoscale = true,
Expand Down
4 changes: 2 additions & 2 deletions ...ola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 798, 500},
y = {"temSup.T", "temRet.T"},
range = {0.0, 180000.0, 80.0, 10.0},
autoscale = true,
Expand All @@ -30,7 +30,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 798, 500},
y = {"heaPum.refCyc.sigBus.onOffMea"},
range = {0.0, 180000.0, 80.0, 10.0},
autoscale = true,
Expand Down
4 changes: 2 additions & 2 deletions ...s/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ModularReversible_OneRoomRadiator.mos
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 798, 500},
y = {"temSup.T", "temRet.T"},
range = {0.0, 180000.0, 80.0, 10.0},
autoscale = true,
Expand All @@ -30,7 +30,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 798, 500},
y = {"heaPum.refCyc.sigBus.hea", "heaPum.refCyc.sigBus.onOffMea"},
range = {0.0, 180000.0, 80.0, 10.0},
autoscale = true,
Expand Down
6 changes: 3 additions & 3 deletions ...ola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mos
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Examples.ReversibleAirToWater2D_OneRoomRadiator", stopTime=86400, method="CVode", tolerance=1e-08, resultFile="ReversibleAirToWater2D_OneRoomRadiator");
createPlot(id = 1,
position = {19, 32, 798, 500},
position = {19, 32, 809, 500},
y = {"vol.T_start", "vol.T"},
range = {0.0, 180000.0, 100.0, -20.0},
autoscale = true,
Expand All @@ -15,7 +15,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 809, 500},
y = {"temSup.T", "temRet.T"},
range = {0.0, 180000.0, 80.0, 10.0},
autoscale = true,
Expand All @@ -30,7 +30,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 809, 500},
y = {"heaPum.refCyc.sigBus.hea", "heaPum.refCyc.sigBus.onOffMea"},
range = {0.0, 180000.0, 80.0, 10.0},
autoscale = true,
Expand Down
4 changes: 2 additions & 2 deletions ...Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mos
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 798, 500},
y = {"temSup.T", "temRet.T"},
range = {0.0, 180000.0, 80.0, 10.0},
autoscale = true,
Expand All @@ -30,7 +30,7 @@ createPlot(id = 1,
bottomTitleType = 1,
colors = {{0, 0, 255}, {255, 0, 0}});
createPlot(id = 1,
position = {19, 32, 798, 247},
position = {19, 32, 798, 500},
y = {"heaPum.refCyc.sigBus.hea", "heaPum.refCyc.sigBus.onOffMea"},
range = {0.0, 180000.0, 80.0, 10.0},
autoscale = true,
Expand Down
8 changes: 4 additions & 4 deletions ...rces/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/Carnot_y.mos
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Validation.Comparative.Carnot_y", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="HeatPump_Carnot_y");
createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="HeatPump_Carnot_y.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={75, 70, 1210, 241}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.COP_nominal", "heaPum.COP"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="HeatPump_Carnot_y.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
createPlot(id=2, position={39, 13, 913, 546}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
createPlot(id=2, position={39, 13, 913, 546}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
createPlot(id=2, position={39, 13, 913, 546}, y={"heaPum.COP_nominal", "heaPum.COP"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
Loading

0 comments on commit 3c244ab

Please sign in to comment.