Merge remote-tracking branch 'filip/project_itz_fixes_v2' into projec…

…t_itz_fixes_v2

IDEAS/Buildings/Components/Interfaces/ZoneBus.mo

@@ -29,11 +29,11 @@ expandable connector ZoneBus
   Modelica.Fluid.Interfaces.FluidPort_a port_1(
     redeclare package Medium = Medium)
     if use_port_1
-    "Port for interzonal air flow: middle or bottom port";
+    "Port for interzonal air flow";
   Modelica.Fluid.Interfaces.FluidPort_a port_2(
     redeclare package Medium = Medium)
     if use_port_2
-    "Port for detailed interzonal air flow: top port";
+    "Port for detailed interzonal air flow";
   IDEAS.Buildings.Components.BaseClasses.ConservationOfEnergy.EnergyPort E
     "Internal energy in model" annotation ();
   IDEAS.Buildings.Components.Interfaces.RealConnector inc(

IDEAS/Examples/PPD12/Structure.mo

@@ -75,7 +75,7 @@ model Structure "Ppd 12 example model"
     annotation (Placement(transformation(extent={{70,68},{80,88}})));
   IDEAS.Buildings.Components.Window winBed3(
     hVertical=1.2*sin(winBed3.inc),
-    hRelSurfMid_a=winBed3.hzone_a + 1,
+    hRelSurfBot_a=winBed3.hzone_a + 1,
     frac=0.1,
     azi=east,
     redeclare IDEAS.Examples.PPD12.Data.PvcInsulated fraType,
@@ -92,7 +92,7 @@ model Structure "Ppd 12 example model"
     A=wBedroom*lHalfBuilding*sqrt(2)/2,
     redeclare IDEAS.Examples.PPD12.Data.Roof constructionType,
     hVertical=lHalfBuilding*tan(Roof2.inc),
-    hRelSurfMid_a=Roof2.hzone_a)
+    hRelSurfBot_a=Roof2.hzone_a)
     "Roof, east side"
     annotation (Placement(transformation(
         extent={{-5,-10},{5,10}},
@@ -359,7 +359,7 @@ model Structure "Ppd 12 example model"
     A=wBedroom*lHalfBuilding*sqrt(2),
     redeclare IDEAS.Examples.PPD12.Data.Roof constructionType,
     hVertical=lHalfBuilding*tan(Roof1.inc),
-    hRelSurfMid_a=Roof1.hzone_a)
+    hRelSurfBot_a=Roof1.hzone_a)
     "Roof, west side"                     annotation (Placement(transformation(
         extent={{-5,-10},{5,10}},
         rotation=90,

IDEAS/Examples/PPD12/StructureExt_2Port_NoFlowTest.mo

@@ -0,0 +1,25 @@
+within IDEAS.Examples.PPD12;
+model StructureExt_2Port_NoFlowTest "Constant temperature, no wind boundary conditions"
+  parameter Modelica.Units.SI.Temperature T_start = 283.15 "10 degrees";
+  extends IDEAS.Examples.PPD12.StructureExt_2Port(
+hallway(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+living(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+Diner(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+Porch(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+bedRoom1(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+bathRoom(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+stairWay(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+bedRoom2(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+bedRoom3(T_start=T_start, TeAvg=T_start, TiAvg=T_start, dTeAvg=0, dTiAvg=0),
+Roof1(T_start=T_start),
+out1(T_start=T_start),
+Roof2(T_start=T_start),
+out2(T_start=T_start),
+com1(T_start=T_start),
+cei1(T_start=T_start),
+cei2(T_start=T_start),
+cei3(T_start=T_start),
+winBed3(T_start=T_start),
+sim(filNam=
+    Modelica.Utilities.Files.loadResource("modelica://IDEAS/Resources/weatherdata/IdealBoundaryConditions.mos")));
+end StructureExt_2Port_NoFlowTest;

IDEAS/Examples/PPD12/package.order

@@ -5,3 +5,4 @@ VentilationRBC
 StructureExt_2Port
 Data
 BaseClasses
+StructureExt_2Port_NoFlowTest

IDEAS/Resources/weatherdata/IdealBoundaryConditions.mos

@@ -0,0 +1,37 @@
+#1
+double tab1(2,30)
+#LOCATION,Uccle,VLG,BEL,SRC-TMYx,064470,50.79690,4.35810,1.0,101.0
+#COMMENTS 2,"Based on an existing weather file: 10 degrees dry bulb at night, no wind."
+#DATA PERIODS,1,1,Data,Sunday,1/ 1,12/31
+#C1 Time in seconds. Beginning of a year is 0s.
+#C2 Dry bulb temperature in Celsius at indicated time
+#C3 Dew point temperature in Celsius at indicated time
+#C4 Relative humidity in percent at indicated time
+#C5 Atmospheric station pressure in Pa at indicated time
+#C6 Extraterrestrial horizontal radiation in Wh/m2
+#C7 Extraterrestrial direct normal radiation in Wh/m2
+#C8 Horizontal infrared radiation intensity in Wh/m2
+#C9 Global horizontal radiation in Wh/m2
+#C10 Direct normal radiation in Wh/m2
+#C11 Diffuse horizontal radiation in Wh/m2
+#C12 Averaged global horizontal illuminance in lux during minutes preceding the indicated time
+#C13 Direct normal illuminance in lux during minutes preceding the indicated time
+#C14 Diffuse horizontal illuminance in lux  during minutes preceding the indicated time
+#C15 Zenith luminance in Cd/m2 during minutes preceding the indicated time
+#C16 Wind direction at indicated time. N=0, E=90, S=180, W=270
+#C17 Wind speed in m/s at indicated time
+#C18 Total sky cover at indicated time
+#C19 Opaque sky cover at indicated time
+#C20 Visibility in km at indicated time
+#C21 Ceiling height in m
+#C22 Present weather observation
+#C23 Present weather codes
+#C24 Precipitable water in mm
+#C25 Aerosol optical depth
+#C26 Snow depth in cm
+#C27 Days since last snowfall
+#C28 Albedo
+#C29 Liquid precipitation depth in mm at indicated time
+#C30 Liquid precipitation quantity
+0	10.00	4.60	69	101477	0	0	270	0	0	0	0	0	0	0	270	0.00	0	6	777.7	2000	9	999999999	16	0.2170	0	88	0.190	0.0	0.0	
+1E11	10.00	4.60	69	101477	0	0	270	0	0	0	0	0	0	0	270	0.00	0	6	777.7	2000	9	999999999	16	0.2170	0	88	0.190	0.0	0.0