diff --git a/IDEAS/Examples/PPD12/Structure.mo b/IDEAS/Examples/PPD12/Structure.mo index 9fbb52724..d5a44cfcc 100644 --- a/IDEAS/Examples/PPD12/Structure.mo +++ b/IDEAS/Examples/PPD12/Structure.mo @@ -268,7 +268,6 @@ model Structure "Ppd 12 example model" annotation (Placement(transformation(extent={{140,26},{120,6}}))); IDEAS.Buildings.Components.RectangularZoneTemplate stairWay( - redeclare package Medium = MediumAir, redeclare IDEAS.Examples.PPD12.Data.OuterWall conTypA, redeclare IDEAS.Examples.PPD12.Data.TripleGlazing glazingA, @@ -293,6 +292,7 @@ model Structure "Ppd 12 example model" w=lHalfBuilding, wFlo = 0.8) "Stairway" annotation (Placement(transformation(extent={{86,26},{66,6}}))); + IDEAS.Buildings.Components.RectangularZoneTemplate bedRoom2( aziA=east, bouTypC=IDEAS.Buildings.Components.Interfaces.BoundaryType.OuterWall, @@ -306,9 +306,9 @@ model Structure "Ppd 12 example model" fracC=0.15, l=wBedroom, w=lHalfBuilding, - h=hFloor1, + h=hFloor2, A_winC=1.1*0.66 + 1.1*1.54, - redeclare IDEAS.Examples.PPD12.Data.InteriorWall18 conTypC, + redeclare IDEAS.Examples.PPD12.Data.OuterWall conTypC, bouTypA=IDEAS.Buildings.Components.Interfaces.BoundaryType.InternalWall, redeclare IDEAS.Examples.PPD12.Data.InteriorWall10 conTypA, nSurfExt=0, @@ -322,7 +322,6 @@ model Structure "Ppd 12 example model" "Master bedroom" annotation (Placement(transformation(extent={{276,82},{256,62}}))); IDEAS.Buildings.Components.RectangularZoneTemplate bedRoom3( - redeclare package Medium = MediumAir, redeclare IDEAS.Examples.PPD12.Data.CommonWall conTypD, redeclare IDEAS.Examples.PPD12.Data.CommonWall conTypB, @@ -339,7 +338,7 @@ model Structure "Ppd 12 example model" bouTypFlo=IDEAS.Buildings.Components.Interfaces.BoundaryType.InternalWall, calculateViewFactor=false, fracA=0.15, - h=hFloor1, bFlo = 2, hasCavityFlo = true, + h=hFloor2, bFlo = 2, hasCavityFlo = true, hasWinA=true, l=wBedroom, mSenFac=1, @@ -376,15 +375,15 @@ equation color={255,204,51}, thickness=0.5)); connect(Diner.proBusExt[1], hallway.proBusA[1]) annotation (Line( - points={{-48,-36.5},{-76,-36.5},{-76,41}}, + points={{-48,-37.25},{-76,-37.25},{-76,41}}, color={255,204,51}, thickness=0.5)); connect(Diner.proBusExt[2], com1.propsBus_a) annotation (Line( - points={{-48,-37.5},{-48,-36},{-94.8333,-36},{-94.8333,-60}}, + points={{-48,-37.75},{-48,-36},{-94.8333,-36},{-94.8333,-60}}, color={255,204,51}, thickness=0.5)); connect(out1.propsBus_a, Diner.proBusExt[3]) annotation (Line( - points={{-91,-89.8333},{-91,-38.5},{-48,-38.5}}, + points={{-91,-89.8333},{-91,-38.25},{-48,-38.25}}, color={255,204,51}, thickness=0.5)); connect(Porch.proBusC[1], Diner.proBusA[1]) annotation (Line( @@ -392,7 +391,7 @@ equation color={255,204,51}, thickness=0.5)); connect(Porch.proBusD[1], Diner.proBusExt[4]) annotation (Line( - points={{-43.6,-69},{-88,-69},{-88,-38},{-48,-38},{-48,-39.5}}, + points={{-43.6,-69},{-88,-69},{-88,-38},{-48,-38},{-48,-38.75}}, color={255,204,51}, thickness=0.5)); connect(bedRoom1.proBusFlo[1], cei2.propsBus_a) annotation (Line( @@ -404,7 +403,7 @@ equation color={255,204,51}, thickness=0.5)); connect(bedRoom1.proBusExt[1], cei1.propsBus_a) annotation (Line( - points={{142,61},{144,61},{144,80},{79.1667,80}}, + points={{142,60.5},{144,60.5},{144,80},{79.1667,80}}, color={255,204,51}, thickness=0.5)); connect(cei1.propsBus_b, hallway.proBusCei[1]) annotation (Line( @@ -420,7 +419,7 @@ equation color={255,204,51}, thickness=0.5)); connect(stairWay.proBusC[1], bedRoom1.proBusExt[2]) annotation (Line( - points={{69.2,25.8},{69.2,25.8},{69.2,50},{76,50},{142,50},{142,59}}, + points={{69.2,25.8},{69.2,25.8},{69.2,50},{76,50},{142,50},{142,59.5}}, color={255,204,51}, thickness=0.5)); connect(stairWay.proBusFlo[1], hallway.proBusExt[1]) annotation (Line( @@ -448,7 +447,7 @@ equation color={255,204,51}, thickness=0.5)); connect(winBed3.propsBus_a, bedRoom3.proBusExt[1]) annotation (Line( - points={{307,2.16667},{307,21.3333},{282,21.3333}}, + points={{307,2.16667},{307,20.6667},{282,20.6667}}, color={255,204,51}, thickness=0.5)); connect(Roof1.propsBus_a, bedRoom3.proBusExt[2]) annotation (Line( @@ -460,7 +459,7 @@ equation color={255,204,51}, thickness=0.5)); connect(cei3.propsBus_a, bedRoom3.proBusExt[3]) annotation (Line( - points={{191.167,-10},{282,-10},{282,18.6667}}, + points={{191.167,-10},{282,-10},{282,19.3333}}, color={255,204,51}, thickness=0.5)); connect(cei3.propsBus_b, stairWay.proBusCei[1]) annotation (Line( @@ -510,6 +509,11 @@ This model only contains the building structure. ", revisions="