Fix inconsistent climate zone naming, and

Make climate zone 8 ground thermal conductivity the average value of all other climate zones (no data for 8)
NREL · Jan 10, 2022 · e61ef7a · e61ef7a
1 parent 28c60f5
commit e61ef7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ghpghx/models.py b/ghpghx/models.py
@@ -97,8 +97,8 @@ class GHPGHXInputs(models.Model):
                             "5B": 1.177,
                             "6A": 0.977,
                             "6B": 0.981,
-                            "7": 1.034,
-                            "8": 1.508
+                            "7": 1.271,
+                            "8": 1.189
                             }
 
     ground_thermal_conductivity_btu_per_hr_ft_f = models.FloatField(blank=True, 

diff --git a/input_files/LoadProfiles/ghp_cooling_efficiency_thermal_factors.csv b/input_files/LoadProfiles/ghp_cooling_efficiency_thermal_factors.csv
@@ -1,4 +1,4 @@
-Building Type,1A,2A,2B,3A,3B,3C,4A,4B,4C,5A,5B,6A,6B,7A,8A
+Building Type,1A,2A,2B,3A,3B,3C,4A,4B,4C,5A,5B,6A,6B,7,8
 LargeOffice,0.5,0.5,0.4,0.46,0.39,0.34,0.44,0.38,0.33,0.38,0.38,0.38,0.36,0.36,0.31
 MediumOffice,0.67,0.63,0.59,0.59,0.55,0.43,0.57,0.56,0.38,0.49,0.56,0.49,0.5,0.46,0.4
 PrimarySchool,0.88,0.88,0.79,0.85,0.74,0.63,0.85,0.72,0.58,0.72,0.75,0.73,0.72,0.72,0.64

diff --git a/input_files/LoadProfiles/ghp_heating_efficiency_thermal_factors.csv b/input_files/LoadProfiles/ghp_heating_efficiency_thermal_factors.csv
@@ -1,4 +1,4 @@
-Building Type,1A,2A,2B,3A,3B,3C,4A,4B,4C,5A,5B,6A,6B,7A,8A
+Building Type,1A,2A,2B,3A,3B,3C,4A,4B,4C,5A,5B,6A,6B,7,8
 LargeOffice,0.63,0.33,0.62,0.65,0.83,0.49,0.73,0.94,0.91,0.97,0.97,0.98,0.97,0.98,0.99
 MediumOffice,0.7,0.55,0.58,0.81,0.78,0.46,0.88,0.92,0.88,0.97,0.96,0.98,0.97,0.98,0.99
 PrimarySchool,0.87,0.93,0.78,0.98,0.88,0.76,0.99,0.95,0.94,0.98,0.97,0.99,0.98,0.99,0.99