urbanopt-cli 0.9.0 → 0.9.2

data/example_files/mappers/Baseline.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -391,55 +391,55 @@ module URBANopt
         # Options are: AZNMc, CAMXc, ERCTc, FRCCc, MROEc, MROWc, NEWEc, NWPPc, NYSTc, RFCEc, RFCMc, RFCWc, RMPAc, SPNOc, SPSOc, SRMVc, SRMWc, SRSOc, SRTVc, and SRVCc
         # egrid subregions can map directly to zipcodes but not to states. Some state might include multiple egrid subregions. the default mapper prioritize the egrid subregion that is most common in the state (covers the biggest number of zipcodes)
         future_emissions_mapping_hash =
-          { 'FL': 'FRCCc', # ['FRCCc', 'SRSOc']
-            'MS': 'SRMVc', # ['SRMVc', 'SRTVc']
-            'NE': 'MROWc', # ['MROWc', 'RMPAc']
-            'OR': 'NWPPc',
-            'CA': 'CAMXc', # ['CAMXc', 'NWPPc']
-            'VA': 'SRVCc', # ['SRVCc', 'RFCWc', 'RFCEc'],
-            'AR': 'SRMVc', # ['SRMVc', 'SPSOc']
-            'TX': 'ERCTc', # ['ERCTc', 'SRMVc', 'SPSOc', 'AZNMc']
-            'OH': 'RFCWc',
-            'UT': 'NWPPc',
-            'MT': 'NWPPc', # ['NWPPc', 'MROWc']
-            'TN': 'SRTVc',
-            'ID': 'NWPPc',
-            'WI': 'MROEc', # ['RFCWc', 'MROEc', 'MROWc']
-            'WV': 'RFCWc',
-            'NC': 'SRVCc',
-            'LA': 'SRMVc',
-            'IL': 'SRMWc', # ['RFCWc', 'SRMWc']
-            'OK': 'SPSOc',
-            'IA': 'MROWc',
-            'WA': 'NWPPc',
-            'SD': 'MROWc', # ['MROWc', 'RMPAc']
-            'MN': 'MROWc',
-            'KY': 'SRTVc', # ['SRTVc', 'RFCWc']
-            'MI': 'RFCMc', # ['RFCMc', 'MROEc']
-            'KS': 'SPNOc',
-            'NJ': 'RFCEc',
-            'NY': 'NYSTc',
-            'IN': 'RFCWc',
-            'VT': 'NEWEc',
-            'NM': 'AZNMc', # ['AZNMc', 'SPSOc']
-            'WY': 'RMPAc', # ['RMPAc', 'NWPPc']
-            'GA': 'SRSOc',
-            'MO': 'SRMWc', # ['SRMWc', 'SPNOc']
-            'DC': 'RFCEc',
-            'SC': 'SRVCc',
-            'PA': 'RFCEc', # ['RFCEc', 'RFCWc']
-            'CO': 'RMPAc',
-            'AZ': 'AZNMc',
-            'ME': 'NEWEc',
-            'AL': 'SRSOc',
-            'MD': 'RFCEc', # ['RFCEc', 'RFCWc']
-            'NH': 'NEWEc',
-            'MA': 'NEWEc',
-            'ND': 'MROWc',
-            'NV': 'NWPPc', # ['NWPPc', 'AZNMc']
-            'CT': 'NEWEc',
-            'DE': 'RFCEc',
-            'RI': 'NEWEc' }
+          { FL: 'FRCCc', # ['FRCCc', 'SRSOc']
+            MS: 'SRMVc', # ['SRMVc', 'SRTVc']
+            NE: 'MROWc', # ['MROWc', 'RMPAc']
+            OR: 'NWPPc',
+            CA: 'CAMXc', # ['CAMXc', 'NWPPc']
+            VA: 'SRVCc', # ['SRVCc', 'RFCWc', 'RFCEc'],
+            AR: 'SRMVc', # ['SRMVc', 'SPSOc']
+            TX: 'ERCTc', # ['ERCTc', 'SRMVc', 'SPSOc', 'AZNMc']
+            OH: 'RFCWc',
+            UT: 'NWPPc',
+            MT: 'NWPPc', # ['NWPPc', 'MROWc']
+            TN: 'SRTVc',
+            ID: 'NWPPc',
+            WI: 'MROEc', # ['RFCWc', 'MROEc', 'MROWc']
+            WV: 'RFCWc',
+            NC: 'SRVCc',
+            LA: 'SRMVc',
+            IL: 'SRMWc', # ['RFCWc', 'SRMWc']
+            OK: 'SPSOc',
+            IA: 'MROWc',
+            WA: 'NWPPc',
+            SD: 'MROWc', # ['MROWc', 'RMPAc']
+            MN: 'MROWc',
+            KY: 'SRTVc', # ['SRTVc', 'RFCWc']
+            MI: 'RFCMc', # ['RFCMc', 'MROEc']
+            KS: 'SPNOc',
+            NJ: 'RFCEc',
+            NY: 'NYSTc',
+            IN: 'RFCWc',
+            VT: 'NEWEc',
+            NM: 'AZNMc', # ['AZNMc', 'SPSOc']
+            WY: 'RMPAc', # ['RMPAc', 'NWPPc']
+            GA: 'SRSOc',
+            MO: 'SRMWc', # ['SRMWc', 'SPNOc']
+            DC: 'RFCEc',
+            SC: 'SRVCc',
+            PA: 'RFCEc', # ['RFCEc', 'RFCWc']
+            CO: 'RMPAc',
+            AZ: 'AZNMc',
+            ME: 'NEWEc',
+            AL: 'SRSOc',
+            MD: 'RFCEc', # ['RFCEc', 'RFCWc']
+            NH: 'NEWEc',
+            MA: 'NEWEc',
+            ND: 'MROWc',
+            NV: 'NWPPc', # ['NWPPc', 'AZNMc']
+            CT: 'NEWEc',
+            DE: 'RFCEc',
+            RI: 'NEWEc' }
 
         # get the state from weather file
         state = feature.weather_filename.split('_', -1)[1]
@@ -459,55 +459,55 @@ module URBANopt
         # Mapping is done using mapping tools from eGrid and AVERT (ZipCode for eGrid and fraction of state for AVERT).
         # Mapped based on the maps of each set of regions:
         hourly_historical_mapping_hash =
-          { 'FL': 'Florida',
-            'MS': 'Midwest',
-            'NE': 'Midwest',  # MRWO could be Midwest / Central
-            'OR': 'Northwest',
-            'CA': 'California',
-            'VA': 'Carolinas',
-            'AR': 'Midwest',
-            'TX': 'Texas',
-            'OH': 'Midwest',  # RFCW could be Midwest / Mid Atlantic
-            'UT': 'Northwest',
-            'MT': 'Northwest',
-            'TN': 'Tennessee',
-            'ID': 'Northwest',
-            'WI': 'Midwest',
-            'WV': 'Midwest', # RFCW could be Midwest / Mid Atlantic
-            'NC': 'Carolinas',
-            'LA': 'Midwest',
-            'IL': 'Midwest',
-            'OK': 'Central',
-            'IA': 'Midwest', # MRWO could be Midwest / Central
-            'WA': 'Northwest',
-            'SD': 'Midwest',  # MRWO could be Midwest / Central
-            'MN': 'Midwest',  # MRWO could be Midwest / Central
-            'KY': 'Tennessee',
-            'MI': 'Midwest',
-            'KS': 'Central',
-            'NJ': 'Mid-Atlantic',
-            'NY': 'New York',
-            'IN': 'Midwest', # RFCW could be Midwest / Mid Atlantic
-            'VT': 'New England',
-            'NM': 'Southwest',
-            'WY': 'Rocky Mountains',
-            'GA': 'SRSO',
-            'MO': 'Midwest',
-            'DC': 'Mid-Atlantic',
-            'SC': 'Carolinas',
-            'PA': 'Mid-Atlantic',
-            'CO': 'Rocky Mountains',
-            'AZ': 'Southwest',
-            'ME': 'New England',
-            'AL': 'Southeast',
-            'MD': 'Mid-Atlantic',
-            'NH': 'New England',
-            'MA': 'New England',
-            'ND': 'Midwest', # MRWO could be Midwest / Central
-            'NV': 'Northwest',
-            'CT': 'New England',
-            'DE': 'Mid-Atlantic',
-            'RI': 'New England' }
+          { FL: 'Florida',
+            MS: 'Midwest',
+            NE: 'Midwest',  # MRWO could be Midwest / Central
+            OR: 'Northwest',
+            CA: 'California',
+            VA: 'Carolinas',
+            AR: 'Midwest',
+            TX: 'Texas',
+            OH: 'Midwest',  # RFCW could be Midwest / Mid Atlantic
+            UT: 'Northwest',
+            MT: 'Northwest',
+            TN: 'Tennessee',
+            ID: 'Northwest',
+            WI: 'Midwest',
+            WV: 'Midwest', # RFCW could be Midwest / Mid Atlantic
+            NC: 'Carolinas',
+            LA: 'Midwest',
+            IL: 'Midwest',
+            OK: 'Central',
+            IA: 'Midwest', # MRWO could be Midwest / Central
+            WA: 'Northwest',
+            SD: 'Midwest',  # MRWO could be Midwest / Central
+            MN: 'Midwest',  # MRWO could be Midwest / Central
+            KY: 'Tennessee',
+            MI: 'Midwest',
+            KS: 'Central',
+            NJ: 'Mid-Atlantic',
+            NY: 'New York',
+            IN: 'Midwest', # RFCW could be Midwest / Mid Atlantic
+            VT: 'New England',
+            NM: 'Southwest',
+            WY: 'Rocky Mountains',
+            GA: 'SRSO',
+            MO: 'Midwest',
+            DC: 'Mid-Atlantic',
+            SC: 'Carolinas',
+            PA: 'Mid-Atlantic',
+            CO: 'Rocky Mountains',
+            AZ: 'Southwest',
+            ME: 'New England',
+            AL: 'Southeast',
+            MD: 'Mid-Atlantic',
+            NH: 'New England',
+            MA: 'New England',
+            ND: 'Midwest', # MRWO could be Midwest / Central
+            NV: 'Northwest',
+            CT: 'New England',
+            DE: 'Mid-Atlantic',
+            RI: 'New England' }
 
         # get the state from weather file
         state = feature.weather_filename.split('_', -1)[1]
@@ -524,55 +524,55 @@ module URBANopt
         # Options are: AKGD, AKMS, AZNM, CAMX, ERCT, FRCC, HIMS, HIOA, MROE, MROW, NEWE, NWPP, NYCW, NYLI, NYUP, RFCE, RFCM, RFCW, RMPA, SPNO, SPSO, SRMV, SRMW, SRSO, SRTV, and SRVC
         # egrid subregions can map directly to zipcodes but not to states. Some state might include multiple egrid subregions. the default mapper prioritize the egrid subregion that is most common in the state (covers the biggest number of zipcodes)
         annual_historical_mapping_hash =
-          { 'FL': 'FRCC',
-            'MS': 'SRMV',
-            'NE': 'MROW',
-            'OR': 'NWPP',
-            'CA': 'CAMX',
-            'VA': 'SRVC',
-            'AR': 'SRMV',
-            'TX': 'ERCT',
-            'OH': 'RFCW',
-            'UT': 'NWPP',
-            'MT': 'NWPP',
-            'TN': 'SRTV',
-            'ID': 'NWPP',
-            'WI': 'MROE',
-            'WV': 'RFCW',
-            'NC': 'SRVC',
-            'LA': 'SRMV',
-            'IL': 'SRMW',
-            'OK': 'SPSO',
-            'IA': 'MROW',
-            'WA': 'NWPP',
-            'SD': 'MROW',
-            'MN': 'MROW',
-            'KY': 'SRTV',
-            'MI': 'RFCM',
-            'KS': 'SPNO',
-            'NJ': 'RFCE',
-            'NY': 'NYCW',
-            'IN': 'RFCW',
-            'VT': 'NEWE',
-            'NM': 'AZNM',
-            'WY': 'RMPA',
-            'GA': 'SRSO',
-            'MO': 'SRMW',
-            'DC': 'RFCE',
-            'SC': 'SRVC',
-            'PA': 'RFCE',
-            'CO': 'RMPA',
-            'AZ': 'AZNM',
-            'ME': 'NEWE',
-            'AL': 'SRSO',
-            'MD': 'RFCE',
-            'NH': 'NEWE',
-            'MA': 'NEWE',
-            'ND': 'MROW',
-            'NV': 'NWPP',
-            'CT': 'NEWE',
-            'DE': 'RFCE',
-            'RI': 'NEWE' }
+          { FL: 'FRCC',
+            MS: 'SRMV',
+            NE: 'MROW',
+            OR: 'NWPP',
+            CA: 'CAMX',
+            VA: 'SRVC',
+            AR: 'SRMV',
+            TX: 'ERCT',
+            OH: 'RFCW',
+            UT: 'NWPP',
+            MT: 'NWPP',
+            TN: 'SRTV',
+            ID: 'NWPP',
+            WI: 'MROE',
+            WV: 'RFCW',
+            NC: 'SRVC',
+            LA: 'SRMV',
+            IL: 'SRMW',
+            OK: 'SPSO',
+            IA: 'MROW',
+            WA: 'NWPP',
+            SD: 'MROW',
+            MN: 'MROW',
+            KY: 'SRTV',
+            MI: 'RFCM',
+            KS: 'SPNO',
+            NJ: 'RFCE',
+            NY: 'NYCW',
+            IN: 'RFCW',
+            VT: 'NEWE',
+            NM: 'AZNM',
+            WY: 'RMPA',
+            GA: 'SRSO',
+            MO: 'SRMW',
+            DC: 'RFCE',
+            SC: 'SRVC',
+            PA: 'RFCE',
+            CO: 'RMPA',
+            AZ: 'AZNM',
+            ME: 'NEWE',
+            AL: 'SRSO',
+            MD: 'RFCE',
+            NH: 'NEWE',
+            MA: 'NEWE',
+            ND: 'MROW',
+            NV: 'NWPP',
+            CT: 'NEWE',
+            DE: 'RFCE',
+            RI: 'NEWE' }
         # get the state from weather file
         state = feature.weather_filename.split('_', -1)[1]
 
@@ -880,7 +880,7 @@ module URBANopt
             if !template.nil? && 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 = captures.names.zip(captures.captures).to_h
               template_vals = template_vals.transform_keys(&:to_sym)
 
               epw = File.join(File.dirname(__FILE__), '../weather', feature.weather_filename)
@@ -994,18 +994,18 @@ module URBANopt
             default_args.each do |arg_name, arg_default|
               next if arg_default.nil?
 
-              if !args.key?(arg_name)
-                args[arg_name] = arg_default
-              else
+              if args.key?(arg_name)
                 if debug
-                  if !arg_default.nil?
+                  if arg_default.nil?
+                    puts "Setting #{arg_name} to '#{args[arg_name]}'."
+                  else
                     if args[arg_name] != arg_default
                       puts "Overriding #{arg_name} default '#{arg_default}' with '#{args[arg_name]}'."
                     end
-                  else
-                    puts "Setting #{arg_name} to '#{args[arg_name]}'."
                   end
                 end
+              else
+                args[arg_name] = arg_default
               end
             end
 

data/example_files/mappers/ClassProject.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -46,7 +46,7 @@ module URBANopt
 
         feature = features[0]
         building_type = feature.building_type
-    
+
         # Energy Efficiency Measures
 
         OpenStudio::Extension.set_measure_argument(osw, 'AddOverhangsByProjectionFactor', '__SKIP__', true)
@@ -96,8 +96,8 @@ module URBANopt
         OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'flex1', 'Float')
         OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'flex_hrs1', '08:01-20:00')
 
-        OpenStudio::Extension.set_measure_argument(osw,'add_packaged_ice_storage', '__SKIP__', true)
-        OpenStudio::Extension.set_measure_argument(osw,'add_packaged_ice_storage', 'ice_cap', 'AutoSize')
+        OpenStudio::Extension.set_measure_argument(osw, 'add_packaged_ice_storage', '__SKIP__', true)
+        OpenStudio::Extension.set_measure_argument(osw, 'add_packaged_ice_storage', 'ice_cap', 'AutoSize')
 
         OpenStudio::Extension.set_measure_argument(osw, 'ShiftScheduleByType', '__SKIP__', true)
         OpenStudio::Extension.set_measure_argument(osw, 'ShiftScheduleByType', 'shift_value', -2)

data/example_files/mappers/CreateBar.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/EvCharging.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/FlexibleHotWater.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/Floorspace.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/HighEfficiency.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/HighEfficiencyCreateBar.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/HighEfficiencyFloorspace.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/PeakHoursMelsShedding.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/PeakHoursThermostatAdjust.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/mappers/ThermalStorage.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/example_files/measures/BuildResidentialModel/measure.rb

@@ -162,7 +162,9 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
 
       measures = {}
       hpxml_path = File.expand_path("../#{unit['name']}.xml")
-      if !unit.key?('hpxml_path')
+      if unit.key?('hpxml_path')
+        FileUtils.cp(File.expand_path(unit['hpxml_path']), hpxml_path)
+      else
 
         # BuildResidentialHPXML
         measure_subdir = 'BuildResidentialHPXML'
@@ -196,8 +198,6 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
         measure_args.delete('geometry_num_floors_above_grade')
 
         measures[measure_subdir] << measure_args
-      else
-        FileUtils.cp(File.expand_path(unit['hpxml_path']), hpxml_path)
       end
 
       # BuildResidentialScheduleFile

data/example_files/measures/BuildResidentialModel/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>build_residential_model</name>
   <uid>259dc35f-65e8-47d4-913f-69efede5a267</uid>
-  <version_id>8bb0bd12-8c25-4c05-9477-e045ca9cde27</version_id>
-  <version_modified>20221205T204142Z</version_modified>
+  <version_id>b3c7ec2e-10f5-45d9-9a10-7527fec4565a</version_id>
+  <version_modified>20230105T165234Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialModel</class_name>
   <display_name>Build Residential Model</display_name>
@@ -6597,7 +6597,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>079A37C9</checksum>
+      <checksum>A1FFBF5C</checksum>
     </file>
   </files>
 </measure>