update to HEM 0.24 (consultation version)

communitiesuk · Dec 19, 2023 · 9624baa · 9624baa
1 parent c0ca4e6
commit 9624baa
Show file tree

Hide file tree

Showing 61 changed files with 29,134 additions and 1,134 deletions.
diff --git a/examples/input/core/SAP11_deck_flat_nat_vent.json b/examples/input/core/SAP11_deck_flat_nat_vent.json
@@ -8899,20 +8899,20 @@
 	},
 	"Distribution": {
 		"internal": {
-			"internal_diameter": 0.025,
-			"external_diameter": 0.027,
+			"internal_diameter_mm": 25,
+			"external_diameter_mm": 27,
 			"length": 8.0,
 			"insulation_thermal_conductivity": 0.035,
-			"insulation_thickness": 0.038,
+			"insulation_thickness_mm": 38,
 			"surface_reflectivity": false,
 			"pipe_contents": "water"
 		},
 		"external": {
-			"internal_diameter": 0.025,
-			"external_diameter": 0.027,
+			"internal_diameter_mm": 25,
+			"external_diameter_mm": 27,
 			"length": 8.0,
 			"insulation_thermal_conductivity": 0.035,
-			"insulation_thickness": 0.038,
+			"insulation_thickness_mm": 38,
 			"surface_reflectivity": false,
 			"pipe_contents": "water"
 		}
@@ -8940,7 +8940,8 @@
 		"req_ach": 0.5
 	},
 	"Infiltration": {
-		"storey": 2,
+		"storeys_in_building": 2,
+		"storey_of_dwelling": 1,
 		"shelter": "normal",
 		"build_type": "flat",
 		"test_result": 4.0,
@@ -8975,7 +8976,7 @@
 					"k_m": 51000,
 					"mass_distribution_class": "I",
 					"pitch": 90,
-					"orientation":180,
+					"orientation360": 0,
 					"base_height": 10,
 					"height":6.52,
 					"width":1
@@ -9033,7 +9034,7 @@
 					"area": 3.626,
 					"r_c": 0.554,
 					"pitch": 90,
-					"orientation": 180,
+					"orientation360": 0,
 					"g_value": 0.73,
 					"frame_area_fraction":0.16,
 					"height":2.05,
@@ -9046,7 +9047,7 @@
 					"area": 1.26,
 					"r_c": 0.531,
 					"pitch": 90,
-					"orientation": 180,
+					"orientation360": 0,
 					"g_value": 0.73,
 					"frame_area_fraction":0.27,
 					"height":1.05,
@@ -9104,7 +9105,7 @@
 					"k_m": 51000,
 					"mass_distribution_class": "I",
 					"pitch": 90,
-					"orientation":0,
+					"orientation360": 180,
 					"base_height": 10,
 					"height":2.33,
 					"width":1
@@ -9117,7 +9118,7 @@
 					"k_m": 51000,
 					"mass_distribution_class": "I",
 					"pitch": 90,
-					"orientation":0,
+					"orientation360": 180,
 					"base_height": 10,
 					"height":6.6,
 					"width":1
@@ -9255,7 +9256,7 @@
 					"area": 0.472,
 					"r_c": 0.503,
 					"pitch": 90,
-					"orientation": 0,
+					"orientation360": 180,
 					"g_value": 0.73,
 					"frame_area_fraction":0.41,
 					"height":0.75,
@@ -9268,7 +9269,7 @@
 					"area": 2.009,
 					"r_c": 0.541,
 					"pitch": 90,
-					"orientation": 0,
+					"orientation360": 180,
 					"g_value": 0.73,
 					"frame_area_fraction":0.22,
 					"height":1.13,

diff --git a/examples/input/core/SAP11_deck_flat_nat_vent_with_window_opening_for_cooling.json b/examples/input/core/SAP11_deck_flat_nat_vent_with_window_opening_for_cooling.json
@@ -8912,20 +8912,20 @@
 	},
 	"Distribution": {
 		"internal": {
-			"internal_diameter": 0.025,
-			"external_diameter": 0.027,
+			"internal_diameter_mm": 25,
+			"external_diameter_mm": 27,
 			"length": 8.0,
 			"insulation_thermal_conductivity": 0.035,
-			"insulation_thickness": 0.038,
+			"insulation_thickness_mm": 38,
 			"surface_reflectivity": false,
 			"pipe_contents": "water"
 		},
 		"external": {
-			"internal_diameter": 0.025,
-			"external_diameter": 0.027,
+			"internal_diameter_mm": 25,
+			"external_diameter_mm": 27,
 			"length": 8.0,
 			"insulation_thermal_conductivity": 0.035,
-			"insulation_thickness": 0.038,
+			"insulation_thickness_mm": 38,
 			"surface_reflectivity": false,
 			"pipe_contents": "water"
 		}
@@ -8953,11 +8953,11 @@
 		"req_ach": 0.5
 	},
 	"Window_Opening_For_Cooling": {
-		"equivalent_area": 3.0,
-		"control": "window opening"
+		"equivalent_area": 3.0
 	},
 	"Infiltration": {
-		"storey": 2,
+		"storeys_in_building": 2,
+		"storey_of_dwelling": 1,
 		"shelter": "normal",
 		"build_type": "flat",
 		"test_result": 4.0,
@@ -8978,6 +8978,7 @@
 	"Zone": {
 		"zone 1": {
 			"SpaceHeatSystem": "heating system zone 1",
+			"Control_WindowOpening": "window opening",
 			"area": 14.73,
 			"volume":35.1,
 			"temp_setpnt_heat": 21.0,
@@ -8992,7 +8993,7 @@
 					"k_m": 51000,
 					"mass_distribution_class": "I",
 					"pitch": 90,
-					"orientation":180,
+					"orientation360": 0,
 					"base_height": 10,
 					"height":6.52,
 					"width":1
@@ -9050,7 +9051,7 @@
 					"area": 3.626,
 					"r_c": 0.554,
 					"pitch": 90,
-					"orientation": 180,
+					"orientation360": 0,
 					"g_value": 0.73,
 					"frame_area_fraction":0.16,
 					"height":2.05,
@@ -9063,7 +9064,7 @@
 					"area": 1.26,
 					"r_c": 0.531,
 					"pitch": 90,
-					"orientation": 180,
+					"orientation360": 0,
 					"g_value": 0.73,
 					"frame_area_fraction":0.27,
 					"height":1.05,
@@ -9107,6 +9108,7 @@
 		},
 		"zone 2": {
 			"SpaceHeatSystem": "heating system zone 2",
+			"Control_WindowOpening": "window opening",
 			"area": 15.3,
 			"volume":36.06,
 			"temp_setpnt_heat": 21.0,
@@ -9121,7 +9123,7 @@
 					"k_m": 51000,
 					"mass_distribution_class": "I",
 					"pitch": 90,
-					"orientation":0,
+					"orientation360": 180,
 					"base_height": 10,
 					"height":2.33,
 					"width":1
@@ -9134,7 +9136,7 @@
 					"k_m": 51000,
 					"mass_distribution_class": "I",
 					"pitch": 90,
-					"orientation":0,
+					"orientation360": 180,
 					"base_height": 10,
 					"height":6.6,
 					"width":1
@@ -9272,7 +9274,7 @@
 					"area": 0.472,
 					"r_c": 0.503,
 					"pitch": 90,
-					"orientation": 0,
+					"orientation360": 180,
 					"g_value": 0.73,
 					"frame_area_fraction":0.41,
 					"height":0.75,
@@ -9285,7 +9287,7 @@
 					"area": 2.009,
 					"r_c": 0.541,
 					"pitch": 90,
-					"orientation": 0,
+					"orientation360": 180,
 					"g_value": 0.73,
 					"frame_area_fraction":0.22,
 					"height":1.13,