Skip to content

Commit

Permalink
fix(tests): Update test reference xml
Browse files Browse the repository at this point in the history
  • Loading branch information
ed-p-may committed Nov 13, 2022
1 parent 1d7f2f6 commit 176082c
Show file tree
Hide file tree
Showing 7 changed files with 387 additions and 347 deletions.
4 changes: 2 additions & 2 deletions tests/_reference_xml/Default_Model_Single_Zone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
<Components count="3">
<Component index="0">
<IdentNr>5</IdentNr>
<Name>Room_5_ed68d949..Face4</Name>
<Name>Room_1_a9af7a02..Face4</Name>
<Visual>true</Visual>
<Type>1</Type>
<IdentNrColorI>12</IdentNrColorI>
Expand All @@ -207,7 +207,7 @@
</Component>
<Component index="1">
<IdentNr>6</IdentNr>
<Name>Room_5_ed68d949..Face5</Name>
<Name>Room_1_a9af7a02..Face5</Name>
<Visual>true</Visual>
<Type>1</Type>
<IdentNrColorI>7</IdentNrColorI>
Expand Down
12 changes: 6 additions & 6 deletions tests/_reference_xml/Multi_Room_Complete.xml
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@
</Component>
<Component index="4">
<IdentNr>49</IdentNr>
<Name>Shade_fff3abd8</Name>
<Name>Shade_9f0bb8b7</Name>
<Visual>true</Visual>
<Type>1</Type>
<IdentNrColorI>1</IdentNrColorI>
Expand All @@ -667,7 +667,7 @@
</Component>
<Component index="5">
<IdentNr>50</IdentNr>
<Name>Shade_1a19f10c</Name>
<Name>Shade_7cf1a9a5</Name>
<Visual>true</Visual>
<Type>1</Type>
<IdentNrColorI>1</IdentNrColorI>
Expand All @@ -689,7 +689,7 @@
<IdentNr>1</IdentNr>
<RoomsVentilation count="2">
<Room index="0">
<Name>101-Room_7</Name>
<Name>101-Room_3</Name>
<Type>99</Type>
<IdentNrUtilizationPatternVent>1</IdentNrUtilizationPatternVent>
<IdentNrVentilationUnit>1</IdentNrVentilationUnit>
Expand All @@ -700,7 +700,7 @@
<DesignVolumeFlowRateExhaust unit="m³/h">14.2</DesignVolumeFlowRateExhaust>
</Room>
<Room index="1">
<Name>102-Room_8</Name>
<Name>102-Room_4</Name>
<Type>99</Type>
<IdentNrUtilizationPatternVent>1</IdentNrUtilizationPatternVent>
<IdentNrVentilationUnit>1</IdentNrVentilationUnit>
Expand Down Expand Up @@ -1070,7 +1070,7 @@
</PH_Parameters>
</Device>
<Device index="1">
<Name>8e8ac95c-f8e7-430d-8a34-a55b28c5c790</Name>
<Name>ec68c4bd-f227-44f6-9436-e7336acfac22</Name>
<IdentNr>1</IdentNr>
<SystemType>5</SystemType>
<TypeDevice>5</TypeDevice>
Expand Down Expand Up @@ -1114,7 +1114,7 @@
<PH_Parameters>
<SolarThermalStorageCapacity>300</SolarThermalStorageCapacity>
<StorageLossesStandby>4.0</StorageLossesStandby>
<TotalSolarThermalStorageLosses>0.0</TotalSolarThermalStorageLosses>
<TotalSolarThermalStorageLosses>4.0</TotalSolarThermalStorageLosses>
<InputOption>1</InputOption>
<AverageHeatReleaseStorage>0.0</AverageHeatReleaseStorage>
<TankRoomTemp >20</TankRoomTemp >
Expand Down
Binary file modified tests/_source_gh/hbph_test_models.gh
Binary file not shown.
102 changes: 61 additions & 41 deletions tests/_source_hbjson/Default_Model_Single_Zone.hbjson
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tolerance": 0.001,
"units": "Meters",
"units": "Millimeters",
"properties": {
"ph": {
"bldg_segments": [
Expand Down Expand Up @@ -41,7 +41,7 @@
"PHIUS2021_cooling_load": 10.0
},
"name": "Unnamed_Bldg_Segment",
"identifier": "09601d72-9c9e-424c-81fa-cf4e51ea901f",
"identifier": "c590558a-8cce-4a15-bfaa-e3c8a8fdb5c2",
"site": {
"climate": {
"monthly_radiation": {
Expand Down Expand Up @@ -87,8 +87,8 @@
"june": 0.0,
"november": 0.0
},
"identifier": "0a5ec7ad-7ea9-4610-9d3d-17ab3f26e49a",
"display_name": "0a5ec7ad-7ea9-4610-9d3d-17ab3f26e49a",
"identifier": "4a2be0f1-0b63-471a-9a03-40257873e204",
"display_name": "4a2be0f1-0b63-471a-9a03-40257873e204",
"glob": {
"february": 0.0,
"july": 0.0,
Expand Down Expand Up @@ -134,8 +134,8 @@
"dewpoint": null,
"rad_west": 0.0,
"ground_temp": null,
"identifier": "b9284f38-942d-4f37-b379-0e94da807008",
"display_name": "b9284f38-942d-4f37-b379-0e94da807008",
"identifier": "55acc057-0d23-4d4d-a158-3e2a82954486",
"display_name": "55acc057-0d23-4d4d-a158-3e2a82954486",
"rad_south": 0.0,
"rad_north": 0.0,
"sky_temp": null
Expand All @@ -147,8 +147,8 @@
"dewpoint": null,
"rad_west": 0.0,
"ground_temp": null,
"identifier": "8fc4d9cc-e7b3-4bfd-a467-dd94392d3a1b",
"display_name": "8fc4d9cc-e7b3-4bfd-a467-dd94392d3a1b",
"identifier": "3ffc130a-dade-4d82-9b10-a4de8df1949c",
"display_name": "3ffc130a-dade-4d82-9b10-a4de8df1949c",
"rad_south": 0.0,
"rad_north": 0.0,
"sky_temp": null
Expand All @@ -160,23 +160,23 @@
"dewpoint": null,
"rad_west": 0.0,
"ground_temp": null,
"identifier": "a2133888-4777-49ae-8b56-da3af1c20cef",
"display_name": "a2133888-4777-49ae-8b56-da3af1c20cef",
"identifier": "df1c9e0c-ef3a-42fe-ba80-fcde570961ba",
"display_name": "df1c9e0c-ef3a-42fe-ba80-fcde570961ba",
"rad_south": 0.0,
"rad_north": 0.0,
"sky_temp": null
},
"identifier": "ee7e7d37-2462-41a2-a214-fc3ba79a6a5e",
"display_name": "ee7e7d37-2462-41a2-a214-fc3ba79a6a5e",
"identifier": "ffd4557a-5fd4-4ece-b3fb-deae56e2f616",
"display_name": "ffd4557a-5fd4-4ece-b3fb-deae56e2f616",
"cooling_load_2": {
"temp": 0.0,
"rad_global": 0.0,
"rad_east": 0.0,
"dewpoint": null,
"rad_west": 0.0,
"ground_temp": null,
"identifier": "074b0f2f-8ce0-41bc-b5e4-6a0f364a4f88",
"display_name": "074b0f2f-8ce0-41bc-b5e4-6a0f364a4f88",
"identifier": "ae9cb0ff-1882-4b72-9f4f-d01b56547731",
"display_name": "ae9cb0ff-1882-4b72-9f4f-d01b56547731",
"rad_south": 0.0,
"rad_north": 0.0,
"sky_temp": null
Expand Down Expand Up @@ -225,8 +225,8 @@
"june": 0.0,
"november": 0.0
},
"identifier": "8ebf4222-cb67-4fbb-9fc1-2880240d580b",
"display_name": "8ebf4222-cb67-4fbb-9fc1-2880240d580b",
"identifier": "7cbf745b-5434-4f8c-bb8c-1b632e0a0559",
"display_name": "7cbf745b-5434-4f8c-bb8c-1b632e0a0559",
"dewpoints": {
"february": 0.0,
"july": 0.0,
Expand All @@ -242,7 +242,7 @@
"november": 0.0
}
},
"identifier": "9306ca07-7a09-45ec-ab1a-664b4e3264dc",
"identifier": "87b5c87d-4819-4596-b594-7dc0be39136c",
"display_name": "New York",
"summer_daily_temperature_swing": 8.0,
"station_elevation": 0.0
Expand All @@ -252,17 +252,17 @@
"latitude": 40.600000000000001,
"longitude": -73.799999999999997,
"hours_from_UTC": -4,
"identifier": "63bcd7d7-36fe-4e2a-be02-755d286658b8",
"display_name": "63bcd7d7-36fe-4e2a-be02-755d286658b8",
"identifier": "bb9a5e14-4f0c-4feb-93ff-c80639de930b",
"display_name": "bb9a5e14-4f0c-4feb-93ff-c80639de930b",
"climate_zone": 1
},
"identifier": "78ce7456-e86e-4e5f-a86d-eb12778e2b29",
"display_name": "78ce7456-e86e-4e5f-a86d-eb12778e2b29",
"identifier": "366ece43-4654-42da-9395-422b23aebedc",
"display_name": "366ece43-4654-42da-9395-422b23aebedc",
"phpp_library_codes": {
"country_code": "US-United States of America",
"region_code": "New York",
"dataset_name": "US0055b-New York",
"identifier": "2014f607-d604-4fad-b839-2f17c8989173",
"identifier": "cc056d8d-e7b2-4788-9ae9-898133036452",
"display_name": "US0055b-New York"
}
},
Expand Down Expand Up @@ -309,7 +309,7 @@
},
"type": "IdealAirSystemProperties"
},
"identifier": "Room_5_ed68d949 Ideal Loads Air System",
"identifier": "Room_1_a9af7a02 Ideal Loads Air System",
"cooling_air_temperature": 13.0,
"demand_controlled_ventilation": false,
"cooling_limit": {
Expand Down Expand Up @@ -1587,6 +1587,13 @@
},
"shade_construction": "Generic Shade",
"constructions": [
{
"is_specular": false,
"visible_reflectance": 0.20000000000000001,
"identifier": "Generic Context",
"solar_reflectance": 0.20000000000000001,
"type": "ShadeConstruction"
},
{
"materials": [
"Generic Roof Membrane",
Expand Down Expand Up @@ -2023,6 +2030,7 @@
"solar_diffusing": false
}
],
"context_construction": "Generic Context",
"wall_set": {
"interior_construction": "Generic Interior Wall",
"ground_construction": "Generic Underground Wall",
Expand Down Expand Up @@ -2257,8 +2265,20 @@
"specularity": 0.0,
"dependencies": [],
"modifier": null
},
{
"roughness": 0.0,
"b_reflectance": 0.20000000000000001,
"identifier": "generic_context_0.20",
"type": "Plastic",
"r_reflectance": 0.20000000000000001,
"g_reflectance": 0.20000000000000001,
"specularity": 0.0,
"dependencies": [],
"modifier": null
}
],
"context_modifier": "generic_context_0.20",
"wall_set": {
"exterior_modifier": "generic_wall_0.50",
"type": "WallModifierSetAbridged",
Expand All @@ -2285,19 +2305,19 @@
"type": "ModelRadianceProperties"
}
},
"version": "1.51.3",
"identifier": "unnamed_239af720",
"version": "1.51.6",
"identifier": "unnamed_31b47b9e",
"display_name": "unnamed",
"rooms": [
{
"properties": {
"ph": {
"type": "RoomPhPropertiesAbridged",
"ph_bldg_segment_id": "09601d72-9c9e-424c-81fa-cf4e51ea901f",
"ph_bldg_segment_id": "c590558a-8cce-4a15-bfaa-e3c8a8fdb5c2",
"spaces": []
},
"energy": {
"hvac": "Room_5_ed68d949 Ideal Loads Air System",
"hvac": "Room_1_a9af7a02 Ideal Loads Air System",
"type": "RoomEnergyPropertiesAbridged",
"program_type": "Generic Office Program"
},
Expand All @@ -2306,8 +2326,8 @@
"type": "RoomRadiancePropertiesAbridged"
}
},
"identifier": "Room_5_ed68d949",
"display_name": "Room_5",
"identifier": "Room_1_a9af7a02",
"display_name": "Room_1",
"faces": [
{
"boundary_condition": {
Expand Down Expand Up @@ -2375,8 +2395,8 @@
"type": "FaceRadiancePropertiesAbridged"
}
},
"identifier": "Room_5_ed68d949..Face0",
"display_name": "Room_5_ed68d949..Face0",
"identifier": "Room_1_a9af7a02..Face0",
"display_name": "Room_1_a9af7a02..Face0",
"type": "Face"
},
{
Expand Down Expand Up @@ -2445,8 +2465,8 @@
"type": "FaceRadiancePropertiesAbridged"
}
},
"identifier": "Room_5_ed68d949..Face1",
"display_name": "Room_5_ed68d949..Face1",
"identifier": "Room_1_a9af7a02..Face1",
"display_name": "Room_1_a9af7a02..Face1",
"type": "Face"
},
{
Expand Down Expand Up @@ -2515,8 +2535,8 @@
"type": "FaceRadiancePropertiesAbridged"
}
},
"identifier": "Room_5_ed68d949..Face2",
"display_name": "Room_5_ed68d949..Face2",
"identifier": "Room_1_a9af7a02..Face2",
"display_name": "Room_1_a9af7a02..Face2",
"type": "Face"
},
{
Expand Down Expand Up @@ -2585,8 +2605,8 @@
"type": "FaceRadiancePropertiesAbridged"
}
},
"identifier": "Room_5_ed68d949..Face3",
"display_name": "Room_5_ed68d949..Face3",
"identifier": "Room_1_a9af7a02..Face3",
"display_name": "Room_1_a9af7a02..Face3",
"type": "Face"
},
{
Expand Down Expand Up @@ -2650,8 +2670,8 @@
"type": "FaceRadiancePropertiesAbridged"
}
},
"identifier": "Room_5_ed68d949..Face4",
"display_name": "Room_5_ed68d949..Face4",
"identifier": "Room_1_a9af7a02..Face4",
"display_name": "Room_1_a9af7a02..Face4",
"type": "Face"
},
{
Expand Down Expand Up @@ -2720,8 +2740,8 @@
"type": "FaceRadiancePropertiesAbridged"
}
},
"identifier": "Room_5_ed68d949..Face5",
"display_name": "Room_5_ed68d949..Face5",
"identifier": "Room_1_a9af7a02..Face5",
"display_name": "Room_1_a9af7a02..Face5",
"type": "Face"
}
],
Expand Down
Loading

0 comments on commit 176082c

Please sign in to comment.