diff --git a/IBPSA/Resources/Scripts/BuildingsPy/conf.yml b/IBPSA/Resources/Scripts/BuildingsPy/conf.yml
index 6708f14ba4..36a48679a4 100644
--- a/IBPSA/Resources/Scripts/BuildingsPy/conf.yml
+++ b/IBPSA/Resources/Scripts/BuildingsPy/conf.yml
@@ -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
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/LargeScaleWaterToWater.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/LargeScaleWaterToWater.mos
index 570e8009e5..eb945a5fc8 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/LargeScaleWaterToWater.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/LargeScaleWaterToWater.mos
@@ -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}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ModularReversible.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ModularReversible.mos
index a3bda765f7..ae8efa2834 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ModularReversible.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ModularReversible.mos
@@ -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}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ReversibleCarnotWithLosses.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ReversibleCarnotWithLosses.mos
index 089e966d5b..92a49f15a3 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ReversibleCarnotWithLosses.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ReversibleCarnotWithLosses.mos
@@ -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}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mos
index abdafeb8fd..178b1cf538 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mos
@@ -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}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
index 83b9016f07..b6a9ca15cc 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
@@ -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}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/TableData2D.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/TableData2D.mos
index afb85091c6..c403d2a7b7 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/TableData2D.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/TableData2D.mos
@@ -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}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/AntiFreeze.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/AntiFreeze.mos
index 06501077a3..2a94ed89aa 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/AntiFreeze.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/AntiFreeze.mos
@@ -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,
@@ -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,
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/MinimalFlowRate.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/MinimalFlowRate.mos
index 06bf2f88fd..d46f8ccfcf 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/MinimalFlowRate.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/MinimalFlowRate.mos
@@ -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,
@@ -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,
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OperationalEnvelope.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OperationalEnvelope.mos
index fe5a60e21a..5260db4c5c 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OperationalEnvelope.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OperationalEnvelope.mos
@@ -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,
@@ -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", "", ""},
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mos
index f989dedf93..b198c24262 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mos
@@ -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,
@@ -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,
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos
index 40ef832177..b91e958865 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos
@@ -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,
@@ -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,
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ModularReversible_OneRoomRadiator.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ModularReversible_OneRoomRadiator.mos
index 961d73fd00..4efd21c8fa 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ModularReversible_OneRoomRadiator.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ModularReversible_OneRoomRadiator.mos
@@ -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,
@@ -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,
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mos
index 4a98cc6070..849e010a41 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mos
@@ -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,
@@ -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,
@@ -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,
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mos
index f7341de182..1cd92ff73c 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mos
@@ -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,
@@ -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,
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/Carnot_y.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/Carnot_y.mos
index b4558d9eb6..23d4ac4a34 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/Carnot_y.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/Carnot_y.mos
@@ -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}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos
index a523725966..4b85a3b9c5 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/ConstantCarnotEffectiveness.mos
@@ -1,5 +1,5 @@
 simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Validation.Comparative.ConstantCarnotEffectiveness", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="HeatPump_ConstantCarnotEffectiveness");
-createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.refCyc.sigBus.TConInMea", "heaPum.refCyc.sigBus.TConOutMea", "heaPum.refCyc.sigBus.TEvaInMea", "heaPum.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="HeatPump_ConstantCarnotEffectiveness.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.refCyc.refCycHeaPumHea.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.refCyc.sigBus.TConInMea", "heaPum.refCyc.sigBus.TConOutMea", "heaPum.refCyc.sigBus.TEvaInMea", "heaPum.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="HeatPump_ConstantCarnotEffectiveness.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.refCyc.refCycHeaPumHea.COP_nominal", "heaPum.COP"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/TableData2D.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/TableData2D.mos
index 8f5c6bf13e..b85b9ddde7 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/TableData2D.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/Comparative/TableData2D.mos
@@ -1,5 +1,5 @@
 simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Validation.Comparative.TableData2D", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="HeatPump_TableData2D");
-createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.refCyc.sigBus.TConInMea", "heaPum.refCyc.sigBus.TConOutMea", "heaPum.refCyc.sigBus.TEvaInMea", "heaPum.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="HeatPump_TableData2D.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"}, 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={"heaPum.refCyc.sigBus.TConInMea", "heaPum.refCyc.sigBus.TConOutMea", "heaPum.refCyc.sigBus.TEvaInMea", "heaPum.refCyc.sigBus.TEvaOutMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="HeatPump_TableData2D.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"}, range={0.0, 3600.0, 3.0, 10.0}, grid=true, subPlot=4, colors={{238,46,47}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/ConstantCarnotEffectiveness.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
index 254634930a..5e95a0fdf4 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/ConstantCarnotEffectiveness.mos
@@ -1,4 +1,4 @@
 simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Validation.ConstantCarnotEffectiveness", tolerance=1e-6, stopTime=14365, method="CVode", resultFile="ConstantCarnotEffectiveness");
-createPlot(id=2, position={75, 70, 1210, 980}, y={"TConOutMea", "TConOutSim"}, range={0.0, 14365.0, 293.15, 363.15}, grid=true, filename="ConstantCarnotEffectiveness.mat", colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={75, 70, 1210, 191}, y={"PEleMea", "PEleSim"}, range={0.0, 14365.0, 0.0, 3000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={75, 70, 1210, 192}, y={"TEvaOutMea", "TEvaOutSim"}, range={0.0, 14365.0, 273.15, 303.15}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
\ No newline at end of file
+createPlot(id=2, position={39, 13, 913, 546}, y={"TConOutMea", "TConOutSim"}, range={0.0, 14365.0, 293.15, 363.15}, grid=true, filename="ConstantCarnotEffectiveness.mat", colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={39, 13, 913, 546}, y={"PEleMea", "PEleSim"}, range={0.0, 14365.0, 0.0, 3000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={39, 13, 913, 546}, y={"TEvaOutMea", "TEvaOutSim"}, range={0.0, 14365.0, 273.15, 303.15}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/TableData2D.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/TableData2D.mos
index bed5e11b46..29ea79b173 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/TableData2D.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Validation/TableData2D.mos
@@ -1,4 +1,4 @@
 simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Validation.TableData2D", tolerance=1e-6, stopTime=14365, method="CVode", resultFile="TableData2D");
-createPlot(id=2, position={75, 70, 1210, 980}, y={"TConOutMea", "TConOutSim"}, range={0.0, 14365.0, 293.15, 363.15}, grid=true, filename="TableData2D.mat", colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={75, 70, 1210, 191}, y={"PEleMea", "PEleSim"}, range={0.0, 14365.0, 0.0, 3000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={75, 70, 1210, 192}, y={"TEvaOutMea", "TEvaOutSim"}, range={0.0, 14365.0, 273.15, 303.15}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
\ No newline at end of file
+createPlot(id=2, position={39, 13, 913, 546}, y={"TConOutMea", "TConOutSim"}, range={0.0, 14365.0, 293.15, 363.15}, grid=true, filename="TableData2D.mat", colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={39, 13, 913, 546}, y={"PEleMea", "PEleSim"}, range={0.0, 14365.0, 0.0, 3000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={39, 13, 913, 546}, y={"TEvaOutMea", "TEvaOutSim"}, range={0.0, 14365.0, 273.15, 303.15}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});