Skip to content

Commit

Permalink
fix(zone): Include support for ClimateZones 1B and 5C
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
chriswmackey committed Jul 17, 2021
1 parent 16d9147 commit eda6d8c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions dragonfly_uwg/properties/_refdefaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class _RefDefaults(object):
SHGC = {
'Pre1980': {
'1A': 0.54,
'1B': 0.54,
'2A': 0.54,
'2B': 0.54,
'3A': 0.54,
Expand All @@ -45,13 +46,15 @@ class _RefDefaults(object):
'4C': 0.54,
'5A': 0.54,
'5B': 0.407,
'5C': 0.407,
'6A': 0.407,
'6B': 0.407,
'7': 0.407,
'8': 0.407
},
'1980_Present': {
'1A': 0.251,
'1B': 0.251,
'2A': 0.251,
'2B': 0.251,
'3A': 0.255,
Expand All @@ -62,13 +65,15 @@ class _RefDefaults(object):
'4C': 0.362,
'5A': 0.392,
'5B': 0.385,
'5C': 0.385,
'6A': 0.385,
'6B': 0.385,
'7': 0.385,
'8': 0.487
},
'New': {
'1A': 0.251,
'1B': 0.251,
'2A': 0.251,
'2B': 0.251,
'3A': 0.252,
Expand All @@ -79,6 +84,7 @@ class _RefDefaults(object):
'4C': 0.385,
'5A': 0.385,
'5B': 0.385,
'5C': 0.385,
'6A': 0.385,
'6B': 0.385,
'7': 0.385,
Expand Down
4 changes: 2 additions & 2 deletions dragonfly_uwg/simulation/parameter.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class UWGSimulationParameter(object):
'_reference_epw_site', '_boundary_layer_parameter')

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

def __init__(self, climate_zone=autocalculate, run_period=None, timestep=12,
vegetation_parameter=None, reference_epw_site=None,
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dragonfly-core==1.29.26
uwg==5.8.3
uwg==5.8.4

0 comments on commit eda6d8c

Please sign in to comment.