openstudio-standards 0.2.0.rc2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7971c760a2256abb5458a28ad4e0d31a9364acca
-  data.tar.gz: b4ed3ac1b33749ad8511de8b22dac45052074476
+  metadata.gz: 13900fdf938b7d127357f71afea357973d2884fc
+  data.tar.gz: 3da4b7b33084026a1762da60cf89924365b4bb8c
 SHA512:
-  metadata.gz: 7156d8390581e7633b5ec60a0fb1d44f8bb1eb78876eaf5b4ab26adcddededd0fe2b5e6a3e411d1721cce3532e5cb1c7d108f54ccfe00148555fb42b97502055
-  data.tar.gz: 8a8c9b87d8796999ffcee7319ec59f109513f5a7ed2057ac1b5853936263781a78797febee97909888af385c51a3db17d92a2b7402843299d9e63cf78b238f5d
+  metadata.gz: 349572947a81fbfac6ca21768ef96e7be6f0a2eb49ef7753869b6544922b1952e65cc61f837375d015f1cd943758dcff2c426dcab4385f049e006cfefc84770b
+  data.tar.gz: 0eaef05bcb57a3640b21ded3b416321feb7618cb4a226e38f42c681ba9f721717e81dc500117cc87dae1135cffbf5d486d385fb0e79a98530f035ebeb9423edc

data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.rb

@@ -1444,7 +1444,7 @@ Standard.class_eval do
     # Residential
     # NonResidential
     # Use 90.1-2010 so that retail and publicassembly are not split out
-    zones = model_zones_with_occ_and_fuel_type(model, '90.1-2010', nil)
+    zones = model_zones_with_occ_and_fuel_type(model, nil)
 
     # Ensure that there is at least one conditioned zone
     if zones.size.zero?

data/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb

@@ -6309,7 +6309,7 @@ class Standard
                       else
                         'res_med'
                       end
-    when 'nonresidential'
+    when 'nonresidential', 'retail', 'publicassembly', 'heatedonly'
       # nonresidential and 3 floors or less and < 75,000 ft2
       if num_stories <= 3 && area_ft2 < 75_000
         size_category = 'nonres_small'
@@ -6429,7 +6429,7 @@ class Standard
     # Get the system type
     system_type = syts[heating_source][cooling_source][delivery_type][size_category]
 
-    if system_type.nil?
+    if system_type.nil? || system_type.empty?
       system_type = [nil, nil, nil, nil]
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not determine system type for #{template}, #{area_type}, #{heating_source} heating, #{cooling_source} cooling, #{delivery_type} delivery, #{area_ft2.round} ft^2, #{num_stories} stories.")
     else

data/lib/openstudio-standards/standards/Standards.Model.rb

@@ -3013,7 +3013,8 @@ class Standard
                        else
                          "ASHRAE 169-2006-#{cz.value}"
                        end
-        next
+      elsif cz.institution == 'CEC'
+        climate_zone = "CEC T24-CEC#{cz.value}"
       end
     end
 

data/lib/openstudio-standards/version.rb

@@ -13,5 +13,5 @@ module OpenstudioStandards
     end
     return 'git-not-found-on-this-system'
   end
-  VERSION = '0.2.0.rc2'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-standards
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Parker
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest-reporters