Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected wrong annotation #1843

Merged
merged 4 commits into from
Mar 13, 2024
+22 −34
Merged

Corrected wrong annotation #1843

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbbaa51
Corrected wrong annotation
mwetter Feb 27, 2024
c3b9533
Merge branch 'master' into issue1842_wrongAnnotation
mwetter Mar 11, 2024
995bedb
Improved graphics
mwetter Mar 11, 2024
5ffc308
Improve graphics of MediumColumn
jelgerjansen Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 12 additions & 28 deletions IBPSA/Airflow/Multizone/MediumColumnDynamic.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}},
Expand Down Expand Up @@ -109,45 +109,23 @@ equation
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},
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}},
fillColor={85,170,255},
extent={{-16,80},{16,-80}},
fillColor={0,66,132},
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}},
Expand Down Expand Up @@ -182,6 +160,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
Expand Down
Loading