Merge pull request #1843 from ibpsa/issue1842_wrongAnnotation

Corrected wrong annotation
ibpsa · Mar 13, 2024 · b8d6489 · b8d6489
2 parents b3dacd3 + 5ffc308
commit b8d6489
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 34 deletions.
diff --git a/IBPSA/Airflow/Multizone/MediumColumn.mo b/IBPSA/Airflow/Multizone/MediumColumn.mo
@@ -103,11 +103,13 @@ equation
         Text(
           extent={{24,-78},{106,-100}},
           textColor={0,0,127},
-          textString="Bottom"),
+          textString="Bottom",
+          fontSize=36),
         Text(
           extent={{32,104},{98,70}},
           textColor={0,0,127},
-          textString="Top"),
+          textString="Top",
+          fontSize=36),
         Text(
           extent={{36,26},{88,-10}},
           textColor={0,0,127},
@@ -129,7 +131,7 @@ equation
         Text(
           extent={{-50.5,20.5},{50.5,-20.5}},
           textColor={0,0,127},
-          origin={-72.5,-12.5},
+          origin={-72.5,-0.5},
           rotation=90,
           textString="%name"),
         Rectangle(
@@ -141,7 +143,7 @@ equation
           lineColor={0,0,0}),
         Rectangle(
           visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom,
-          extent={{-16,0},{16,-82}},
+          extent={{-16,0},{16,-80}},
           fillColor={85,170,255},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None,

diff --git a/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo b/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo
@@ -75,10 +75,10 @@ model MediumColumnDynamic
 
 equation
   connect(colBot.port_a, vol.ports[1]) annotation (Line(
-      points={{0,-40},{0,-40},{0,-2},{-10,-2}},
+      points={{0,-40},{0,-40},{0,-1},{-10,-1}},
       color={0,127,255}));
   connect(vol.ports[2], colTop.port_b) annotation (Line(
-      points={{-10,2},{0,2},{0,40},{0,40}},
+      points={{-10,1},{0,1},{0,40},{0,40}},
       color={0,127,255}));
   connect(colTop.port_a, port_a) annotation (Line(
       points={{0,60},{0,80},{0,80},{0,100}},
@@ -98,56 +98,36 @@ equation
         Text(
           extent={{24,-78},{106,-100}},
           textColor={0,0,127},
-          textString="Bottom"),
+          textString="Bottom",
+          fontSize=36),
         Text(
           extent={{32,104},{98,70}},
           textColor={0,0,127},
-          textString="Top"),
+          textString="Top",
+          fontSize=36),
         Text(
           extent={{42,26},{94,-10}},
           textColor={0,0,127},
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           textString="h=%h"),
-        Rectangle(
-          visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromTop,
-          extent={{-16,78},{16,-2}},
-          fillColor={85,170,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0}),
         Text(
           extent={{-50.5,20.5},{50.5,-20.5}},
           textColor={0,0,127},
-          origin={-72.5,-12.5},
+          origin={-72.5,-0.5},
           rotation=90,
           textString="%name"),
         Rectangle(
-          visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.actual,
-          extent={{-16,80},{16,54}},
-          fillColor={85,170,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0}),
-        Rectangle(
-          visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom,
-          extent={{-16,0},{16,-82}},
-          fillColor={85,170,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0}),
-        Rectangle(
-          visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.actual,
-          extent={{-16,-55},{16,-80}},
+          extent={{-16,80},{16,-80}},
           fillColor={85,170,255},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None,
           lineColor={0,0,0}),
         Ellipse(
           extent={{-40,40},{40,-40}},
-          lineColor={0,0,0},
           fillPattern=FillPattern.Sphere,
-          fillColor={0,128,255}),
+          fillColor={0,128,255},
+          pattern=LinePattern.None),
         Line(
           visible=use_HeatTransfer,
           points={{-90,0},{-40,0}},
@@ -182,6 +162,12 @@ at the top of the column.
 revisions="<html>
 <ul>
 <li>
+February 27, 2024, by Michael Wetter:<br/>
+Removed wrong annotation that used a non-existent parameter.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1842\">#1842</a>.
+</li>
+<li>
 March 7, 2022, by Michael Wetter:<br/>
 Set <code>final massDynamics=energyDynamics</code>.<br/>
 This is for