Skip to content

Commit

Permalink
Merge pull request #12 from urbanopt/refactor/no-space-in-vectors
Browse files Browse the repository at this point in the history 
Refactor/no space in vectors
  • Loading branch information
@macintoshpie
macintoshpie authored Jul 31, 2020
2 parents 0565826 + 671ec1d commit 2676b0b
Show file tree
Hide file tree
Showing 13 changed files with 1,734 additions and 1,359 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.idea/
.antlr/
dist/
test_output/

modelicafmt
modelica-fmt
166 changes: 83 additions & 83 deletions examples/gmt-building-out.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ model building
each final unit="K",
each displayUnit="degC"))
"Minimum temperature set point"
annotation (Placement(transformation(extent={{-290, 230}, {-270, 250}})));
annotation (Placement(transformation(extent={{-290,230},{-270,250}})));
Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxTSet[nZon](
k=fill(
297.15,
Expand All @@ -34,27 +34,27 @@ model building
each final unit="K",
each displayUnit="degC"))
"Maximum temperature set point"
annotation (Placement(transformation(extent={{-290, 190}, {-270, 210}})));
annotation (Placement(transformation(extent={{-290,190},{-270,210}})));
Meeting meeting
annotation (Placement(transformation(extent={{-160,-20}, {-140, 0}})));
annotation (Placement(transformation(extent={{-160,-20},{-140,0}})));
Floor floor
annotation (Placement(transformation(extent={{-120,-20}, {-100, 0}})));
annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
Storage storage
annotation (Placement(transformation(extent={{-80,-20}, {-60, 0}})));
annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
Office office
annotation (Placement(transformation(extent={{-40,-20}, {-20, 0}})));
annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
Restroom restroom
annotation (Placement(transformation(extent={{0,-20}, {20, 0}})));
annotation (Placement(transformation(extent={{0,-20},{20,0}})));
ICT ict
annotation (Placement(transformation(extent={{40,-20}, {60, 0}})));
annotation (Placement(transformation(extent={{40,-20},{60,0}})));
Buildings.Controls.OBC.CDL.Continuous.MultiSum mulSum(
nin=2) if have_pum
annotation (Placement(transformation(extent={{260, 70}, {280, 90}})));
annotation (Placement(transformation(extent={{260,70},{280,90}})));
Buildings.Applications.DHC.Loads.Examples.BaseClasses.FanCoil4PipeHeatPorts terUni[nZon](
redeclare each package Medium1=MediumW,
redeclare each package Medium2=MediumA,
each facSca=facSca,
QHea_flow_nominal={10000, 10000, 10000, 10000, 10000, 10000},
QHea_flow_nominal={10000,10000,10000,10000,10000,10000},
QCoo_flow_nominal={-10000,-10000,-10000,-10000,-10000,-50000},
each T_aLoaHea_nominal=293.15,
each T_aLoaCoo_nominal=297.15,
Expand All @@ -65,7 +65,7 @@ model building
each mLoaHea_flow_nominal=5,
each mLoaCoo_flow_nominal=5)
"Terminal unit"
annotation (Placement(transformation(extent={{-200,-60}, {-180,-40}})));
annotation (Placement(transformation(extent={{-200,-60},{-180,-40}})));
Buildings.Applications.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
redeclare package Medium=MediumW,
m_flow_nominal=sum(
Expand All @@ -76,7 +76,7 @@ model building
nPorts_a1=nZon,
nPorts_b1=nZon)
"Heating water distribution system"
annotation (Placement(transformation(extent={{-140,-100}, {-120,-80}})));
annotation (Placement(transformation(extent={{-140,-100},{-120,-80}})));
Buildings.Applications.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
redeclare package Medium=MediumW,
m_flow_nominal=sum(
Expand All @@ -88,78 +88,78 @@ model building
nPorts_a1=nZon,
nPorts_b1=nZon)
"Chilled water distribution system"
annotation (Placement(transformation(extent={{-140,-160}, {-120,-140}})));
annotation (Placement(transformation(extent={{-140,-160},{-120,-140}})));
equation
connect(disFloHea.port_b, secHeaRet[1])
annotation (Line(points={{140,-70}, {240,-70}, {240, 32}, {300, 32}}, color={0, 127, 255}));
connect(disFloHea.port_a, secHeaSup[1])
annotation (Line(points={{120,-70}, {-242,-70}, {-242, 32}, {-300, 32}}, color={0, 127, 255}));
connect(disFloCoo.port_b, secCooRet[1])
annotation (Line(points={{140,-110}, {252,-110}, {252,-30}, {300,-30}}, color={0, 127, 255}));
connect(disFloCoo.port_a, secCooSup[1])
annotation (Line(points={{120,-110}, {-280,-110}, {-280,-30}, {-300,-30}}, color={0, 127, 255}));
connect(disFloHea.ports_a1, terUni.port_bHeaWat)
annotation (Line(points={{-120,-80.6667}, {-104,-80.6667}, {-104,-58.3333}, {-180,-58.3333}}, color={0, 127, 255}));
connect(disFloHea.ports_b1, terUni.port_aHeaWat)
annotation (Line(points={{-140,-80.6667}, {-216,-80.6667}, {-216,-58.3333}, {-200,-58.3333}}, color={0, 127, 255}));
connect(disFloCoo.ports_a1, terUni.port_bChiWat)
annotation (Line(points={{-120,-144}, {-94,-144}, {-94,-56}, {-180,-56}, {-180,-56.6667}}, color={0, 127, 255}));
connect(disFloCoo.ports_b1, terUni.port_aChiWat)
annotation (Line(points={{-140,-144}, {-226,-144}, {-226,-56.6667}, {-200,-56.6667}}, color={0, 127, 255}));
connect(weaBus, meeting.weaBus)
annotation (Line(points={{1, 300}, {0, 300}, {0, 20}, {-66, 20}, {-66,-10.2}, {-96,-10.2}}, color={255, 204, 51}, thickness=0.5), Text(string="%first", index=-1, extent={{6, 3}, {6, 3}}, horizontalAlignment=TextAlignment.Left));
connect(terUni[0+1].heaPorCon, meeting.port_a)
annotation (Line(points={{-193.333,-50}, {-192,-50}, {-192, 0}, {-90, 0}}, color={191, 0, 0}));
connect(terUni[0+1].heaPorRad, meeting.port_a)
annotation (Line(points={{-186.667,-50}, {-90,-50}, {-90, 0}}, color={191, 0, 0}));
connect(weaBus, floor.weaBus)
annotation (Line(points={{1, 300}, {0, 300}, {0, 20}, {-66, 20}, {-66,-10.2}, {-96,-10.2}}, color={255, 204, 51}, thickness=0.5), Text(string="%first", index=-1, extent={{6, 3}, {6, 3}}, horizontalAlignment=TextAlignment.Left));
connect(terUni[1+1].heaPorCon, floor.port_a)
annotation (Line(points={{-193.333,-50}, {-192,-50}, {-192, 0}, {-90, 0}}, color={191, 0, 0}));
connect(terUni[1+1].heaPorRad, floor.port_a)
annotation (Line(points={{-186.667,-50}, {-90,-50}, {-90, 0}}, color={191, 0, 0}));
connect(weaBus, storage.weaBus)
annotation (Line(points={{1, 300}, {0, 300}, {0, 20}, {-66, 20}, {-66,-10.2}, {-96,-10.2}}, color={255, 204, 51}, thickness=0.5), Text(string="%first", index=-1, extent={{6, 3}, {6, 3}}, horizontalAlignment=TextAlignment.Left));
connect(terUni[2+1].heaPorCon, storage.port_a)
annotation (Line(points={{-193.333,-50}, {-192,-50}, {-192, 0}, {-90, 0}}, color={191, 0, 0}));
connect(terUni[2+1].heaPorRad, storage.port_a)
annotation (Line(points={{-186.667,-50}, {-90,-50}, {-90, 0}}, color={191, 0, 0}));
connect(weaBus, office.weaBus)
annotation (Line(points={{1, 300}, {0, 300}, {0, 20}, {-66, 20}, {-66,-10.2}, {-96,-10.2}}, color={255, 204, 51}, thickness=0.5), Text(string="%first", index=-1, extent={{6, 3}, {6, 3}}, horizontalAlignment=TextAlignment.Left));
connect(terUni[3+1].heaPorCon, office.port_a)
annotation (Line(points={{-193.333,-50}, {-192,-50}, {-192, 0}, {-90, 0}}, color={191, 0, 0}));
connect(terUni[3+1].heaPorRad, office.port_a)
annotation (Line(points={{-186.667,-50}, {-90,-50}, {-90, 0}}, color={191, 0, 0}));
connect(weaBus, restroom.weaBus)
annotation (Line(points={{1, 300}, {0, 300}, {0, 20}, {-66, 20}, {-66,-10.2}, {-96,-10.2}}, color={255, 204, 51}, thickness=0.5), Text(string="%first", index=-1, extent={{6, 3}, {6, 3}}, horizontalAlignment=TextAlignment.Left));
connect(terUni[4+1].heaPorCon, restroom.port_a)
annotation (Line(points={{-193.333,-50}, {-192,-50}, {-192, 0}, {-90, 0}}, color={191, 0, 0}));
connect(terUni[4+1].heaPorRad, restroom.port_a)
annotation (Line(points={{-186.667,-50}, {-90,-50}, {-90, 0}}, color={191, 0, 0}));
connect(weaBus, ict.weaBus)
annotation (Line(points={{1, 300}, {0, 300}, {0, 20}, {-66, 20}, {-66,-10.2}, {-96,-10.2}}, color={255, 204, 51}, thickness=0.5), Text(string="%first", index=-1, extent={{6, 3}, {6, 3}}, horizontalAlignment=TextAlignment.Left));
connect(terUni[5+1].heaPorCon, ict.port_a)
annotation (Line(points={{-193.333,-50}, {-192,-50}, {-192, 0}, {-90, 0}}, color={191, 0, 0}));
connect(terUni[5+1].heaPorRad, ict.port_a)
annotation (Line(points={{-186.667,-50}, {-90,-50}, {-90, 0}}, color={191, 0, 0}));
connect(terUni.mReqHeaWat_flow, disFloHea.mReq_flow)
annotation (Line(points={{-179.167,-53.3333}, {-179.167,-54}, {-170,-54}, {-170,-94}, {-141,-94}}, color={0, 0, 127}));
connect(terUni.mReqChiWat_flow, disFloCoo.mReq_flow)
annotation (Line(points={{-179.167,-55}, {-179.167,-56}, {-172,-56}, {-172,-154}, {-141,-154}}, color={0, 0, 127}));
connect(mulSum.y, PPum)
annotation (Line(points={{282, 80}, {320, 80}}, color={0, 0, 127}));
connect(disFloHea.PPum, mulSum.u[1])
annotation (Line(points={{-119,-98}, {240,-98}, {240, 81}, {258, 81}}, color={0, 0, 127}));
connect(disFloCoo.PPum, mulSum.u[2])
annotation (Line(points={{-119,-158}, {240,-158}, {240, 79}, {258, 79}}, color={0, 0, 127}));
connect(disFloHea.QActTot_flow, QHea_flow)
annotation (Line(points={{-119,-96}, {223.5,-96}, {223.5, 280}, {320, 280}}, color={0, 0, 127}));
connect(disFloCoo.QActTot_flow, QCoo_flow)
annotation (Line(points={{-119,-156}, {230,-156}, {230, 240}, {320, 240}}, color={0, 0, 127}));
connect(maxTSet.y, terUni.TSetCoo)
annotation (Line(points={{-268, 200}, {-240, 200}, {-240,-46.6667}, {-200.833,-46.6667}}, color={0, 0, 127}));
connect(minTSet.y, terUni.TSetHea)
annotation (Line(points={{-268, 240}, {-220, 240}, {-220,-45}, {-200.833,-45}}, color={0, 0, 127}));
connect(disFloHea.port_b,secHeaRet[1])
annotation (Line(points={{140,-70},{240,-70},{240,32},{300,32}},color={0,127,255}));
connect(disFloHea.port_a,secHeaSup[1])
annotation (Line(points={{120,-70},{-242,-70},{-242,32},{-300,32}},color={0,127,255}));
connect(disFloCoo.port_b,secCooRet[1])
annotation (Line(points={{140,-110},{252,-110},{252,-30},{300,-30}},color={0,127,255}));
connect(disFloCoo.port_a,secCooSup[1])
annotation (Line(points={{120,-110},{-280,-110},{-280,-30},{-300,-30}},color={0,127,255}));
connect(disFloHea.ports_a1,terUni.port_bHeaWat)
annotation (Line(points={{-120,-80.6667},{-104,-80.6667},{-104,-58.3333},{-180,-58.3333}},color={0,127,255}));
connect(disFloHea.ports_b1,terUni.port_aHeaWat)
annotation (Line(points={{-140,-80.6667},{-216,-80.6667},{-216,-58.3333},{-200,-58.3333}},color={0,127,255}));
connect(disFloCoo.ports_a1,terUni.port_bChiWat)
annotation (Line(points={{-120,-144},{-94,-144},{-94,-56},{-180,-56},{-180,-56.6667}},color={0,127,255}));
connect(disFloCoo.ports_b1,terUni.port_aChiWat)
annotation (Line(points={{-140,-144},{-226,-144},{-226,-56.6667},{-200,-56.6667}},color={0,127,255}));
connect(weaBus,meeting.weaBus)
annotation (Line(points={{1,300},{0,300},{0,20},{-66,20},{-66,-10.2},{-96,-10.2}},color={255,204,51},thickness=0.5),Text(string="%first",index=-1,extent={{6,3},{6,3}},horizontalAlignment=TextAlignment.Left));
connect(terUni[0+1].heaPorCon,meeting.port_a)
annotation (Line(points={{-193.333,-50},{-192,-50},{-192,0},{-90,0}},color={191,0,0}));
connect(terUni[0+1].heaPorRad,meeting.port_a)
annotation (Line(points={{-186.667,-50},{-90,-50},{-90,0}},color={191,0,0}));
connect(weaBus,floor.weaBus)
annotation (Line(points={{1,300},{0,300},{0,20},{-66,20},{-66,-10.2},{-96,-10.2}},color={255,204,51},thickness=0.5),Text(string="%first",index=-1,extent={{6,3},{6,3}},horizontalAlignment=TextAlignment.Left));
connect(terUni[1+1].heaPorCon,floor.port_a)
annotation (Line(points={{-193.333,-50},{-192,-50},{-192,0},{-90,0}},color={191,0,0}));
connect(terUni[1+1].heaPorRad,floor.port_a)
annotation (Line(points={{-186.667,-50},{-90,-50},{-90,0}},color={191,0,0}));
connect(weaBus,storage.weaBus)
annotation (Line(points={{1,300},{0,300},{0,20},{-66,20},{-66,-10.2},{-96,-10.2}},color={255,204,51},thickness=0.5),Text(string="%first",index=-1,extent={{6,3},{6,3}},horizontalAlignment=TextAlignment.Left));
connect(terUni[2+1].heaPorCon,storage.port_a)
annotation (Line(points={{-193.333,-50},{-192,-50},{-192,0},{-90,0}},color={191,0,0}));
connect(terUni[2+1].heaPorRad,storage.port_a)
annotation (Line(points={{-186.667,-50},{-90,-50},{-90,0}},color={191,0,0}));
connect(weaBus,office.weaBus)
annotation (Line(points={{1,300},{0,300},{0,20},{-66,20},{-66,-10.2},{-96,-10.2}},color={255,204,51},thickness=0.5),Text(string="%first",index=-1,extent={{6,3},{6,3}},horizontalAlignment=TextAlignment.Left));
connect(terUni[3+1].heaPorCon,office.port_a)
annotation (Line(points={{-193.333,-50},{-192,-50},{-192,0},{-90,0}},color={191,0,0}));
connect(terUni[3+1].heaPorRad,office.port_a)
annotation (Line(points={{-186.667,-50},{-90,-50},{-90,0}},color={191,0,0}));
connect(weaBus,restroom.weaBus)
annotation (Line(points={{1,300},{0,300},{0,20},{-66,20},{-66,-10.2},{-96,-10.2}},color={255,204,51},thickness=0.5),Text(string="%first",index=-1,extent={{6,3},{6,3}},horizontalAlignment=TextAlignment.Left));
connect(terUni[4+1].heaPorCon,restroom.port_a)
annotation (Line(points={{-193.333,-50},{-192,-50},{-192,0},{-90,0}},color={191,0,0}));
connect(terUni[4+1].heaPorRad,restroom.port_a)
annotation (Line(points={{-186.667,-50},{-90,-50},{-90,0}},color={191,0,0}));
connect(weaBus,ict.weaBus)
annotation (Line(points={{1,300},{0,300},{0,20},{-66,20},{-66,-10.2},{-96,-10.2}},color={255,204,51},thickness=0.5),Text(string="%first",index=-1,extent={{6,3},{6,3}},horizontalAlignment=TextAlignment.Left));
connect(terUni[5+1].heaPorCon,ict.port_a)
annotation (Line(points={{-193.333,-50},{-192,-50},{-192,0},{-90,0}},color={191,0,0}));
connect(terUni[5+1].heaPorRad,ict.port_a)
annotation (Line(points={{-186.667,-50},{-90,-50},{-90,0}},color={191,0,0}));
connect(terUni.mReqHeaWat_flow,disFloHea.mReq_flow)
annotation (Line(points={{-179.167,-53.3333},{-179.167,-54},{-170,-54},{-170,-94},{-141,-94}},color={0,0,127}));
connect(terUni.mReqChiWat_flow,disFloCoo.mReq_flow)
annotation (Line(points={{-179.167,-55},{-179.167,-56},{-172,-56},{-172,-154},{-141,-154}},color={0,0,127}));
connect(mulSum.y,PPum)
annotation (Line(points={{282,80},{320,80}},color={0,0,127}));
connect(disFloHea.PPum,mulSum.u[1])
annotation (Line(points={{-119,-98},{240,-98},{240,81},{258,81}},color={0,0,127}));
connect(disFloCoo.PPum,mulSum.u[2])
annotation (Line(points={{-119,-158},{240,-158},{240,79},{258,79}},color={0,0,127}));
connect(disFloHea.QActTot_flow,QHea_flow)
annotation (Line(points={{-119,-96},{223.5,-96},{223.5,280},{320,280}},color={0,0,127}));
connect(disFloCoo.QActTot_flow,QCoo_flow)
annotation (Line(points={{-119,-156},{230,-156},{230,240},{320,240}},color={0,0,127}));
connect(maxTSet.y,terUni.TSetCoo)
annotation (Line(points={{-268,200},{-240,200},{-240,-46.6667},{-200.833,-46.6667}},color={0,0,127}));
connect(minTSet.y,terUni.TSetHea)
annotation (Line(points={{-268,240},{-220,240},{-220,-45},{-200.833,-45}},color={0,0,127}));
annotation (
Documentation(
info="
Expand Down
Loading

0 comments on commit 2676b0b

Please sign in to comment.