urbanopt-cli 0.5.2 → 0.6.3

data/example_files/mappers/Baseline.rb

@@ -1,21 +1,31 @@
-#*********************************************************************************
-# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# *********************************************************************************
+# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
-#
+
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
-#
+
 # Redistributions of source code must retain the above copyright notice, this list
 # of conditions and the following disclaimer.
-#
+
 # Redistributions in binary form must reproduce the above copyright notice, this
 # list of conditions and the following disclaimer in the documentation and/or other
 # materials provided with the distribution.
-#
+
 # Neither the name of the copyright holder nor the names of its contributors may be
 # used to endorse or promote products derived from this software without specific
 # prior written permission.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -26,13 +36,14 @@
 # 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'
 require 'openstudio/model_articulation'
 require 'openstudio/ee_measures'
 require 'openstudio/calibration'
+require 'openstudio/load_flexibility_measures'
 
 require 'json'
 require 'rexml/document'
@@ -147,7 +158,7 @@ module URBANopt
           when "Inpatient health care"
             return "Hospital"
           when "Laboratory"
-            return "Hospital"
+            return "Laboratory"
           when "Lodging"
             if number_of_stories
               if number_of_stories.to_i > 3
@@ -278,7 +289,10 @@ module URBANopt
           'Service',
           'Uncovered Parking',
           'Covered Parking',
-          'Mixed use'
+          'Mixed use',
+          'Multifamily (2 to 4 units)',
+          'Multifamily (5 or more units)',
+          'Single-Family'
         ]
       end
 
@@ -388,9 +402,6 @@ module URBANopt
         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
-
         # take the centroid of the vertices as the location of the building
         feature_vertices_coordinates = feature.feature_json[:geometry][:coordinates][0]
         feature_location = feature.find_feature_center(feature_vertices_coordinates).to_s
@@ -411,6 +422,11 @@ module URBANopt
 
           building_type = feature.building_type
 
+          if building_type.nil?
+            # need building type
+            raise "Building type is not set"
+          end
+
           if residential_building_types.include? building_type
             debug = false
 
@@ -443,48 +459,48 @@ module URBANopt
             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_building_num_units] = feature.number_of_residential_units
-              args[:geometry_unit_type] = "single-family attached"
+              args[:geometry_unit_type] = 'single-family attached'
             when 'Multifamily'
               args[:geometry_building_num_units] = feature.number_of_residential_units
-              args[:geometry_unit_type] = "apartment unit"
+              args[:geometry_unit_type] = 'apartment unit'
               args[:geometry_corridor_position] = 'Double Exterior' # if we had an interior corridor, we'd have to subtract its area from the footprint area
             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] = "VentedAttic"
-            args[:geometry_roof_type] = "flat"
+            args[:geometry_attic_type] = 'VentedAttic'
+            args[:geometry_roof_type] = 'flat'
             begin
               case feature.attic_type
               when 'attic - vented'
-                args[:geometry_roof_type] = "gable"
+                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
             end
@@ -520,52 +536,58 @@ module URBANopt
 
             # SCHEDULES
 
+            feature_ids = []
+            scenario.feature_file.features.each do |feature|
+              feature_ids << feature.id
+            end
+
             args[:schedules_type] = 'stochastic'
-            args[:feature_id] = feature_id.hex
+            args[:feature_id] = feature_ids.index(feature_id)
+            args[:schedules_variation] = 'building' # building or unit
 
             # HVAC
 
-            system_type = "Residential - furnace and central air conditioner"
+            system_type = 'Residential - furnace and central air conditioner'
             begin
               system_type = feature.system_type
             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
             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
@@ -618,21 +640,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)
@@ -690,7 +712,7 @@ module URBANopt
 
             args.keys.each do |arg_name|
               unless default_args.keys.include? arg_name
-                next if arg_name == 'feature_id'
+                next if [:feature_id, :schedules_variation].include?(arg_name)
 
                 puts "Argument '#{arg_name}' is unknown."
               end
@@ -722,10 +744,13 @@ module URBANopt
 
             OpenStudio::Extension.set_measure_argument(osw, 'set_run_period', '__SKIP__', false)
             # set_run_period
+
             begin
               timesteps_per_hour = feature.timesteps_per_hour
               if timesteps_per_hour
                 OpenStudio::Extension.set_measure_argument(osw, 'set_run_period', 'timesteps_per_hour', timesteps_per_hour)
+              else
+                puts "No timesteps_per_hours set in the feature file...using default"
               end
             rescue StandardError
             end
@@ -737,6 +762,8 @@ module URBANopt
                   begin_date = begin_date[0, 10]
                 end
                 OpenStudio::Extension.set_measure_argument(osw, 'set_run_period', 'begin_date', begin_date)
+              else
+                puts "no simulation begin_date set in the feature file...using default"
               end
             rescue StandardError
             end
@@ -748,6 +775,8 @@ module URBANopt
                   end_date = end_date[0, 10]
                 end
                 OpenStudio::Extension.set_measure_argument(osw, 'set_run_period', 'end_date', end_date)
+              else
+                puts "no simulation end_date set in the feature file...using default"
               end
             rescue StandardError
             end
@@ -779,6 +808,9 @@ module URBANopt
                 number_of_stories_below_ground = 0
               end
               template = building_hash.key?(:template) ? building_hash[:template] : nil
+              if template.nil?
+                raise "Template is not defined in the feature file"
+              end
               footprint_area = building_hash[:footprint_area]
 
               mapped_building_type_1 = lookup_building_type(building_type_1, template, footprint_area, number_of_stories)
@@ -901,12 +933,17 @@ module URBANopt
                 end
               end
 
+              # geojson schema doesn't have modify_wkdy_op_hrs and modify_wknd_op_hrs checking for both start and duration to set to true in osw
+              weekday_flag = 0 # set modify arg to true of this gets to 2
+              weekend_flag = 0 # set modify arg to true of this gets to 2
+
               # set weekday start time
               begin
                 weekday_start_time = feature.weekday_start_time
                 if !feature.weekday_start_time.empty?
                   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')
+                  weekday_flag += 1
                 end
               rescue
               end
@@ -917,6 +954,15 @@ module URBANopt
                 if !feature.weekday_duration.empty?
                   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')
+                  weekday_flag += 1
+                end
+              rescue
+              end
+
+              # set weekday modify 
+              begin
+                if weekday_flag == 2
+                  OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'modify_wkdy_op_hrs', true, 'create_typical_building_from_model 1')
                 end
               rescue
               end
@@ -927,6 +973,7 @@ module URBANopt
                 if !feature.weekend_start_time.empty?
                   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')
+                  weekend_flag += 1
                 end
               rescue
               end
@@ -937,10 +984,19 @@ module URBANopt
                 if !feature.weekend_duration.empty?
                   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')
+                  weekend_flag += 1
                 end
               rescue
               end
 
+              # set weekday modify 
+              begin
+                if weekend_flag == 2
+                  OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'modify_wknd_op_hrs', true, 'create_typical_building_from_model 1')
+                end
+              rescue
+              end
+              
               # template
               begin
                 new_template = nil

data/example_files/mappers/CreateBar.rb

@@ -38,7 +38,7 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # *********************************************************************************
 
-require 'urbanopt/scenario'
+require 'urbanopt/reporting'
 require 'openstudio/common_measures'
 require 'openstudio/model_articulation'
 require 'openstudio/ee_measures'
@@ -258,7 +258,12 @@ module URBANopt
         feature = features[0]
         feature_id = feature.id
         feature_type = feature.type
+        # take the centroid of the vertices as the location of the building
+        feature_vertices_coordinates = feature.feature_json[:geometry][:coordinates][0]
+        feature_location = feature.find_feature_center(feature_vertices_coordinates).to_s
+        
         feature_name = feature.name
+        
         if feature_names.size == 1
           feature_name = feature_names[0]
         end
@@ -453,12 +458,17 @@ module URBANopt
               end
             end
 
+            # geojson schema doesn't have modify_wkdy_op_hrs and modify_wknd_op_hrs checking for both start and duration to set to true in osw
+            weekday_flag = 0 # set modify arg to true of this gets to 2
+            weekend_flag = 0 # set modify arg to true of this gets to 2
+
             # set weekday start time
             begin
               weekday_start_time = feature.weekday_start_time
               if !feature.weekday_start_time.empty?
                 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')
+                weekday_flag += 1
               end
             rescue StandardError
             end
@@ -469,6 +479,15 @@ module URBANopt
               if !feature.weekday_duration.empty?
                 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')
+                weekday_flag += 1
+              end
+            rescue StandardError
+            end
+
+            # set weekday modify 
+            begin
+              if weekday_flag == 2
+                OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'modify_wknd_op_hrs', true, 'create_typical_building_from_model')
               end
             rescue StandardError
             end
@@ -479,6 +498,7 @@ module URBANopt
               if !feature.weekend_start_time.empty?
                 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')
+                weekend_flag += 1
               end
             rescue StandardError
             end
@@ -489,6 +509,15 @@ module URBANopt
               if !feature.weekend_duration.empty?
                 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')
+                weekend_flag += 1
+              end
+            rescue StandardError
+            end
+
+            # set weekday modify 
+            begin
+              if weekend_flag == 2
+                OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'modify_wkdy_op_hrs', true, 'create_typical_building_from_model')
               end
             rescue StandardError
             end
@@ -552,6 +581,7 @@ module URBANopt
           OpenStudio::Extension.set_measure_argument(osw, 'default_feature_reports', 'feature_id', feature_id)
           OpenStudio::Extension.set_measure_argument(osw, 'default_feature_reports', 'feature_name', feature_name)
           OpenStudio::Extension.set_measure_argument(osw, 'default_feature_reports', 'feature_type', feature_type)
+          OpenStudio::Extension.set_measure_argument(osw, 'default_feature_reports', 'feature_location', feature_location)
         end
 
         return osw

data/example_files/mappers/FlexibleHotWater.rb

@@ -0,0 +1,69 @@
+#*********************************************************************************
+# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# contributors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this list
+# of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice, this
+# list of conditions and the following disclaimer in the documentation and/or other
+# materials provided with the distribution.
+#
+# Neither the name of the copyright holder nor the names of its contributors may be
+# used to endorse or promote products derived from this software without specific
+# prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# 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_relative 'Baseline'
+
+require 'json'
+
+module URBANopt
+  module Scenario
+    class FlexibleHotWaterMapper < BaselineMapper
+
+      def create_osw(scenario, features, feature_names)
+
+        osw = super(scenario, features, feature_names)
+
+        feature = features[0]
+        building_type = feature.building_type
+
+        # Only apply to commercial buildings, not residential models
+        if commercial_building_types.include? building_type
+          OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', '__SKIP__', false)
+          # Add a sizing multiplier to the tank capacity to cover flex periods
+          OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'vol', 2)
+          # Update maximum tank and minimum temperature setpoints
+          OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'max_temp', 185)
+          OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'min_temp', 125)
+
+          # Manage water heat charge float periods by building
+          OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'flex0', 'Charge - Heat Pump')
+          OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'flex_hrs0', '16:00-17:00')
+          OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'flex1', 'Float')
+          OpenStudio::Extension.set_measure_argument(osw, 'add_hpwh', 'flex_hrs1', '17:01-19:00')
+        end
+
+        return osw
+      end
+
+    end
+  end
+end

data/example_files/mappers/Floorspace.rb

@@ -38,7 +38,7 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 # *********************************************************************************
 
-require 'urbanopt/scenario'
+require 'urbanopt/reporting'
 require 'openstudio/common_measures'
 require 'openstudio/model_articulation'
 require 'openstudio/ee_measures'
@@ -258,6 +258,11 @@ module URBANopt
         feature = features[0]
         feature_id = feature.id
         feature_type = feature.type
+
+        # take the centroid of the vertices as the location of the building
+        feature_vertices_coordinates = feature.feature_json[:geometry][:coordinates][0]
+        feature_location = feature.find_feature_center(feature_vertices_coordinates).to_s
+
         feature_name = feature.name
         if feature_names.size == 1
           feature_name = feature_names[0]
@@ -539,12 +544,17 @@ module URBANopt
               end
             end
 
+            # geojson schema doesn't have modify_wkdy_op_hrs and modify_wknd_op_hrs checking for both start and duration to set to true in osw
+            weekday_flag = 0 # set modify arg to true of this gets to 2
+            weekend_flag = 0 # set modify arg to true of this gets to 2
+
             # set weekday start time
             begin
               weekday_start_time = feature.weekday_start_time
               if !feature.weekday_start_time.empty?
                 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')
+                weekday_flag += 1
               end
             rescue StandardError
             end
@@ -555,6 +565,15 @@ module URBANopt
               if !feature.weekday_duration.empty?
                 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')
+                weekday_flag += 1
+              end
+            rescue StandardError
+            end
+
+            # set weekday modify 
+            begin
+              if weekday_flag == 2
+                OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'modify_wkdy_op_hrs', true, 'create_typical_building_from_model 1')
               end
             rescue StandardError
             end
@@ -565,6 +584,7 @@ module URBANopt
               if !feature.weekend_start_time.empty?
                 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')
+                weekend_flag += 1
               end
             rescue StandardError
             end
@@ -575,6 +595,15 @@ module URBANopt
               if !feature.weekend_duration.empty?
                 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')
+                weekend_flag += 1
+              end
+            rescue StandardError
+            end
+
+            # set weekday modify 
+            begin
+              if weekend_flag == 2
+                OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', 'modify_wknd_op_hrs', true, 'create_typical_building_from_model 1')
               end
             rescue StandardError
             end
@@ -656,6 +685,7 @@ module URBANopt
           OpenStudio::Extension.set_measure_argument(osw, 'default_feature_reports', 'feature_id', feature_id)
           OpenStudio::Extension.set_measure_argument(osw, 'default_feature_reports', 'feature_name', feature_name)
           OpenStudio::Extension.set_measure_argument(osw, 'default_feature_reports', 'feature_type', feature_type)
+          OpenStudio::Extension.set_measure_argument(osw, 'default_feature_reports', 'feature_location', feature_location)
         end
 
         return osw

data/example_files/mappers/HighEfficiency.rb

@@ -1,21 +1,31 @@
-#*********************************************************************************
-# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# *********************************************************************************
+# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
-#
+
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
-#
+
 # Redistributions of source code must retain the above copyright notice, this list
 # of conditions and the following disclaimer.
-#
+
 # Redistributions in binary form must reproduce the above copyright notice, this
 # list of conditions and the following disclaimer in the documentation and/or other
 # materials provided with the distribution.
-#
+
 # Neither the name of the copyright holder nor the names of its contributors may be
 # used to endorse or promote products derived from this software without specific
 # prior written permission.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -26,11 +36,13 @@
 # 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'
 require 'openstudio/model_articulation'
+require 'openstudio/ee_measures'
+require 'openstudio/calibration'
 
 require_relative 'Baseline'