Fix amb and use side in OperationalEnvelope

ibpsa · Apr 12, 2024 · 89cf7cd · 89cf7cd
1 parent 35e0c26
commit 89cf7cd
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 37 deletions.
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Controls/Safety/OperationalEnvelope.mo b/IBPSA/Fluid/Chillers/ModularReversible/Controls/Safety/OperationalEnvelope.mo
@@ -9,6 +9,42 @@ model OperationalEnvelope
         rotation=0,
         origin={-50,0})));
 equation
+    if use_TEvaOutHea then
+    connect(bouMapHea.TUseSid, sigBus.TEvaOutMea) annotation (Line(points={{-84.2,
+            82},{-104,82},{-104,-61},{-119,-61}},                       color={0,
+            0,127}));
+  else
+    connect(bouMapHea.TUseSid, sigBus.TEvaInMea) annotation (Line(points={{-84.2,
+            82},{-104,82},{-104,-61},{-119,-61}},                       color={0,
+            0,127}));
+  end if;
+  if use_TConOutCoo then
+    connect(bouMapCoo.TAmbSid, sigBus.TConOutMea) annotation (Line(points={{-84.8,
+            -62},{-104,-62},{-104,-61},{-119,-61}},
+                                                color={0,0,127}));
+  else
+    connect(bouMapCoo.TAmbSid, sigBus.TConInMea) annotation (Line(points={{-84.8,
+            -62},{-104,-62},{-104,-61},{-119,-61}},
+                                                color={0,0,127}));
+  end if;
+  if use_TConOutHea then
+    connect(bouMapHea.TAmbSid, sigBus.TConOutMea) annotation (Line(points={{-84.8,
+            58},{-104,58},{-104,-60},{-106,-60},{-106,-61},{-119,-61}},
+                                                color={0,0,127}));
+  else
+    connect(bouMapHea.TAmbSid, sigBus.TConInMea) annotation (Line(points={{-84.8,
+            58},{-104,58},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
+                                                color={0,0,127}));
+  end if;
+  if use_TEvaOutCoo then
+    connect(bouMapCoo.TUseSid, sigBus.TEvaOutMea) annotation (Line(points={{-84.2,
+            -38},{-104,-38},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
+                                                      color={0,0,127}));
+  else
+    connect(bouMapCoo.TUseSid, sigBus.TEvaInMea) annotation (Line(points={{-84.2,
+            -38},{-104,-38},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
+                                                      color={0,0,127}));
+  end if;
   connect(notCoo.y, swiHeaCoo.u2)
     annotation (Line(points={{-39,0},{-6,0}}, color={255,0,255}));
   connect(notCoo.u, sigBus.coo) annotation (Line(points={{-62,0},{-70,0},{-70,

diff --git a/...uid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialOperationalEnvelope.mo b/...uid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialOperationalEnvelope.mo
@@ -48,42 +48,7 @@ equation
   connect(bouMapHea.noErr, swiHeaCoo.u1)
     annotation (Line(points={{-17,70},{-12,70},{-12,8},{-6,8}},
                                                        color={255,0,255}));
-  if use_TConOutHea then
-    connect(bouMapHea.TUseSid, sigBus.TConOutMea) annotation (Line(points={{-84.2,
-            82},{-104,82},{-104,-61},{-119,-61}},                       color={0,
-            0,127}));
-  else
-    connect(bouMapHea.TUseSid, sigBus.TConInMea) annotation (Line(points={{-84.2,
-            82},{-104,82},{-104,-61},{-119,-61}},                       color={0,
-            0,127}));
-  end if;
-  if use_TConOutCoo then
-    connect(bouMapCoo.TAmbSid, sigBus.TConOutMea) annotation (Line(points={{-84.8,
-            -62},{-104,-62},{-104,-61},{-119,-61}},
-                                                color={0,0,127}));
-  else
-    connect(bouMapCoo.TAmbSid, sigBus.TConInMea) annotation (Line(points={{-84.8,
-            -62},{-104,-62},{-104,-61},{-119,-61}},
-                                                color={0,0,127}));
-  end if;
-  if use_TEvaOutHea then
-    connect(bouMapHea.TAmbSid, sigBus.TEvaOutMea) annotation (Line(points={{-84.8,
-            58},{-104,58},{-104,-60},{-106,-60},{-106,-61},{-119,-61}},
-                                                color={0,0,127}));
-  else
-    connect(bouMapHea.TAmbSid, sigBus.TEvaInMea) annotation (Line(points={{-84.8,
-            58},{-104,58},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
-                                                color={0,0,127}));
-  end if;
-  if use_TEvaOutCoo then
-    connect(bouMapCoo.TUseSid, sigBus.TEvaOutMea) annotation (Line(points={{-84.2,
-            -38},{-104,-38},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
-                                                      color={0,0,127}));
-  else
-    connect(bouMapCoo.TUseSid, sigBus.TEvaInMea) annotation (Line(points={{-84.2,
-            -38},{-104,-38},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
-                                                      color={0,0,127}));
-  end if;
+
   annotation (Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
     Documentation(revisions="<html><ul>
   <li>

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/OperationalEnvelope.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/OperationalEnvelope.mo
@@ -3,7 +3,42 @@ model OperationalEnvelope
   "Indicates if the heat pump operation is within a defined envelope"
   extends BaseClasses.PartialOperationalEnvelope;
 equation
-
+  if use_TConOutHea then
+    connect(bouMapHea.TUseSid, sigBus.TConOutMea) annotation (Line(points={{-84.2,
+            82},{-104,82},{-104,-61},{-119,-61}},                       color={0,
+            0,127}));
+  else
+    connect(bouMapHea.TUseSid, sigBus.TConInMea) annotation (Line(points={{-84.2,
+            82},{-104,82},{-104,-61},{-119,-61}},                       color={0,
+            0,127}));
+  end if;
+  if use_TEvaOutCoo then
+    connect(bouMapCoo.TAmbSid, sigBus.TEvaOutMea) annotation (Line(points={{-84.8,
+            -62},{-104,-62},{-104,-61},{-119,-61}},
+                                                color={0,0,127}));
+  else
+    connect(bouMapCoo.TAmbSid, sigBus.TEvaInMea) annotation (Line(points={{-84.8,
+            -62},{-104,-62},{-104,-61},{-119,-61}},
+                                                color={0,0,127}));
+  end if;
+  if use_TEvaOutHea then
+    connect(bouMapHea.TAmbSid, sigBus.TEvaOutMea) annotation (Line(points={{-84.8,
+            58},{-104,58},{-104,-60},{-106,-60},{-106,-61},{-119,-61}},
+                                                color={0,0,127}));
+  else
+    connect(bouMapHea.TAmbSid, sigBus.TEvaInMea) annotation (Line(points={{-84.8,
+            58},{-104,58},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
+                                                color={0,0,127}));
+  end if;
+  if use_TConOutCoo then
+    connect(bouMapCoo.TUseSid, sigBus.TConOutMea) annotation (Line(points={{-84.2,
+            -38},{-104,-38},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
+                                                      color={0,0,127}));
+  else
+    connect(bouMapCoo.TUseSid, sigBus.TConInMea) annotation (Line(points={{-84.2,
+            -38},{-104,-38},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
+                                                      color={0,0,127}));
+  end if;
   connect(swiHeaCoo.u2, sigBus.hea) annotation (Line(points={{-6,0},{-20,0},{
           -20,-4},{-104,-4},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
                             color={255,0,255}), Text(