fix diagrams in examples

ibpsa · Dec 8, 2023 · 8290899 · 8290899
1 parent e70b43f
commit 8290899
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 94 deletions.
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/ModularReversible.mo b/IBPSA/Fluid/Chillers/ModularReversible/ModularReversible.mo
@@ -71,8 +71,9 @@ equation
           {-140,-42},{-140,-41},{-141,-41}},
                                 color={255,0,255}));
   connect(coo, sigBus.coo)
-    annotation (Line(points={{-156,-70},{-128,-70},{-128,-40},{-134,-40},{-134,-41},
-          {-141,-41}}, color={255,0,255}));
+    annotation (Line(points={{-156,-70},{-128,-70},{-128,-40},{-134,-40},{-134,
+          -41},{-141,-41}},
+                       color={255,0,255}));
   annotation (Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
         Line(points={{-88,60},{88,60}}, color={28,108,200})}),
     Diagram(coordinateSystem(extent={{-140,-160},{140,160}})),

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/PartialModularComparison.mo b/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/PartialModularComparison.mo
@@ -40,19 +40,19 @@ partial model PartialModularComparison
     final TEva_start=T2_start,
     final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Modular chiller model"
-    annotation (Placement(transformation(extent={{-10,-12},{10,12}})));
+    annotation (Placement(transformation(extent={{-8,-10},{12,10}})));
 
 equation
   connect(chi.port_a1, sou1.ports[1])
-    annotation (Line(points={{-10,6},{-40,6}}, color={0,127,255}));
-  connect(chi.port_b2, sin2.ports[1]) annotation (Line(points={{-10,-6},{-32,-6},{
+    annotation (Line(points={{-8,6},{-40,6}},  color={0,127,255}));
+  connect(chi.port_b2, sin2.ports[1]) annotation (Line(points={{-8,-6},{-32,-6},{
           -32,-30},{-40,-30}}, color={0,127,255}));
   connect(chi.port_a2, sou2.ports[1])
-    annotation (Line(points={{10,-6},{40,-6}}, color={0,127,255}));
+    annotation (Line(points={{12,-6},{40,-6}}, color={0,127,255}));
   connect(chi.port_b1, sin1.ports[1])
-    annotation (Line(points={{10,6},{36,6},{36,30},{60,30}}, color={0,127,255}));
-  connect(chi.ySet, uCom.y) annotation (Line(points={{-11.6,2},{-11.6,8},{-32,8},{
-          -32,50},{-39,50}}, color={0,0,127}));
+    annotation (Line(points={{12,6},{36,6},{36,30},{60,30}}, color={0,127,255}));
+  connect(chi.ySet, uCom.y) annotation (Line(points={{-9.2,2},{-34,2},{-34,50},{
+          -39,50}},          color={0,0,127}));
 
   annotation (
     Documentation(revisions="<html>

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mo b/IBPSA/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mo
@@ -27,19 +27,19 @@ model Carnot_y "Example using the Carnot model approach"
     T1_start=T1_start,
     T2_start=T2_start)
                      "Chiller model"
-    annotation (Placement(transformation(extent={{-12,-10},{8,10}})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
 equation
   connect(sin2.ports[1], chi.port_b2) annotation (Line(points={{-40,-30},{-16,-30},
-          {-16,-6},{-12,-6}}, color={0,127,255}));
+          {-16,-6},{-10,-6}}, color={0,127,255}));
   connect(chi.port_a2, sou2.ports[1])
-    annotation (Line(points={{8,-6},{40,-6}},  color={0,127,255}));
+    annotation (Line(points={{10,-6},{40,-6}}, color={0,127,255}));
   connect(chi.port_b1, sin1.ports[1])
-    annotation (Line(points={{8,6},{36,6},{36,30},{60,30}},  color={0,127,255}));
-  connect(chi.port_a1, sou1.ports[1]) annotation (Line(points={{-12,6},{-40,6}},
+    annotation (Line(points={{10,6},{36,6},{36,30},{60,30}}, color={0,127,255}));
+  connect(chi.port_a1, sou1.ports[1]) annotation (Line(points={{-10,6},{-40,6}},
                        color={0,127,255}));
   connect(chi.y, uCom.y)
-    annotation (Line(points={{-14,9},{-14,50},{-39,50}}, color={0,0,127}));
+    annotation (Line(points={{-12,9},{-12,50},{-39,50}}, color={0,0,127}));
 
   annotation (experiment(Tolerance=1e-6, StopTime=3600),
 __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Validation/Carnot_y.mos"

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
@@ -355,9 +355,9 @@ partial model PartialReversibleRefrigerantMachine
         origin={-98,12})));
 
 // To avoid using the bus, set the section below to protected
+protected
 // <!-- @include_Buildings @include_IDEAS @include_BuildingSystems
 // -->
-protected
   RefrigerantMachineControlBus sigBus
     "Bus with model outputs and possibly inputs" annotation (Placement(transformation(
           extent={{-156,-58},{-126,-24}}),iconTransformation(extent={{-108,-52},
@@ -370,9 +370,9 @@ protected
           use_intSafCtr));
 
 // <!-- @include_AixLib
+protected
 // -->
 
-protected
   parameter Real scaFac "Scaling factor";
   parameter MediumCon.ThermodynamicState staCon_nominal=MediumCon.setState_pTX(
       T=MediumCon.T_default, p=MediumCon.p_default, X=MediumCon.X_default)
@@ -461,7 +461,6 @@ equation
       string="%second",
       index=1,
       extent={{6,3},{6,3}}));
-
   connect(refCyc.PEle, sigBus.PEleMea) annotation (Line(points={{19.89,0.09},{26,
           0.09},{26,-30},{-20,-30},{-20,-40},{-138,-40},{-138,-41},{-141,-41}},
         color={0,0,127}), Text(
@@ -471,13 +470,13 @@ equation
   connect(hys.y, sigBus.onOffMea) annotation (Line(points={{-99,-90},{-88,-90},{
           -88,-70},{-128,-70},{-128,-40},{-134,-40},{-134,-41},{-141,-41}},
                                            color={255,0,255}));
-  connect(varTOutCon.T, sigBus.TConAmbMea) annotation (Line(
-      points={{82,130},{120,130},{120,32},{-76,32},{-76,-40},{-138,-40},{-138,-42},
+  connect(TConAmb, sigBus.TConAmbMea) annotation (Line(
+      points={{150,130},{120,130},{120,32},{-76,32},{-76,-40},{-138,-40},{-138,-42},
           {-140,-42},{-140,-41},{-141,-41}},
       color={0,0,127},
       pattern=LinePattern.Dash));
-  connect(varTOutEva.T, sigBus.TEvaAmbMea) annotation (Line(
-      points={{82,-130},{88,-130},{88,-150},{-76,-150},{-76,-40},{-138,-40},{-138,
+  connect(TEvaAmb, sigBus.TEvaAmbMea) annotation (Line(
+      points={{146,-130},{110,-130},{110,-150},{-76,-150},{-76,-40},{-138,-40},{-138,
           -41},{-141,-41}},
       color={0,0,127},
       pattern=LinePattern.Dash));

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
@@ -31,18 +31,18 @@ model LargeScaleWaterToWater_OneRoomRadiator
       IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.WAMAK_WaterToWater_220kW
       datTab)
     "Large scale water to water heat pump"
-    annotation (Placement(transformation(extent={{20,-160},{0,-136}})));
+    annotation (Placement(transformation(extent={{20,-160},{0,-140}})));
 equation
-  connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={
-          {20,-154},{38,-154},{38,-200},{60,-200}}, color={0,127,255}));
+  connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={{20,-156},{38,
+          -156},{38,-200},{60,-200}},               color={0,127,255}));
   connect(heaPum.port_a2, pumHeaPumSou.port_b) annotation (Line(
-        points={{0,-154},{-30,-154},{-30,-170}}, color={0,127,255}));
+        points={{0,-156},{-30,-156},{-30,-170}}, color={0,127,255}));
   connect(heaPum.port_b1, pumHeaPum.port_a) annotation (Line(
-        points={{0,-142},{-70,-142},{-70,-120}}, color={0,127,255}));
-  connect(heaPum.port_a1, temRet.port_b) annotation (Line(points=
-          {{20,-142},{60,-142},{60,-30}}, color={0,127,255}));
+        points={{0,-144},{-70,-144},{-70,-120}}, color={0,127,255}));
+  connect(heaPum.port_a1, temRet.port_b) annotation (Line(points={{20,-144},{60,
+          -144},{60,-30}},                color={0,127,255}));
   connect(oneRooRadHeaPumCtr.ySet, heaPum.ySet) annotation (Line(
-        points={{-139,-66},{-62,-66},{-62,-76},{21.6,-76},{21.6,-146}}, color={
+        points={{-139,-66},{-62,-66},{-62,-76},{21.2,-76},{21.2,-148}}, color={
           0,0,127}));
   annotation (
      __Dymola_Commands(file=

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/ModularReversible_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/ModularReversible_OneRoomRadiator.mo
@@ -56,7 +56,7 @@ model ModularReversible_OneRoomRadiator
       use_TAmbSidOut=false,
       use_antFre=true,
       TAntFre=275.15)) "Modular reversible heat pump"
-    annotation (Placement(transformation(extent={{20,-160},{0,-136}})));
+    annotation (Placement(transformation(extent={{20,-160},{0,-140}})));
 
   Modelica.Blocks.Sources.Constant temAmbBas(final k=273.15 + 18)
     "Ambient temperature in basement of building" annotation (Placement(
@@ -65,21 +65,22 @@ model ModularReversible_OneRoomRadiator
         rotation=90,
         origin={10,-190})));
 equation
-  connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={{20,-154},
-          {38,-154},{38,-200},{60,-200}}, color={0,127,255}));
-  connect(heaPum.port_a2, pumHeaPumSou.port_b) annotation (Line(points={{0,
-          -154},{-30,-154},{-30,-170}}, color={0,127,255}));
-  connect(heaPum.port_b1, pumHeaPum.port_a) annotation (Line(points={{0,-142},
-          {-70,-142},{-70,-120}}, color={0,127,255}));
-  connect(heaPum.port_a1, temRet.port_b) annotation (Line(points={{20,-142},
-          {60,-142},{60,-30}}, color={0,127,255}));
-  connect(temAmbBas.y, heaPum.TConAmb) annotation (Line(points={{10,-179},
-          {10,-162},{-1,-162},{-1,-138}}, color={0,0,127}));
-  connect(heaPum.hea, oneRooRadHeaPumCtr.hea) annotation (Line(points={{21.6,
-          -157},{24,-157},{24,-152},{26,-152},{26,-92},{-132,-92},{-132,-76},{-139,
-          -76}}, color={255,0,255}));
-  connect(oneRooRadHeaPumCtr.ySet, heaPum.ySet) annotation (Line(points={
-          {-139,-66},{30,-66},{30,-146},{21.6,-146}}, color={0,0,127}));
+  connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={{20,-156},{38,
+          -156},{38,-200},{60,-200}},     color={0,127,255}));
+  connect(heaPum.port_a2, pumHeaPumSou.port_b) annotation (Line(points={{0,-156},
+          {-30,-156},{-30,-170}},       color={0,127,255}));
+  connect(heaPum.port_b1, pumHeaPum.port_a) annotation (Line(points={{0,-144},{
+          -70,-144},{-70,-120}},  color={0,127,255}));
+  connect(heaPum.port_a1, temRet.port_b) annotation (Line(points={{20,-144},{60,
+          -144},{60,-30}},     color={0,127,255}));
+  connect(temAmbBas.y, heaPum.TConAmb) annotation (Line(points={{10,-179},{10,
+          -162},{-1,-162},{-1,-147.6}},   color={0,0,127}));
+  connect(heaPum.hea, oneRooRadHeaPumCtr.hea) annotation (Line(points={{21.1,
+          -151.9},{24,-151.9},{24,-152},{26,-152},{26,-92},{-132,-92},{-132,-76},
+          {-139,-76}},
+                 color={255,0,255}));
+  connect(oneRooRadHeaPumCtr.ySet, heaPum.ySet) annotation (Line(points={{-139,
+          -66},{30,-66},{30,-148},{21.2,-148}},       color={0,0,127}));
   annotation (Documentation(info="<html>
 <p>
   This example demonstrates how to use the

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mo
@@ -38,24 +38,25 @@ model ReversibleAirToWater2D_OneRoomRadiator
       use_maxCycRat=true,
       use_antFre=true,
       TAntFre=275.15)) "Reversible heat pump with losses and carnot approach"
-    annotation (Placement(transformation(extent={{20,-160},{0,-136}})));
+    annotation (Placement(transformation(extent={{20,-160},{0,-140}})));
   extends Modelica.Icons.Example;
 
 equation
-  connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={{20,
-          -154},{38,-154},{38,-200},{60,-200}}, color={0,127,255}));
+  connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={{20,-156},{38,
+          -156},{38,-200},{60,-200}},           color={0,127,255}));
   connect(heaPum.port_a2, pumHeaPumSou.port_b) annotation (Line(
-        points={{0,-154},{-30,-154},{-30,-170}}, color={0,127,255}));
-  connect(heaPum.port_b1, pumHeaPum.port_a) annotation (Line(points=
-         {{0,-142},{-70,-142},{-70,-120}}, color={0,127,255}));
-  connect(heaPum.port_a1, temRet.port_b) annotation (Line(points={{20,
-          -142},{60,-142},{60,-30}}, color={0,127,255}));
+        points={{0,-156},{-30,-156},{-30,-170}}, color={0,127,255}));
+  connect(heaPum.port_b1, pumHeaPum.port_a) annotation (Line(points={{0,-144},{
+          -70,-144},{-70,-120}},           color={0,127,255}));
+  connect(heaPum.port_a1, temRet.port_b) annotation (Line(points={{20,-144},{60,
+          -144},{60,-30}},           color={0,127,255}));
   connect(oneRooRadHeaPumCtr.ySet, heaPum.ySet) annotation (Line(
-        points={{-139,-66},{-112,-66},{-112,-62},{21.6,-62},{21.6,-146}}, color=
+        points={{-139,-66},{-112,-66},{-112,-62},{21.2,-62},{21.2,-148}}, color=
          {0,0,127}));
   connect(heaPum.hea, oneRooRadHeaPumCtr.hea) annotation (Line(
-        points={{21.6,-157},{24,-157},{24,-152},{26,-152},{26,-80},{-14,-80},{-14,
-          -86},{-134,-86},{-134,-76},{-139,-76}}, color={255,0,255}));
+        points={{21.1,-151.9},{24,-151.9},{24,-152},{26,-152},{26,-80},{-14,-80},
+          {-14,-86},{-134,-86},{-134,-76},{-139,-76}},
+                                                  color={255,0,255}));
   annotation (
    __Dymola_Commands(file=
      "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mos"

diff --git a/.../Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mo b/.../Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mo
@@ -35,32 +35,33 @@ model ReversibleCarnotWithLosses_OneRoomRadiator
       safCtrPar,
     quaGra=0.4)
               "Reversible heat pump with losses and carnot approach"
-    annotation (Placement(transformation(extent={{20,-162},{0,-138}})));
+    annotation (Placement(transformation(extent={{20,-160},{0,-140}})));
   Modelica.Blocks.Sources.Constant temAmbBas(final k=273.15 + 18)
     "Ambient temperature in basement of building" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={10,-190})));
 equation
-  connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={{20,-156},
-          {38,-156},{38,-200},{60,-200}},       color={0,127,255}));
+  connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={{20,-156},{38,
+          -156},{38,-200},{60,-200}},           color={0,127,255}));
   connect(heaPum.port_a2, pumHeaPumSou.port_b) annotation (Line(
         points={{0,-156},{-30,-156},{-30,-170}}, color={0,127,255}));
-  connect(heaPum.port_b1, pumHeaPum.port_a) annotation (Line(points={{0,-144},
-          {-70,-144},{-70,-120}},          color={0,127,255}));
-  connect(heaPum.port_a1, temRet.port_b) annotation (Line(points={{20,-144},
-          {60,-144},{60,-30}},       color={0,127,255}));
-  connect(temAmbBas.y, heaPum.TEvaAmb) annotation (Line(points={{10,-179},
-          {10,-166},{-6,-166},{-6,-160},{-1,-160}},       color={0,0,127}));
-  connect(temAmbBas.y, heaPum.TConAmb) annotation (Line(points={{10,-179},
-          {10,-166},{-6,-166},{-6,-140},{-1,-140}},       color={0,0,127}));
+  connect(heaPum.port_b1, pumHeaPum.port_a) annotation (Line(points={{0,-144},{
+          -70,-144},{-70,-120}},           color={0,127,255}));
+  connect(heaPum.port_a1, temRet.port_b) annotation (Line(points={{20,-144},{60,
+          -144},{60,-30}},           color={0,127,255}));
+  connect(temAmbBas.y, heaPum.TEvaAmb) annotation (Line(points={{10,-179},{10,
+          -166},{-6,-166},{-6,-152},{-1,-152}},           color={0,0,127}));
+  connect(temAmbBas.y, heaPum.TConAmb) annotation (Line(points={{10,-179},{10,
+          -166},{-6,-166},{-6,-147.6},{-1,-147.6}},       color={0,0,127}));
 
   connect(oneRooRadHeaPumCtr.hea, heaPum.hea) annotation (Line(
-        points={{-139,-76},{-94,-76},{-94,-166},{28,-166},{28,-159},{21.6,-159}},
+        points={{-139,-76},{-94,-76},{-94,-166},{28,-166},{28,-151.9},{21.1,
+          -151.9}},
         color={255,0,255}));
   connect(oneRooRadHeaPumCtr.ySet, heaPum.ySet) annotation (Line(
-        points={{-139,-66},{28,-66},{28,-148},{21.6,-148}}, color={0,0,127}));
+        points={{-139,-66},{28,-66},{28,-148},{21.2,-148}}, color={0,0,127}));
   annotation (
    __Dymola_Commands(file=
      "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mos"

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/ModularReversible.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/ModularReversible.mo
@@ -63,14 +63,15 @@ model ModularReversible
         origin={-110,-130})));
   Modelica.Blocks.Interfaces.BooleanInput hea if not use_busConOnl and use_rev
     "=true for heating, =false for cooling"
-    annotation (Placement(transformation(extent={{-172,-88},{-140,-56}}),
+    annotation (Placement(transformation(extent={{-172,-86},{-140,-54}}),
         iconTransformation(extent={{-120,-28},{-102,-10}})));
 equation
   connect(conHea.y, sigBus.hea)
     annotation (Line(points={{-99,-130},{-80,-130},{-80,-40},{-140,-40},{-140,
           -41},{-141,-41}},     color={255,0,255}));
   connect(hea, sigBus.hea)
-    annotation (Line(points={{-156,-72},{-130,-72},{-130,-41},{-141,-41}},
+    annotation (Line(points={{-156,-70},{-128,-70},{-128,-40},{-134,-40},{-134,
+          -41},{-141,-41}},
                        color={255,0,255}));
   annotation (Icon(coordinateSystem(extent={{-100,-100},{100,100}})),
     Diagram(coordinateSystem(extent={{-140,-160},{140,160}})),

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/PartialValidation.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/BaseClasses/PartialValidation.mo
@@ -54,9 +54,9 @@ partial model PartialValidation
     redeclare model RefrigerantCycleHeatPumpCooling =
         IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.BaseClasses.NoCooling)
     "Heat pump" annotation (Placement(transformation(
-        extent={{-24,-29},{24,29}},
+        extent={{-10.5,-10.5},{10.5,10.5}},
         rotation=270,
-        origin={2,-21})));
+        origin={10.5,-30.5})));
 
   IBPSA.Fluid.Sources.Boundary_pT sinSidFixBou(redeclare final package Medium =
         MediumSin, nPorts=1) "Fixed boundary at the outlet of the sink side"
@@ -123,14 +123,14 @@ partial model PartialValidation
     annotation (Placement(transformation(extent={{60,60},{80,80}})));
 equation
 
-  connect(souSidMasFlowSou.ports[1], heaPum.port_a2) annotation (Line(points={{
-          -20,-52},{-18,-52},{-18,-45},{-12.5,-45}}, color={0,127,255}));
-  connect(heaPum.port_b2, souSidFixBou.ports[1]) annotation (Line(points={{-12.5,
-          3},{-16,3},{-16,11},{-20,11}}, color={0,127,255}));
-  connect(heaPum.port_b1, sinSidFixBou.ports[1]) annotation (Line(points={{16.5,
-          -45},{16.5,-50},{40,-50}}, color={0,127,255}));
-  connect(heaPum.port_a1, sinSidMasFlowSou.ports[1]) annotation (Line(points={{
-          16.5,3},{16.5,12},{30,12},{30,20}}, color={0,127,255}));
+  connect(souSidMasFlowSou.ports[1], heaPum.port_a2) annotation (Line(points={{-20,-52},
+          {4,-52},{4,-41},{4.2,-41}},                color={0,127,255}));
+  connect(heaPum.port_b2, souSidFixBou.ports[1]) annotation (Line(points={{4.2,-20},
+          {4,-20},{4,11},{-20,11}},      color={0,127,255}));
+  connect(heaPum.port_b1, sinSidFixBou.ports[1]) annotation (Line(points={{16.8,
+          -41},{16.8,-50},{40,-50}}, color={0,127,255}));
+  connect(heaPum.port_a1, sinSidMasFlowSou.ports[1]) annotation (Line(points={{16.8,
+          -20},{16.8,12},{30,12},{30,20}},    color={0,127,255}));
   connect(mEva_flow.y, souSidMasFlowSou.m_flow_in)
     annotation (Line(points={{-59,-30},{-42,-30},{-42,-44}}, color={0,0,127}));
   connect(sinSidMasFlowSou.m_flow_in, mCon_flow.y)
@@ -140,7 +140,7 @@ equation
   connect(tabMea.y[7], mCon_flow.u) annotation (Line(points={{-69,80},{-56,80},{
           -56,50},{-2,50}},  color={0,0,127}));
   connect(tabMea.y[6], heaPum.ySet) annotation (Line(points={{-69,80},{-56,80},{
-          -56,26},{6.83333,26},{6.83333,6.84}}, color={0,0,127}));
+          -56,26},{12.6,26},{12.6,-18.74}},     color={0,0,127}));
   connect(tabMea.y[9], souSidMasFlowSou.T_in) annotation (Line(points={{-69,80},{
           -56,80},{-56,26},{-88,26},{-88,-48},{-42,-48}},  color={0,0,127}));
   connect(sinSidMasFlowSou.T_in, tabMea.y[1]) annotation (Line(points={{34,42},{

diff --git a/...eatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialModularComparison.mo b/...eatPumps/ModularReversible/Validation/Comparative/BaseClasses/PartialModularComparison.mo
@@ -40,19 +40,20 @@ partial model PartialModularComparison
     final TEva_start=T2_start,
     final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Modular heat pump model"
-    annotation (Placement(transformation(extent={{-10,-12},{10,12}})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
 equation
   connect(heaPum.port_a1, sou1.ports[1])
     annotation (Line(points={{-10,6},{-40,6}}, color={0,127,255}));
-  connect(heaPum.port_b2, sin2.ports[1]) annotation (Line(points={{-10,-6},{-32,-6},
-          {-32,-30},{-40,-30}}, color={0,127,255}));
+  connect(heaPum.port_b2, sin2.ports[1]) annotation (Line(points={{-10,-6},{-32,
+          -6},{-32,-30},{-40,-30}},
+                                color={0,127,255}));
   connect(heaPum.port_a2, sou2.ports[1])
     annotation (Line(points={{10,-6},{40,-6}}, color={0,127,255}));
   connect(heaPum.port_b1, sin1.ports[1])
     annotation (Line(points={{10,6},{36,6},{36,30},{60,30}}, color={0,127,255}));
-  connect(heaPum.ySet, uCom.y) annotation (Line(points={{-11.6,2},{-11.6,8},{-32,
-          8},{-32,50},{-39,50}}, color={0,0,127}));
+  connect(heaPum.ySet, uCom.y) annotation (Line(points={{-11.2,2},{-34,2},{-34,50},
+          {-39,50}},             color={0,0,127}));
 
   annotation (
     Documentation(revisions="<html>