Skip to content

Commit d8e4f1c

Browse files
chriswmackeyChris Mackey
authored andcommitted
fix(zone): Include support for ClimateZones 1B and 5C
I assume that these climate zones were not originally included because there is no part of the contiguous US that contains them. However, they definitely exist on Earth and the ASHRAE 90.1 guidelines for them are effectively the same as other climate zones. So I am embedding this mapping with this commit.
1 parent 16d9147 commit d8e4f1c

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

dragonfly_uwg/properties/_refdefaults.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class _RefDefaults(object):
3535
SHGC = {
3636
'Pre1980': {
3737
'1A': 0.54,
38+
'1B': 0.54,
3839
'2A': 0.54,
3940
'2B': 0.54,
4041
'3A': 0.54,
@@ -45,13 +46,15 @@ class _RefDefaults(object):
4546
'4C': 0.54,
4647
'5A': 0.54,
4748
'5B': 0.407,
49+
'5C': 0.407,
4850
'6A': 0.407,
4951
'6B': 0.407,
5052
'7': 0.407,
5153
'8': 0.407
5254
},
5355
'1980_Present': {
5456
'1A': 0.251,
57+
'1B': 0.251,
5558
'2A': 0.251,
5659
'2B': 0.251,
5760
'3A': 0.255,
@@ -62,13 +65,15 @@ class _RefDefaults(object):
6265
'4C': 0.362,
6366
'5A': 0.392,
6467
'5B': 0.385,
68+
'5C': 0.385,
6569
'6A': 0.385,
6670
'6B': 0.385,
6771
'7': 0.385,
6872
'8': 0.487
6973
},
7074
'New': {
7175
'1A': 0.251,
76+
'1B': 0.251,
7277
'2A': 0.251,
7378
'2B': 0.251,
7479
'3A': 0.252,
@@ -79,6 +84,7 @@ class _RefDefaults(object):
7984
'4C': 0.385,
8085
'5A': 0.385,
8186
'5B': 0.385,
87+
'5C': 0.385,
8288
'6A': 0.385,
8389
'6B': 0.385,
8490
'7': 0.385,

dragonfly_uwg/simulation/parameter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class UWGSimulationParameter(object):
4040
'_reference_epw_site', '_boundary_layer_parameter')
4141

4242
VALIDTIMESTEPS = (1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60)
43-
VALIDZONES = ('1A', '2A', '2B', '3A', '3B', '3C', '4A', '4B', '4C',
44-
'5A', '5B', '6A', '6B', '7', '8')
43+
VALIDZONES = ('1A', '1B', '2A', '2B', '3A', '3B', '3C', '4A', '4B', '4C',
44+
'5A', '5B', '5C', '6A', '6B', '7', '8')
4545

4646
def __init__(self, climate_zone=autocalculate, run_period=None, timestep=12,
4747
vegetation_parameter=None, reference_epw_site=None,

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
dragonfly-core==1.29.26
2-
uwg==5.8.3
2+
uwg==5.8.4

0 commit comments

Comments
 (0)