urbanopt-cli 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846dc392c015b9f1edf2a74dc738f40d6b89ac260fec2a72c1dade502646d3e8
-  data.tar.gz: cda4aabc4cbcbbb320c089ccec77eb513cee47e365b4152945e6ccc8d65a1d01
+  metadata.gz: 95f4b510da000f3f99a23e58a665722bfd5ee1526f662f5f7ebd567398963f36
+  data.tar.gz: 876a39d424ca5ee07126da660e3aad478b5ea7334bec3538e266d9bd54586c57
 SHA512:
-  metadata.gz: c6f2b316e6eb68ab666bf354e286c772be1846d067f9835eb2d7c38c7a3968e0e975c510f3198cb5185f7818d7ce23d7d218b38d0a2ab64837a5ae7c95d462f8
-  data.tar.gz: 65f2d31a572edfbf2007b5db29b3cc84d357cab0c701f79d5a071bf4d5d88244f6fc3d9188e7bf35286b6cfd319572a7cc12834c9c7890c2d8505c3a7320823c
+  metadata.gz: de1e2b6298df2a464a401e485c22ee8f8c67ee99486b94c50bc5ae6890c1e571433666eaa90de54e2d969e161bd7db2baae6da6b6e673e2139cf349300ad7896
+  data.tar.gz: d5ed2edc0bfdaddaf4860348d460c9dc74c27a82b850d7215b0bea230539fdb46969aa6b357f3c4c161bacc11e2fc82c24f7455a391a311c2da5c45b47d48ba2

data/.github/pull_request_template.md

@@ -1,4 +1,4 @@
-### Addresses #[issue number here]
+### Resolves #[issue number here]
 
 ### Pull Request Description
 
@@ -8,5 +8,5 @@
 
 - [ ] Unit tests have been added or updated
 - [ ] All ci tests pass (green)
-- [ ] An [ISSUE](https://github.com/urbanopt/urbanopt-cli/issues) has been created that this is addressing. Issues will get added to the Change Log when the change_log.rb script is run
+- [ ] An [issue](https://github.com/urbanopt/urbanopt-cli/issues) has been created (which will be used for the changelog)
 - [ ] This branch is up-to-date with develop

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Changelog
 
+
+## Version 0.4.1
+
+Date Range: 10/01/20 - 11/16/20
+
+- Fixed [#146]( https://github.com/urbanopt/urbanopt-cli/issues/146 ), Better error handling on Visualize command
+- Fixed [#147]( https://github.com/urbanopt/urbanopt-cli/issues/147 ), Copy Visualize files from directory
+- Fixed [#151]( https://github.com/urbanopt/urbanopt-cli/issues/151 ), Saving to db file doesn't work right on windows machines
+- Fixed [#153]( https://github.com/urbanopt/urbanopt-cli/issues/153 ), Dependencies need to be managed tighter
+- Fixed [#156]( https://github.com/urbanopt/urbanopt-cli/issues/156 ), BUGFIX: Add methods to save feature results
+- Fixed [#163]( https://github.com/urbanopt/urbanopt-cli/issues/163 ), Bugfixes for residential workflow
+- Fixed [#164]( https://github.com/urbanopt/urbanopt-cli/issues/164 ), Enhancements for residential workflow
+
 ## Version 0.4.0
 
+Date Range: 06/11/20 - 09/30/20
+
 - Fixed [#49]( https://github.com/urbanopt/urbanopt-cli/issues/49 ), Gathering results (post-processing) should provide scenario-level results in a database file
 - Fixed [#95]( https://github.com/urbanopt/urbanopt-cli/issues/95 ), store bundle directory outside of project directory
 - Fixed [#115]( https://github.com/urbanopt/urbanopt-cli/issues/115 ), Add command for visualising scenario results after post processing

data/Gemfile

@@ -34,9 +34,9 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # end
 
 # if allow_local && File.exist?('../urbanopt-scenario-gem')
-#   gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
+  # gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
 # elsif allow_local
-#   gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
+#  gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 # end
 
 # if allow_local && File.exist?('../urbanopt-geojson-gem')
@@ -48,19 +48,19 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # if allow_local && File.exist?('../urbanopt-reopt-gem')
 #   gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
 # elsif allow_local
-#   gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
+#  gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
 # end
 
-if allow_local && File.exist?('../openstudio-load-flexibility-measures')
-  gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures'
-elsif allow_local
-  gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures', branch: 'master'
-else
-  gem 'openstudio-load-flexibility-measures', '0.1.3'
-end
+# if allow_local && File.exist?('../openstudio-load-flexibility-measures')
+#   gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures'
+# elsif allow_local
+#   gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures', branch: 'master'
+# else
+#   gem 'openstudio-load-flexibility-measures', '0.1.3'
+# end
 
 # if allow_local && File.exist?('../urbanopt-reporting-gem')
 #   gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem'
 # elsif allow_local
-#   gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
+#  gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 # end

data/README.md

@@ -1,4 +1,4 @@
-# URBANopt Cli
+# URBANopt CLI
 
 This is the command line interface (CLI) for the URBANopt™ SDK.
 

data/example_files/Gemfile

@@ -31,7 +31,7 @@ if allow_local && File.exist?('../openstudio-common-measures-gem')
 elsif allow_local
   gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
 else
-  gem 'openstudio-common-measures', '~> 0.2.0'
+  gem 'openstudio-common-measures', '0.2.0'
 end
 
 if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -39,7 +39,7 @@ if allow_local && File.exist?('../openstudio-model-articulation-gem')
 elsif allow_local
   gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
 else
-  gem 'openstudio-model-articulation', '~> 0.2.0'
+  gem 'openstudio-model-articulation', '0.2.0'
 end
 
 if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
@@ -63,5 +63,5 @@ if allow_local && File.exist?('../urbanopt-reporting-gem')
 elsif allow_local
   gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
 else
-  gem 'urbanopt-reporting', '~> 0.2.0'
+  gem 'urbanopt-reporting', '~> 0.2.1'
 end

data/example_files/mappers/Baseline.rb

@@ -1,4 +1,4 @@
-# *********************************************************************************
+#*********************************************************************************
 # URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
@@ -26,7 +26,7 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
-# *********************************************************************************
+#*********************************************************************************
 
 require 'urbanopt/reporting'
 require 'openstudio/common_measures'
@@ -38,12 +38,14 @@ require 'rexml/document'
 module URBANopt
   module Scenario
     class BaselineMapper < SimulationMapperBase
+
       # class level variables
       @@instance_lock = Mutex.new
       @@osw = nil
       @@geometry = nil
 
-      def initialize
+      def initialize()
+
         # do initialization of class variables in thread safe way
         @@instance_lock.synchronize do
           if @@osw.nil?
@@ -67,144 +69,145 @@ module URBANopt
       end
 
       def lookup_building_type(building_type, template, footprint_area, number_of_stories)
-        if template.include? 'DEER'
+        if template.include? "DEER"
           case building_type
-          when 'Education'
-            return 'EPr'
-          when 'Enclosed mall'
-            return 'RtL'
-          when 'Food sales'
-            return 'RSD'
-          when 'Food service'
-            return 'RSD'
-          when 'Inpatient health care'
-            return 'Nrs'
-          when 'Laboratory'
-            return 'Hsp'
-          when 'Lodging'
-            return 'Htl'
-          when 'Mixed use'
-            return 'ECC'
-          when 'Mobile Home'
-            return 'DMo'
-          when 'Multifamily (2 to 4 units)'
-            return 'MFm'
-          when 'Multifamily (5 or more units)'
-            return 'MFm'
-          when 'Nonrefrigerated warehouse'
-            return 'SUn'
-          when 'Nursing'
-            return 'Nrs'
-          when 'Office'
+          when "Education"
+            return "EPr"
+          when "Enclosed mall"
+            return "RtL"
+          when "Food sales"
+            return "RSD"
+          when "Food service"
+            return "RSD"
+          when "Inpatient health care"
+            return "Nrs"
+          when "Laboratory"
+            return "Hsp"
+          when "Lodging"
+            return "Htl"
+          when "Mixed use"
+            return "ECC"
+          when "Mobile Home"
+            return "DMo"
+          when "Multifamily (2 to 4 units)"
+            return "MFm"
+          when "Multifamily (5 or more units)"
+            return "MFm"
+          when "Nonrefrigerated warehouse"
+            return "SUn"
+          when "Nursing"
+            return "Nrs"
+          when "Office"
             if footprint_area
               if footprint_area.to_f > 100000
-                return 'OfL'
+                return "OfL"
               else
-                return 'OfS'
+                return "OfS"
               end
             else
-              raise 'footprint_area required to map office building type'
+              raise "footprint_area required to map office building type"
             end
-          when 'Outpatient health care'
-            return 'Nrs'
-          when 'Public assembly'
-            return 'Asm'
-          when 'Public order and safety'
-            return 'Asm'
-          when 'Refrigerated warehouse'
-            return 'WRf'
-          when 'Religious worship'
-            return 'Asm'
-          when 'Retail other than mall'
-            return 'RtS'
-          when 'Service'
-            return 'MLI'
-          when 'Single-Family'
-            return 'MFm'
-          when 'Strip shopping mall'
-            return 'RtL'
-          when 'Vacant'
-            return 'SUn'
+          when "Outpatient health care"
+            return "Nrs"
+          when "Public assembly"
+            return "Asm"
+          when "Public order and safety"
+            return "Asm"
+          when "Refrigerated warehouse"
+            return "WRf"
+          when "Religious worship"
+            return "Asm"
+          when "Retail other than mall"
+            return "RtS"
+          when "Service"
+            return "MLI"
+          when "Single-Family"
+            return "MFm"
+          when "Strip shopping mall"
+            return "RtL"
+          when "Vacant"
+            return "SUn"
           else
-            raise "building type #{building_type} cannot be mapped to a DEER building type"
+           raise "building type #{building_type} cannot be mapped to a DEER building type"
           end
 
         else
           # default: ASHRAE
           case building_type
-          when 'Education'
+          when "Education"
             return 'SecondarySchool'
-          when 'Enclosed mall'
-            return 'RetailStripmall'
-          when 'Food sales'
-            return 'FullServiceRestaurant'
-          when 'Food service'
-            return 'FullServiceRestaurant'
-          when 'Inpatient health care'
-            return 'Hospital'
-          when 'Laboratory'
-            return 'Hospital'
-          when 'Lodging'
+          when "Enclosed mall"
+            return "RetailStripmall"
+          when "Food sales"
+            return "FullServiceRestaurant"
+          when "Food service"
+            return "FullServiceRestaurant"
+          when "Inpatient health care"
+            return "Hospital"
+          when "Laboratory"
+            return "Hospital"
+          when "Lodging"
             if number_of_stories
               if number_of_stories.to_i > 3
-                return 'LargeHotel'
+                return "LargeHotel"
               else
-                return 'SmallHotel'
+                return "SmallHotel"
               end
             end
-            return 'LargeHotel'
-          when 'Mixed use'
-            return 'Mixed use'
-          when 'Mobile Home'
-            return 'MidriseApartment'
-          when 'Multifamily (2 to 4 units)'
-            return 'MidriseApartment'
-          when 'Multifamily (5 or more units)'
-            return 'MidriseApartment'
-          when 'Nonrefrigerated warehouse'
-            return 'Warehouse'
-          when 'Nursing'
-            return 'Outpatient'
-          when 'Office'
+            return "LargeHotel"
+          when "Mixed use"
+            return "Mixed use"
+          when "Mobile Home"
+            return "MidriseApartment"
+          when "Multifamily (2 to 4 units)"
+            return "MidriseApartment"
+          when "Multifamily (5 or more units)"
+            return "MidriseApartment"
+          when "Nonrefrigerated warehouse"
+            return "Warehouse"
+          when "Nursing"
+            return "Outpatient"
+          when "Office"
             if footprint_area
               if footprint_area.to_f < 20000
-                value = 'SmallOffice'
+                value = "SmallOffice"
               elsif footprint_area.to_f > 100000
-                value = 'LargeOffice'
+                value = "LargeOffice"
               else
-                value = 'MediumOffice'
+                value = "MediumOffice"
               end
             else
-              raise 'Floor area required to map office building type'
+              raise "Floor area required to map office building type"
             end
-          when 'Outpatient health care'
-            return 'Outpatient'
-          when 'Public assembly'
-            return 'MediumOffice'
-          when 'Public order and safety'
-            return 'MediumOffice'
-          when 'Refrigerated warehouse'
-            return 'Warehouse'
-          when 'Religious worship'
-            return 'MediumOffice'
-          when 'Retail other than mall'
-            return 'RetailStandalone'
-          when 'Service'
-            return 'MediumOffice'
-          when 'Single-Family'
-            return 'MidriseApartment'
-          when 'Strip shopping mall'
-            return 'RetailStripmall'
-          when 'Vacant'
-            return 'Warehouse'
+          when "Outpatient health care"
+            return "Outpatient"
+          when "Public assembly"
+            return "MediumOffice"
+          when "Public order and safety"
+            return "MediumOffice"
+          when "Refrigerated warehouse"
+            return "Warehouse"
+          when "Religious worship"
+            return "MediumOffice"
+          when "Retail other than mall"
+            return "RetailStandalone"
+          when "Service"
+            return "MediumOffice"
+          when "Single-Family"
+            return "MidriseApartment"
+          when "Strip shopping mall"
+            return "RetailStripmall"
+          when "Vacant"
+            return "Warehouse"
           else
             raise "building type #{building_type} cannot be mapped to an ASHRAE building type"
           end
         end
       end
 
-      def lookup_template_by_year_built(template, year_built)
-        if template.include? 'DEER'
+      def lookup_template_by_year_built(template,  year_built)
+
+        if template.include? "DEER"
           if year_built <= 1996
             return 'DEER 1985'
           elsif year_built <= 2003
@@ -266,7 +269,7 @@ module URBANopt
           'Food service',
           'Inpatient health care',
           'Nursing',
-          'Lodging',
+          'Lodging',          
           'Strip shopping mall',
           'Enclosed mall',
           'Retail other than mall',
@@ -296,7 +299,7 @@ module URBANopt
         rows = []
         headers = []
         units = []
-        CSV.foreach(filepath, col_sep: "\t") do |row|
+        CSV.foreach(filepath, { :col_sep => "\t" }) do |row|
           if headers.empty?
             row.each do |header|
               next if header == 'Source'
@@ -364,7 +367,7 @@ module URBANopt
       end
 
       def get_climate_zone_iecc(epw)
-        headers = CSV.open(epw, 'r', &:first)
+        headers = CSV.open(epw, 'r') { |csv| csv.first }
         wmo = headers[5]
         zones_csv = File.join(File.dirname(__FILE__), '../resources/hpxml-measures/HPXMLtoOpenStudio/resources/data_climate_zones.csv')
         CSV.foreach(zones_csv) do |row|
@@ -375,15 +378,16 @@ module URBANopt
       end
 
       def create_osw(scenario, features, feature_names)
+        
         if features.size != 1
-          raise 'Baseline currently cannot simulate more than one feature.'
+          raise "Baseline currently cannot simulate more than one feature."
         end
         feature = features[0]
         feature_id = feature.id
         feature_type = feature.type
 
         # take the first vertex as the location of the building
-        # feature_location = feature.feature_json[:geometry][:coordinates][0][0].to_s
+        #feature_location = feature.feature_json[:geometry][:coordinates][0][0].to_s
 
         # take the centroid of the vertices as the location of the building
         feature_vertices_coordinates = feature.feature_json[:geometry][:coordinates][0]
@@ -414,132 +418,144 @@ module URBANopt
             args[:simulation_control_timestep] = 60
             begin
               args[:simulation_control_timestep] = 60 / feature.timesteps_per_hour
-            rescue StandardError
+            rescue
             end
 
-            args[:simulation_control_begin_month] = 1
-            args[:simulation_control_begin_day_of_month] = 1
-            args[:simulation_control_end_month] = 12
-            args[:simulation_control_end_day_of_month] = 31
+            args[:simulation_control_run_period_begin_month] = 1
+            args[:simulation_control_run_period_begin_day_of_month] = 1
+            args[:simulation_control_run_period_end_month] = 12
+            args[:simulation_control_run_period_end_day_of_month] = 31
+            args[:simulation_control_run_period_calendar_year] = 2007
             begin
-              args[:simulation_control_begin_month] = feature.begin_date[5, 2].to_i
-              args[:simulation_control_begin_day_of_month] = feature.begin_date[8, 2].to_i
-              args[:simulation_control_end_month] = feature.end_date[5, 2].to_i
-              args[:simulation_control_end_day_of_month] = feature.end_date[8, 2].to_i
-            rescue StandardError
+              args[:simulation_control_run_period_begin_month] = feature.begin_date[5, 2].to_i
+              args[:simulation_control_run_period_begin_day_of_month] = feature.begin_date[8, 2].to_i
+              args[:simulation_control_run_period_end_month] = feature.end_date[5, 2].to_i
+              args[:simulation_control_run_period_end_day_of_month] = feature.end_date[8, 2].to_i
+              args[:simulation_control_run_period_calendar_year] = feature.begin_date[0, 4].to_i
+            rescue
             end
 
-            args[:weather_station_epw_filepath] = feature.weather_filename
+            args[:weather_station_epw_filepath] = "../../../weather/#{feature.weather_filename}"
 
             # Geometry
-            args[:geometry_num_units] = 1
+            args[:geometry_building_num_units] = 1
             case building_type
             when 'Single-Family Detached'
-              args[:geometry_unit_type] = 'single-family detached'
+              args[:geometry_unit_type] = "single-family detached"
             when 'Single-Family Attached'
-              args[:geometry_num_units] = feature.number_of_residential_units
-              args[:geometry_unit_type] = 'single-family attached'
+              args[:geometry_building_num_units] = feature.number_of_residential_units
+              args[:geometry_unit_type] = "single-family attached"
             when 'Multifamily'
-              args[:geometry_num_units] = feature.number_of_residential_units
-              args[:geometry_unit_type] = 'apartment unit'
+              args[:geometry_building_num_units] = feature.number_of_residential_units
+              args[:geometry_unit_type] = "apartment unit"
             end
 
-            args[:geometry_foundation_type] = 'SlabOnGrade'
+            args[:geometry_foundation_type] = "SlabOnGrade"
             args[:geometry_foundation_height] = 0.0
             case feature.foundation_type
             when 'crawlspace - vented'
-              args[:geometry_foundation_type] = 'VentedCrawlspace'
+              args[:geometry_foundation_type] = "VentedCrawlspace"
               args[:geometry_foundation_height] = 3.0
             when 'crawlspace - unvented'
-              args[:geometry_foundation_type] = 'UnventedCrawlspace'
+              args[:geometry_foundation_type] = "UnventedCrawlspace"
               args[:geometry_foundation_height] = 3.0
             when 'basement - unconditioned'
-              args[:geometry_foundation_type] = 'UnconditionedBasement'
+              args[:geometry_foundation_type] = "UnconditionedBasement"
               args[:geometry_foundation_height] = 8.0
             when 'basement - conditioned'
-              args[:geometry_foundation_type] = 'ConditionedBasement'
+              args[:geometry_foundation_type] = "ConditionedBasement"
               args[:geometry_foundation_height] = 8.0
             when 'ambient'
-              args[:geometry_foundation_type] = 'Ambient'
+              args[:geometry_foundation_type] = "Ambient"
               args[:geometry_foundation_height] = 8.0
             end
 
-            args[:geometry_attic_type] = 'ConditionedAttic'
-            args[:geometry_roof_type] = 'flat'
+            args[:geometry_attic_type] = "ConditionedAttic"
+            args[:geometry_roof_type] = "flat"
             begin
               case feature.attic_type
               when 'attic - vented'
-                args[:geometry_attic_type] = 'VentedAttic'
-                args[:geometry_roof_type] = 'gable'
+                args[:geometry_attic_type] = "VentedAttic"
+                args[:geometry_roof_type] = "gable"
               when 'attic - unvented'
-                args[:geometry_attic_type] = 'UnventedAttic'
-                args[:geometry_roof_type] = 'gable'
+                args[:geometry_attic_type] = "UnventedAttic"
+                args[:geometry_roof_type] = "gable"
               when 'attic - conditioned'
-                args[:geometry_attic_type] = 'ConditionedAttic'
-                args[:geometry_roof_type] = 'gable'
+                args[:geometry_attic_type] = "ConditionedAttic"
+                args[:geometry_roof_type] = "gable"
               end
-            rescue StandardError
+            rescue
             end
 
             args[:geometry_num_floors_above_grade] = feature.number_of_stories_above_ground
 
-            args[:geometry_cfa] = feature.floor_area / args[:geometry_num_units]
+            args[:geometry_cfa] = feature.floor_area / args[:geometry_building_num_units]
 
             args[:geometry_wall_height] = 8.0
             begin
               args[:geometry_wall_height] = feature.maximum_roof_height / args[:geometry_num_floors_above_grade]
-            rescue StandardError
+            rescue
             end
 
             args[:geometry_num_bedrooms] = feature.number_of_bedrooms
-            args[:geometry_num_bedrooms] /= args[:geometry_num_units]
+            args[:geometry_num_bedrooms] /= args[:geometry_building_num_units]
 
-            system_type = 'Residential - furnace and central air conditioner'
+            # SCHEDULES
+
+            args[:schedules_type] = 'stochastic'
+
+            # HVAC
+
+            system_type = "Residential - furnace and central air conditioner"
             begin
               system_type = feature.system_type
-            rescue StandardError
+            rescue
             end
 
-            args[:heating_system_type] = 'none'
+            args[:heating_system_type] = "none"
             if system_type.include?('electric resistance')
-              args[:heating_system_type] = 'ElectricResistance'
+              args[:heating_system_type] = "ElectricResistance"
             elsif system_type.include?('furnace')
-              args[:heating_system_type] = 'Furnace'
+              args[:heating_system_type] = "Furnace"
             elsif system_type.include?('boiler')
-              args[:heating_system_type] = 'Boiler'
+              args[:heating_system_type] = "Boiler"
             end
 
-            args[:cooling_system_type] = 'none'
+            args[:cooling_system_type] = "none"
             if system_type.include?('central air conditioner')
-              args[:cooling_system_type] = 'central air conditioner'
+              args[:cooling_system_type] = "central air conditioner"
             elsif system_type.include?('room air conditioner')
-              args[:cooling_system_type] = 'room air conditioner'
+              args[:cooling_system_type] = "room air conditioner"
             elsif system_type.include?('evaporative cooler')
-              args[:cooling_system_type] = 'evaporative cooler'
+              args[:cooling_system_type] = "evaporative cooler"
             end
 
-            args[:heat_pump_type] = 'none'
+            args[:heat_pump_type] = "none"
             if system_type.include?('air-to-air')
-              args[:heat_pump_type] = 'air-to-air'
+              args[:heat_pump_type] = "air-to-air"
             elsif system_type.include?('mini-split')
-              args[:heat_pump_type] = 'mini-split'
+              args[:heat_pump_type] = "mini-split"
             elsif system_type.include?('ground-to-air')
-              args[:heat_pump_type] = 'ground-to-air'
+              args[:heat_pump_type] = "ground-to-air"
             end
 
-            args[:heating_system_fuel] = 'natural gas'
+            args[:heating_system_fuel] = "natural gas"
             begin
               args[:heating_system_fuel] = feature.heating_system_fuel_type
-            rescue StandardError
+            rescue
             end
 
-            if args[:heating_system_type] == 'ElectricResistance'
-              args[:heating_system_fuel] = 'electricity'
+            if args[:heating_system_type] == "ElectricResistance"
+              args[:heating_system_fuel] = "electricity"
             end
 
+            # APPLIANCES
+
             args[:cooking_range_oven_fuel_type] = args[:heating_system_fuel]
             args[:clothes_dryer_fuel_type] = args[:heating_system_fuel]
 
+            # VENTILATION
+
             args[:kitchen_fans_present] = true
             args[:bathroom_fans_present] = true
 
@@ -548,7 +564,7 @@ module URBANopt
             template = nil
             begin
               template = feature.template
-            rescue StandardError
+            rescue
             end
 
             # IECC / EnergyStar / Other
@@ -556,8 +572,8 @@ module URBANopt
               if template.include?('Residential IECC')
 
                 captures = template.match(/Residential IECC (?<iecc_year>\d+) - Customizable Template (?<t_month>\w+) (?<t_year>\d+)/)
-                template_vals = Hash[captures.names.zip(captures.captures)]
-                template_vals = Hash[template_vals.collect { |k, v| [k.to_sym, v] }]
+                template_vals = Hash[captures.names.zip( captures.captures ) ]
+                template_vals = Hash[template_vals.collect{ |k, v| [k.to_sym, v] }]
 
                 epw = File.join(File.dirname(__FILE__), '../weather', feature.weather_filename)
                 template_vals[:climate_zone] = get_climate_zone_iecc(epw)
@@ -578,7 +594,7 @@ module URBANopt
                 end
                 row.delete(:foundation_wall_assembly_r_basement)
                 row.delete(:foundation_wall_assembly_r_crawlspace)
-                if ['ConditionedAttic'].include?(args[:geometry_attic_type])
+                if ["ConditionedAttic"].include?(args[:geometry_attic_type])
                   row[:roof_assembly_r] = row[:ceiling_assembly_r]
                   row[:ceiling_assembly_r] = 2.1
                 end
@@ -586,21 +602,21 @@ module URBANopt
 
                 # HVAC
 
-                if args[:heating_system_type] != 'none'
+                if args[:heating_system_type] != "none"
                   heating_system_filepath = File.join(File.dirname(__FILE__), 'residential/heating_system.tsv')
                   heating_system = get_lookup_tsv(args, heating_system_filepath)
                   row = get_lookup_row(args, heating_system, template_vals)
                   args.update(row) unless row.nil?
                 end
 
-                if args[:cooling_system_type] != 'none'
+                if args[:cooling_system_type] != "none"
                   cooling_system_filepath = File.join(File.dirname(__FILE__), 'residential/cooling_system.tsv')
                   cooling_system = get_lookup_tsv(args, cooling_system_filepath)
                   row = get_lookup_row(args, cooling_system, template_vals)
                   args.update(row) unless row.nil?
                 end
 
-                if args[:heat_pump_type] != 'none'
+                if args[:heat_pump_type] != "none"
                   heat_pump_filepath = File.join(File.dirname(__FILE__), 'residential/heat_pump.tsv')
                   heat_pump = get_lookup_tsv(args, heat_pump_filepath)
                   row = get_lookup_row(args, heat_pump, template_vals)
@@ -618,7 +634,7 @@ module URBANopt
 
                 # VENTILATION
 
-                mechvent_filepath = File.join(File.dirname(__FILE__), 'residential/mechanical_ventilation.tsv')
+                mechvent_filepath = File.join(File.dirname(__FILE__), "residential/mechanical_ventilation.tsv")
                 mechvent = get_lookup_tsv(args, mechvent_filepath)
                 row = get_lookup_row(args, mechvent, template_vals)
                 args.update(row) unless row.nil?
@@ -633,23 +649,36 @@ module URBANopt
             end
 
             # Parse BuildResidentialModel measure xml so we can override defaults with template values
+            default_args = {}
             OpenStudio::Extension.set_measure_argument(osw, 'BuildResidentialModel', '__SKIP__', false)
             measures_dir = File.absolute_path(File.join(File.dirname(__FILE__), '../resources/hpxml-measures'))
             measure_xml = File.read(File.join(measures_dir, 'BuildResidentialHPXML', 'measure.xml'))
             measure = REXML::Document.new(measure_xml).root
             measure.elements.each('arguments/argument') do |arg|
               arg_name = arg.elements['name'].text.to_sym
-              next if [:hpxml_path, :weather_dir].include? arg_name
+              next if [:hpxml_path].include? arg_name
 
-              if !args.keys.include? arg_name # argument has not been set and so gets the default value
-                if arg.elements['default_value']
-                  arg_default = arg.elements['default_value'].text
-                  args[arg_name] = arg_default
-                end
+              default_args[arg_name] = nil
+              if arg.elements['default_value']
+                arg_default = arg.elements['default_value'].text
+                default_args[arg_name] = arg_default
+              end
+            end
+
+            args.keys.each do |arg_name|
+              unless default_args.keys.include? arg_name
+                puts "Argument '#{arg_name}' is unknown."
+              end
+            end
+
+            default_args.each do |arg_name, arg_default|
+              next if arg_default.nil?
+
+              if not args.keys.include? arg_name
+                args[arg_name] = arg_default
               else
                 if debug
-                  if arg.elements['default_value']
-                    arg_default = arg.elements['default_value'].text
+                  if not arg_default.nil?
                     if args[arg_name] != arg_default
                       puts "Overriding #{arg_name} default '#{arg_default}' with '#{args[arg_name]}'."
                     end
@@ -658,10 +687,10 @@ module URBANopt
                   end
                 end
               end
+            end
 
-              if args.keys.include? arg_name
-                OpenStudio::Extension.set_measure_argument(osw, 'BuildResidentialModel', arg_name, args[arg_name])
-              end
+            args.keys.each do |arg_name|
+              OpenStudio::Extension.set_measure_argument(osw, 'BuildResidentialModel', arg_name, args[arg_name])
             end
 
           elsif commercial_building_types.include? building_type
@@ -789,13 +818,13 @@ module URBANopt
                   system_type = 'VAV air-cooled chiller with gas boiler reheat'
                 end
               else
-                system_type = 'Inferred'
+                system_type = "Inferred"
               end
 
               def time_mapping(time)
                 hour = time.split(':')[0]
                 minute = time.split(':')[1]
-                fraction = minute.to_f / 60
+                fraction = minute.to_f/60
                 fraction_roundup = fraction.round(2)
                 minute_fraction = fraction_roundup.to_s.split('.')[1]
                 new_time = [hour, minute_fraction].join('.')
@@ -811,20 +840,20 @@ module URBANopt
               begin
                 cec_climate_zone = feature.cec_climate_zone
                 if !cec_climate_zone.empty?
-                  cec_climate_zone = 'CEC T24-CEC' + cec_climate_zone
+                  cec_climate_zone = "CEC T24-CEC" + cec_climate_zone
                   OpenStudio::Extension.set_measure_argument(osw, 'ChangeBuildingLocation', 'climate_zone', cec_climate_zone)
                   cec_found = true
                 end
-              rescue StandardError
+              rescue
               end
               if !cec_found
                 begin
                   climate_zone = feature.climate_zone
                   if !climate_zone.empty?
-                    climate_zone = 'ASHRAE 169-2013-' + climate_zone
+                    climate_zone = "ASHRAE 169-2013-" + climate_zone
                     OpenStudio::Extension.set_measure_argument(osw, 'ChangeBuildingLocation', 'climate_zone', climate_zone)
                  end
-                rescue StandardError
+                rescue
                 end
               end
 
@@ -835,15 +864,15 @@ module URBANopt
                   OpenStudio::Extension.set_measure_argument(osw, 'ChangeBuildingLocation', 'weather_file_name', weather_filename)
                   puts "Setting weather_file_name to #{weather_filename} as specified in the FeatureFile"
                 end
-              rescue StandardError
-                puts 'No weather_file specified on feature'
+              rescue
+                puts "No weather_file specified on feature"
                 epw_file_path = Dir.glob(File.join(File.dirname(__FILE__), '../weather/*.epw'))[0]
                 if !epw_file_path.nil? && !epw_file_path.empty?
                   epw_file_name = File.basename(epw_file_path)
                   OpenStudio::Extension.set_measure_argument(osw, 'ChangeBuildingLocation', 'weather_file_name', epw_file_name)
                   puts "Setting weather_file_name to first epw file found in the weather folder: #{epw_file_name}"
                 else
-                  puts 'NO WEATHER FILES SPECIFIED...SIMULATIONS MAY FAIL'
+                  puts "NO WEATHER FILES SPECIFIED...SIMULATIONS MAY FAIL"
                 end
               end
 
@@ -854,7 +883,7 @@ module URBANopt
                   new_weekday_start_time = time_mapping(weekday_start_time)
                   OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'wkdy_op_hrs_start_time', new_weekday_start_time, 'create_typical_building_from_model 1')
                 end
-              rescue StandardError
+              rescue
               end
 
               # set weekday duration
@@ -864,7 +893,7 @@ module URBANopt
                   new_weekday_duration = time_mapping(weekday_duration)
                   OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'wkdy_op_hrs_duration', new_weekday_duration, 'create_typical_building_from_model 1')
                 end
-              rescue StandardError
+              rescue
               end
 
               # set weekend start time
@@ -874,7 +903,7 @@ module URBANopt
                   new_weekend_start_time = time_mapping(weekend_start_time)
                   OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'wknd_op_hrs_start_time', new_weekend_start_time, 'create_typical_building_from_model 1')
                 end
-              rescue StandardError
+              rescue
               end
 
               # set weekend duration
@@ -884,7 +913,7 @@ module URBANopt
                   new_weekend_duration = time_mapping(weekend_duration)
                   OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'wknd_op_hrs_duration', new_weekend_duration, 'create_typical_building_from_model 1')
                 end
-              rescue StandardError
+              rescue
               end
 
               # template
@@ -904,12 +933,12 @@ module URBANopt
                   OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'template', new_template, 'create_typical_building_from_model 1')
                   OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'template', new_template, 'create_typical_building_from_model 2')
                 end
-              rescue StandardError
+              rescue
               end
-
+              
               # TODO: surface_elevation has no current mapping
               # TODO: tariff_filename has no current mapping
-
+              
               # create a bar building, will have spaces tagged with individual space types given the
               # input building types
               # set skip measure to false
@@ -945,9 +974,9 @@ module URBANopt
 
               # create a blended space type for each story
               OpenStudio::Extension.set_measure_argument(osw,
-                                                         'blended_space_type_from_model', '__SKIP__', false)
+                'blended_space_type_from_model', '__SKIP__', false)
               OpenStudio::Extension.set_measure_argument(osw,
-                                                         'blended_space_type_from_model', 'blend_method', 'Building Story')
+              'blended_space_type_from_model', 'blend_method', 'Building Story')
 
               # create geometry for the desired feature, this will reuse blended space types in the model for each story and remove the bar geometry
               OpenStudio::Extension.set_measure_argument(osw, 'urban_geometry_creation_zoning', '__SKIP__', false)