urbanopt-cli 0.4.0 → 0.4.1

data/example_files/mappers/HighEfficiency.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'
@@ -39,20 +39,53 @@ require 'json'
 module URBANopt
   module Scenario
     class HighEfficiencyMapper < BaselineMapper
+
       def create_osw(scenario, features, feature_names)
+
         osw = super(scenario, features, feature_names)
 
-        OpenStudio::Extension.set_measure_argument(osw, 'IncreaseInsulationRValueForExteriorWalls', '__SKIP__', false)
-        OpenStudio::Extension.set_measure_argument(osw, 'IncreaseInsulationRValueForExteriorWalls', 'r_value', 20)
+        feature = features[0]
+        building_type = feature.building_type
+
+        if residential_building_types.include? building_type
+          args = {}
+          osw[:steps].each do |step|
+            next if step[:measure_dir_name] != 'BuildResidentialModel'
+
+            step[:arguments].each do |arg_name, arg_val|
+              args[arg_name] = arg_val
+            end
+          end
 
-        OpenStudio::Extension.set_measure_argument(osw, 'ReduceElectricEquipmentLoadsByPercentage', '__SKIP__', false)
-        OpenStudio::Extension.set_measure_argument(osw, 'ReduceElectricEquipmentLoadsByPercentage', 'elecequip_power_reduction_percent', 20)
+          args[:wall_assembly_r] = Float(args[:wall_assembly_r]) * 1.2 # 20% increase
+          args[:plug_loads_television_usage_multiplier] = Float(args[:plug_loads_television_usage_multiplier]) * 0.9 # 10% reduction
+          args[:plug_loads_other_usage_multiplier] = Float(args[:plug_loads_other_usage_multiplier]) * 0.9 # 10% reduction
+          args[:lighting_usage_multiplier_interior] = Float(args[:lighting_usage_multiplier_interior]) * 0.9 # 10% reduction
+          args[:lighting_usage_multiplier_exterior] = Float(args[:lighting_usage_multiplier_exterior]) * 0.9 # 10% reduction
+          args[:clothes_washer_usage_multiplier] = Float(args[:clothes_washer_usage_multiplier]) * 0.9 # 10% reduction
+          args[:clothes_dryer_usage_multiplier] = Float(args[:clothes_dryer_usage_multiplier]) * 0.9 # 10% reduction
+          args[:dishwasher_usage_multiplier] = Float(args[:dishwasher_usage_multiplier]) * 0.9 # 10% reduction
+          args[:refrigerator_usage_multiplier] = Float(args[:refrigerator_usage_multiplier]) * 0.9 # 10% reduction
+          args[:cooking_range_oven_usage_multiplier] = Float(args[:cooking_range_oven_usage_multiplier]) * 0.9 # 10% reduction
+          args[:water_fixtures_usage_multiplier] = Float(args[:water_fixtures_usage_multiplier]) * 0.9 # 10% reduction
 
-        OpenStudio::Extension.set_measure_argument(osw, 'ReduceLightingLoadsByPercentage', '__SKIP__', false)
-        OpenStudio::Extension.set_measure_argument(osw, 'ReduceLightingLoadsByPercentage', 'lighting_power_reduction_percent', 10)
+          args.each do |arg_name, arg_val|
+            OpenStudio::Extension.set_measure_argument(osw, 'BuildResidentialModel', arg_name, arg_val)
+          end
+        elsif commercial_building_types.include? building_type
+          OpenStudio::Extension.set_measure_argument(osw, 'IncreaseInsulationRValueForExteriorWalls', '__SKIP__', false)
+          OpenStudio::Extension.set_measure_argument(osw, 'IncreaseInsulationRValueForExteriorWalls', 'r_value', 20)
+
+          OpenStudio::Extension.set_measure_argument(osw, 'ReduceElectricEquipmentLoadsByPercentage', '__SKIP__', false)
+          OpenStudio::Extension.set_measure_argument(osw, 'ReduceElectricEquipmentLoadsByPercentage', 'elecequip_power_reduction_percent', 20)
+
+          OpenStudio::Extension.set_measure_argument(osw, 'ReduceLightingLoadsByPercentage', '__SKIP__', false)
+          OpenStudio::Extension.set_measure_argument(osw, 'ReduceLightingLoadsByPercentage', 'lighting_power_reduction_percent', 10)
+        end
 
         return osw
       end
+
     end
   end
 end

data/example_files/measures/BuildResidentialModel/measure.rb

@@ -38,7 +38,7 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
 
     args = OpenStudio::Measure::OSArgumentVector.new
     measure.arguments(model).each do |arg|
-      next if ['hpxml_path', 'weather_dir'].include? arg.name
+      next if ['hpxml_path'].include? arg.name
       args << arg
     end
 
@@ -128,9 +128,16 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
       measures = {}
       measures[measure_subdir] = []
       measure_args[:hpxml_path] = File.expand_path('../out.xml')
-      measure_args[:weather_dir] = File.expand_path('../../../../weather')
-      measure_args[:software_program_used] = 'URBANopt'
-      measure_args[:software_program_version] = '0.3.1'
+      begin
+        measure_args[:software_program_used] = File.basename(File.absolute_path(File.join(File.dirname(__FILE__), '../../..')))
+      rescue
+      end
+      begin
+        version_rb File.absolute_path(File.join(File.dirname(__FILE__), '../../../lib/uo_cli/version.rb'))
+        require version_rb
+        measure_args[:software_program_version] = URBANopt::CLI::VERSION
+      rescue
+      end
       if unit.additionalProperties.getFeatureAsString('GeometryLevel').is_initialized
         measure_args[:geometry_level] = unit.additionalProperties.getFeatureAsString('GeometryLevel').get
       end
@@ -150,7 +157,6 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
 
       measures[measure_subdir] = []
       measure_args[:hpxml_path] = File.expand_path('../out.xml')
-      measure_args[:weather_dir] = File.expand_path('../../../../weather')
       measure_args[:output_dir] = File.expand_path('..')
       measure_args[:debug] = true
       measure_args = Hash[measure_args.collect{ |k, v| [k.to_s, v] }]
@@ -160,6 +166,20 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
         return false
       end
 
+      case args[:geometry_unit_type]
+      when 'single-family detached'
+        building_type = 'Single-Family Detached'
+      when 'single-family attached'
+        building_type = 'Single-Family Attached'
+      when 'multifamily'
+        building_type = 'Multifamily'
+      end
+
+      unit_model.getSpaceTypes.each do |space_type|
+        next unless space_type.standardsSpaceType.is_initialized
+        space_type.setStandardsBuildingType(building_type)
+      end
+
       unit_dir = File.expand_path("../unit #{num_unit+1}")
       Dir.mkdir(unit_dir)
       FileUtils.cp(File.expand_path('../out.xml'), unit_dir) # this is the raw hpxml file

data/example_files/resources/hpxml-measures/.gitignore

@@ -4,6 +4,7 @@
 /BuildResidentialHPXML/tests/test_measure.xml
 /BuildResidentialHPXML/tests/test_rakefile.xml
 /docs/_build
+/files
 /results
 /run
 /weather/USA_AK_Adak.NAS.704540_TMY3-cache.csv
@@ -2023,5 +2024,3 @@
 /workflow/sample_files/run
 /workflow/sample_files/invalid_files/results
 /workflow/sample_files/invalid_files/run
-.circleci
-.github

data/example_files/resources/hpxml-measures/BuildResidentialHPXML/measure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # see the URL below for information on how to write OpenStudio measures
 # http://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/
 
@@ -5,21 +7,23 @@ require 'openstudio'
 require 'oga'
 require 'csv'
 
-require_relative 'resources/geometry'
 require_relative 'resources/constants'
+require_relative 'resources/geometry'
 require_relative 'resources/location'
+require_relative 'resources/schedules'
 
 require_relative '../HPXMLtoOpenStudio/resources/constants'
 require_relative '../HPXMLtoOpenStudio/resources/constructions'
 require_relative '../HPXMLtoOpenStudio/resources/geometry'
 require_relative '../HPXMLtoOpenStudio/resources/hpxml'
+require_relative '../HPXMLtoOpenStudio/resources/hvac'
+require_relative '../HPXMLtoOpenStudio/resources/lighting'
 require_relative '../HPXMLtoOpenStudio/resources/materials'
 require_relative '../HPXMLtoOpenStudio/resources/psychrometrics'
 require_relative '../HPXMLtoOpenStudio/resources/schedules'
 require_relative '../HPXMLtoOpenStudio/resources/unit_conversions'
 require_relative '../HPXMLtoOpenStudio/resources/validator'
 require_relative '../HPXMLtoOpenStudio/resources/version'
-require_relative '../HPXMLtoOpenStudio/resources/weather'
 require_relative '../HPXMLtoOpenStudio/resources/xmlhelper'
 
 # start the measure
@@ -48,12 +52,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDescription('Absolute/relative path of the HPXML file.')
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument.makeStringArgument('weather_dir', true)
-    arg.setDisplayName('Weather Directory')
-    arg.setDescription('Absolute/relative path of the weather directory.')
-    arg.setDefaultValue('weather')
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument.makeStringArgument('software_program_used', false)
     arg.setDisplayName('Software Program Used')
     arg.setDescription('The name of the software program used.')
@@ -72,28 +70,34 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
 
     arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_run_period_begin_month', false)
     arg.setDisplayName('Simulation Control: Run Period Begin Month')
-    arg.setUnits('month')
+    arg.setUnits('#')
     arg.setDescription('This numeric field should contain the starting month number (1 = January, 2 = February, etc.) for the annual run period desired.')
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_run_period_begin_day_of_month', false)
     arg.setDisplayName('Simulation Control: Run Period Begin Day of Month')
-    arg.setUnits('day')
+    arg.setUnits('#')
     arg.setDescription('This numeric field should contain the starting day of the starting month (must be valid for month) for the annual run period desired.')
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_run_period_end_month', false)
     arg.setDisplayName('Simulation Control: Run Period End Month')
-    arg.setUnits('month')
+    arg.setUnits('#')
     arg.setDescription('This numeric field should contain the end month number (1 = January, 2 = February, etc.) for the annual run period desired.')
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_run_period_end_day_of_month', false)
     arg.setDisplayName('Simulation Control: Run Period End Day of Month')
-    arg.setUnits('day')
+    arg.setUnits('#')
     arg.setDescription('This numeric field should contain the ending day of the ending month (must be valid for month) for the annual run period desired.')
     args << arg
 
+    arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_run_period_calendar_year', false)
+    arg.setDisplayName('Simulation Control: Run Period Calendar Year')
+    arg.setUnits('year')
+    arg.setDescription('This numeric field should contain the calendar year that determines the start day of week. If you are running simulations using AMY weather files, the value entered for calendar year will not be used; it will be overridden by the actual year found in the AMY weather file.')
+    args << arg
+
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('simulation_control_daylight_saving_enabled', false)
     arg.setDisplayName('Simulation Control: Daylight Saving Enabled')
     arg.setDescription('Whether to use daylight saving.')
@@ -101,31 +105,71 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
 
     arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_daylight_saving_begin_month', false)
     arg.setDisplayName('Simulation Control: Daylight Saving Begin Month')
-    arg.setUnits('month')
+    arg.setUnits('#')
     arg.setDescription('This numeric field should contain the starting month number (1 = January, 2 = February, etc.) for the annual daylight saving period desired.')
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_daylight_saving_begin_day_of_month', false)
     arg.setDisplayName('Simulation Control: Daylight Saving Begin Day of Month')
-    arg.setUnits('day')
+    arg.setUnits('#')
     arg.setDescription('This numeric field should contain the starting day of the starting month (must be valid for month) for the daylight saving period desired.')
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_daylight_saving_end_month', false)
     arg.setDisplayName('Simulation Control: Daylight Saving End Month')
-    arg.setUnits('month')
+    arg.setUnits('#')
     arg.setDescription('This numeric field should contain the end month number (1 = January, 2 = February, etc.) for the daylight saving period desired.')
     args << arg
 
     arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('simulation_control_daylight_saving_end_day_of_month', false)
     arg.setDisplayName('Simulation Control: Daylight Saving End Day of Month')
-    arg.setUnits('day')
+    arg.setUnits('#')
     arg.setDescription('This numeric field should contain the ending day of the ending month (must be valid for month) for the daylight saving period desired.')
     args << arg
 
+    schedules_type_choices = OpenStudio::StringVector.new
+    schedules_type_choices << 'default'
+    schedules_type_choices << 'stochastic'
+    schedules_type_choices << 'user-specified'
+
+    arg = OpenStudio::Measure::OSArgument.makeChoiceArgument('schedules_type', schedules_type_choices, true)
+    arg.setDisplayName('Schedules: Type')
+    arg.setDescription("The type of occupant-related schedules to use. Schedules corresponding to 'default' are average (e.g., Building America). Schedules corresponding to 'stochastic' are generated using time-inhomogenous Markov chains derived from American Time Use Survey data, and supplemented with sampling duration and power level from NEEA RBSA data as well as DHW draw duration and flow rate from Aquacraft/AWWA data.")
+    arg.setDefaultValue('default')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument.makeStringArgument('schedules_path', false)
+    arg.setDisplayName('Schedules: Path')
+    arg.setDescription('Absolute (or relative) path of the csv file containing user-specified occupancy schedules.')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument.makeIntegerArgument('schedules_vacancy_begin_month', false)
+    arg.setDisplayName('Schedules: Vacancy Start Begin Month')
+    arg.setUnits('#')
+    arg.setDescription("This numeric field should contain the starting month number (1 = January, 2 = February, etc.) for the vacancy period desired. Only applies if the schedules type is 'stochastic'.")
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument.makeIntegerArgument('schedules_vacancy_begin_day_of_month', false)
+    arg.setDisplayName('Schedules: Vacancy Begin Day of Month')
+    arg.setUnits('#')
+    arg.setDescription("This numeric field should contain the starting day of the starting month (must be valid for month) for the vacancy period desired. Only applies if the schedules type is 'stochastic'.")
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument.makeIntegerArgument('schedules_vacancy_end_month', false)
+    arg.setDisplayName('Schedules: Vacancy Start End Month')
+    arg.setUnits('#')
+    arg.setDescription("This numeric field should contain the end month number (1 = January, 2 = February, etc.) for the vacancy period desired. Only applies if the schedules type is 'stochastic'.")
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument.makeIntegerArgument('schedules_vacancy_end_day_of_month', false)
+    arg.setDisplayName('Schedules: Vacancy End Day of Month')
+    arg.setUnits('#')
+    arg.setDescription("This numeric field should contain the ending day of the ending month (must be valid for month) for the vacancy period desired. Only applies if the schedules type is 'stochastic'.")
+    args << arg
+
     arg = OpenStudio::Measure::OSArgument.makeStringArgument('weather_station_epw_filepath', true)
     arg.setDisplayName('EnergyPlus Weather (EPW) Filepath')
-    arg.setDescription('Name of the EPW file.')
+    arg.setDescription('Path of the EPW file.')
     arg.setDefaultValue('USA_CO_Denver.Intl.AP.725650_TMY3.epw')
     args << arg
 
@@ -1411,6 +1455,114 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(30)
     args << arg
 
+    arg = OpenStudio::Measure::OSArgument::makeBoolArgument('mech_vent_is_shared_system', true)
+    arg.setDisplayName('Mechanical Ventilation: Is Shared System')
+    arg.setDescription('Whether the mechanical ventilation is a shared system. If true, assumed to serve all the units in the building.')
+    arg.setDefaultValue(false)
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('shared_mech_vent_in_unit_flow_rate', false)
+    arg.setDisplayName('Shared Mechanical Ventilation: In-Unit Flow Rate')
+    arg.setDescription('The flow rate delivered to the dwelling unit. This is required for a shared mechanical ventilation system.')
+    arg.setUnits('CFM')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('shared_mech_vent_frac_recirculation', false)
+    arg.setDisplayName('Shared Mechanical Ventilation: Fraction Recirculation')
+    arg.setDescription('Fraction of the total supply air that is recirculated, with the remainder assumed to be outdoor air. The value must be 0 for exhaust only systems. This is required for a shared mechanical ventilation system.')
+    arg.setUnits('Frac')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('shared_mech_vent_preheating_fuel', heating_system_fuel_choices, false)
+    arg.setDisplayName('Shared Mechanical Ventilation: Preheating Fuel')
+    arg.setDescription('Fuel type of the preconditioning heating equipment.')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('shared_mech_vent_preheating_efficiency', false)
+    arg.setDisplayName('Shared Mechanical Ventilation: Preheating Efficiency')
+    arg.setDescription('Efficiency of the preconditioning heating equipment.')
+    arg.setUnits('COP')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('shared_mech_vent_preheating_fraction_heat_load_served', false)
+    arg.setDisplayName('Shared Mechanical Ventilation: Preheating Fraction Ventilation Heat Load Served')
+    arg.setDescription('Fraction of heating load introduced by the shared ventilation system that is met by the preconditioning heating equipment.')
+    arg.setUnits('Frac')
+    args << arg
+
+    cooling_system_fuel_choices = OpenStudio::StringVector.new
+    cooling_system_fuel_choices << HPXML::FuelTypeElectricity
+
+    arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('shared_mech_vent_precooling_fuel', cooling_system_fuel_choices, false)
+    arg.setDisplayName('Shared Mechanical Ventilation: Precooling Fuel')
+    arg.setDescription('Fuel type of the preconditioning cooling equipment.')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('shared_mech_vent_precooling_efficiency', false)
+    arg.setDisplayName('Shared Mechanical Ventilation: Precooling Efficiency')
+    arg.setDescription('Efficiency of the preconditioning cooling equipment.')
+    arg.setUnits('COP')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('shared_mech_vent_precooling_fraction_cool_load_served', false)
+    arg.setDisplayName('Shared Mechanical Ventilation: Precooling Fraction Ventilation Cool Load Served')
+    arg.setDescription('Fraction of cooling load introduced by the shared ventilation system that is met by the preconditioning cooling equipment.')
+    arg.setUnits('Frac')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('mech_vent_fan_type_2', mech_vent_fan_type_choices, true)
+    arg.setDisplayName('Mechanical Ventilation 2: Fan Type')
+    arg.setDescription("The type of the second mechanical ventilation. Use 'none' if there is no second mechanical ventilation system.")
+    arg.setDefaultValue('none')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('mech_vent_flow_rate_2', true)
+    arg.setDisplayName('Mechanical Ventilation 2: Flow Rate')
+    arg.setDescription('The flow rate of the second mechanical ventilation.')
+    arg.setUnits('CFM')
+    arg.setDefaultValue(110)
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('mech_vent_hours_in_operation_2', true)
+    arg.setDisplayName('Mechanical Ventilation 2: Hours In Operation')
+    arg.setDescription('The hours in operation of the second mechanical ventilation.')
+    arg.setUnits('hrs')
+    arg.setDefaultValue(24)
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('mech_vent_total_recovery_efficiency_type_2', mech_vent_recovery_efficiency_type_choices, true)
+    arg.setDisplayName('Mechanical Ventilation 2: Total Recovery Efficiency Type')
+    arg.setDescription('The total recovery efficiency type of the second mechanical ventilation.')
+    arg.setDefaultValue('Unadjusted')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('mech_vent_total_recovery_efficiency_2', true)
+    arg.setDisplayName('Mechanical Ventilation 2: Total Recovery Efficiency')
+    arg.setDescription('The Unadjusted or Adjusted total recovery efficiency of the second mechanical ventilation.')
+    arg.setUnits('Frac')
+    arg.setDefaultValue(0.48)
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('mech_vent_sensible_recovery_efficiency_type_2', mech_vent_recovery_efficiency_type_choices, true)
+    arg.setDisplayName('Mechanical Ventilation 2: Sensible Recovery Efficiency Type')
+    arg.setDescription('The sensible recovery efficiency type of the second mechanical ventilation.')
+    arg.setDefaultValue('Unadjusted')
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('mech_vent_sensible_recovery_efficiency_2', true)
+    arg.setDisplayName('Mechanical Ventilation 2: Sensible Recovery Efficiency')
+    arg.setDescription('The Unadjusted or Adjusted sensible recovery efficiency of the second mechanical ventilation.')
+    arg.setUnits('Frac')
+    arg.setDefaultValue(0.72)
+    args << arg
+
+    arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('mech_vent_fan_power_2', true)
+    arg.setDisplayName('Mechanical Ventilation 2: Fan Power')
+    arg.setDescription('The fan power of the second mechanical ventilation.')
+    arg.setUnits('W')
+    arg.setDefaultValue(30)
+    args << arg
+
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('kitchen_fans_present', true)
     arg.setDisplayName('Kitchen Fans: Present')
     arg.setDescription('Whether there are kitchen fans.')
@@ -1969,24 +2121,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_weekday_fractions_interior', true)
-    arg.setDisplayName('Lighting: Weekday Schedule Interior')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_weekend_fractions_interior', true)
-    arg.setDisplayName('Lighting: Weekend Schedule Interior')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_monthly_multipliers_interior', true)
-    arg.setDisplayName('Lighting: Month Schedule Interior')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('lighting_fraction_cfl_exterior', true)
     arg.setDisplayName('Lighting: Fraction CFL Exterior')
     arg.setDescription('Fraction of all lamps (exterior) that are compact fluorescent. Lighting not specified as CFL, LFL, or LED is assumed to be incandescent.')
@@ -2011,24 +2145,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_weekday_fractions_exterior', true)
-    arg.setDisplayName('Lighting: Weekday Schedule Exterior')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_weekend_fractions_exterior', true)
-    arg.setDisplayName('Lighting: Weekend Schedule Exterior')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_monthly_multipliers_exterior', true)
-    arg.setDisplayName('Lighting: Month Schedule Exterior')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('lighting_fraction_cfl_garage', true)
     arg.setDisplayName('Lighting: Fraction CFL Garage')
     arg.setDescription('Fraction of all lamps (garage) that are compact fluorescent. Lighting not specified as CFL, LFL, or LED is assumed to be incandescent.')
@@ -2053,24 +2169,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_weekday_fractions_garage', true)
-    arg.setDisplayName('Lighting: Weekday Schedule Garage')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_weekend_fractions_garage', true)
-    arg.setDisplayName('Lighting: Weekend Schedule Garage')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('lighting_monthly_multipliers_garage', true)
-    arg.setDisplayName('Lighting: Month Schedule Garage')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('holiday_lighting_present', true)
     arg.setDisplayName('Holiday Lighting: Present')
     arg.setDescription('Whether there is holiday lighting.')
@@ -2112,18 +2210,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(Constants.Auto)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('holiday_lighting_weekday_fractions_exterior', true)
-    arg.setDisplayName('Holiday Lighting: Weekday Schedule Exterior')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('holiday_lighting_weekend_fractions_exterior', true)
-    arg.setDisplayName('Holiday Lighting: Weekend Schedule Exterior')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('dehumidifier_present', true)
     arg.setDisplayName('Dehumidifier: Present')
     arg.setDescription('Whether there is a dehumidifier.')
@@ -2331,6 +2417,13 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(Constants.Auto)
     args << arg
 
+    arg = OpenStudio::Measure::OSArgument::makeStringArgument('clothes_dryer_vented_flow_rate', true)
+    arg.setDisplayName('Clothes Dryer: Vented Flow Rate')
+    arg.setDescription('The exhaust flow rate of the vented clothes dryer.')
+    arg.setUnits('CFM')
+    arg.setDefaultValue(Constants.Auto)
+    args << arg
+
     arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('clothes_dryer_usage_multiplier', true)
     arg.setDisplayName('Clothes Dryer: Usage Multiplier')
     arg.setDescription('Multiplier on the clothes dryer energy usage that can reflect, e.g., high/low usage occupants.')
@@ -2438,24 +2531,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('refrigerator_weekday_fractions', true)
-    arg.setDisplayName('Refrigerator: Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('refrigerator_weekend_fractions', true)
-    arg.setDisplayName('Refrigerator: Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('refrigerator_monthly_multipliers', true)
-    arg.setDisplayName('Refrigerator: Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('extra_refrigerator_present', true)
     arg.setDisplayName('Extra Refrigerator: Present')
     arg.setDescription('Whether there is an extra refrigerator.')
@@ -2481,24 +2556,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('extra_refrigerator_weekday_fractions', true)
-    arg.setDisplayName('Extra Refrigerator: Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('extra_refrigerator_weekend_fractions', true)
-    arg.setDisplayName('Extra Refrigerator: Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('extra_refrigerator_monthly_multipliers', true)
-    arg.setDisplayName('Extra Refrigerator: Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('freezer_present', true)
     arg.setDisplayName('Freezer: Present')
     arg.setDescription('Whether there is a freezer.')
@@ -2524,24 +2581,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('freezer_weekday_fractions', true)
-    arg.setDisplayName('Freezer: Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('freezer_weekend_fractions', true)
-    arg.setDisplayName('Freezer: Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('freezer_monthly_multipliers', true)
-    arg.setDisplayName('Freezer: Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     cooking_range_oven_fuel_choices = OpenStudio::StringVector.new
     cooking_range_oven_fuel_choices << HPXML::FuelTypeElectricity
     cooking_range_oven_fuel_choices << HPXML::FuelTypeNaturalGas
@@ -2584,24 +2623,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('cooking_range_oven_weekday_fractions', true)
-    arg.setDisplayName('Cooking Range/Oven: Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('cooking_range_oven_weekend_fractions', true)
-    arg.setDisplayName('Cooking Range/Oven: Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('cooking_range_oven_monthly_multipliers', true)
-    arg.setDisplayName('Cooking Range/Oven: Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('ceiling_fan_present', true)
     arg.setDisplayName('Ceiling Fan: Present')
     arg.setDescription('Whether there is are any ceiling fans.')
@@ -2642,24 +2663,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_television_weekday_fractions', true)
-    arg.setDisplayName('Plug Loads: Television Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_television_weekend_fractions', true)
-    arg.setDisplayName('Plug Loads: Television Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_television_monthly_multipliers', true)
-    arg.setDisplayName('Plug Loads: Television Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_other_annual_kwh', true)
     arg.setDisplayName('Plug Loads: Other Annual kWh')
     arg.setDescription('The annual energy consumption of the other residual plug loads.')
@@ -2687,24 +2690,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_other_weekday_fractions', true)
-    arg.setDisplayName('Plug Loads: Other Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_other_weekend_fractions', true)
-    arg.setDisplayName('Plug Loads: Other Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_other_monthly_multipliers', true)
-    arg.setDisplayName('Plug Loads: Other Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('plug_loads_well_pump_present', true)
     arg.setDisplayName('Plug Loads: Well Pump Present')
     arg.setDescription('Whether there is a well pump.')
@@ -2724,24 +2709,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_well_pump_weekday_fractions', true)
-    arg.setDisplayName('Plug Loads: Well Pump Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_well_pump_weekend_fractions', true)
-    arg.setDisplayName('Plug Loads: Well Pump Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_well_pump_monthly_multipliers', true)
-    arg.setDisplayName('Plug Loads: Well Pump Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('plug_loads_vehicle_present', true)
     arg.setDisplayName('Plug Loads: Vehicle Present')
     arg.setDescription('Whether there is a vehicle.')
@@ -2761,24 +2728,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_vehicle_weekday_fractions', true)
-    arg.setDisplayName('Plug Loads: Vehicle Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_vehicle_weekend_fractions', true)
-    arg.setDisplayName('Plug Loads: Vehicle Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('plug_loads_vehicle_monthly_multipliers', true)
-    arg.setDisplayName('Plug Loads: Vehicle Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     fuel_loads_fuel_choices = OpenStudio::StringVector.new
     fuel_loads_fuel_choices << HPXML::FuelTypeNaturalGas
     fuel_loads_fuel_choices << HPXML::FuelTypeOil
@@ -2822,24 +2771,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_grill_weekday_fractions', true)
-    arg.setDisplayName('Fuel Loads: Grill Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_grill_weekend_fractions', true)
-    arg.setDisplayName('Fuel Loads: Grill Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_grill_monthly_multipliers', true)
-    arg.setDisplayName('Fuel Loads: Grill Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('fuel_loads_lighting_present', true)
     arg.setDisplayName('Fuel Loads: Lighting Present')
     arg.setDescription('Whether there is fuel loads lighting.')
@@ -2871,24 +2802,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_lighting_weekday_fractions', true)
-    arg.setDisplayName('Fuel Loads: Lighting Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_lighting_weekend_fractions', true)
-    arg.setDisplayName('Fuel Loads: Lighting Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_lighting_monthly_multipliers', true)
-    arg.setDisplayName('Fuel Loads: Lighting Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('fuel_loads_fireplace_present', true)
     arg.setDisplayName('Fuel Loads: Fireplace Present')
     arg.setDescription('Whether there is fuel loads fireplace.')
@@ -2920,24 +2833,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_fireplace_weekday_fractions', true)
-    arg.setDisplayName('Fuel Loads: Fireplace Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_fireplace_weekend_fractions', true)
-    arg.setDisplayName('Fuel Loads: Fireplace Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('fuel_loads_fireplace_monthly_multipliers', true)
-    arg.setDisplayName('Fuel Loads: Fireplace Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     heater_type_choices = OpenStudio::StringVector.new
     heater_type_choices << 'none'
     heater_type_choices << HPXML::HeaterTypeElectricResistance
@@ -2963,24 +2858,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('pool_pump_weekday_fractions', true)
-    arg.setDisplayName('Pool: Pump Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('pool_pump_weekend_fractions', true)
-    arg.setDisplayName('Pool: Pump Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('pool_pump_monthly_multipliers', true)
-    arg.setDisplayName('Pool: Pump Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('pool_heater_type', heater_type_choices, true)
     arg.setDisplayName('Pool: Heater Type')
     arg.setDescription("The type of pool heater. Use 'none' if there is no pool heater.")
@@ -3007,24 +2884,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('pool_heater_weekday_fractions', true)
-    arg.setDisplayName('Pool: Heater Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('pool_heater_weekend_fractions', true)
-    arg.setDisplayName('Pool: Heater Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('pool_heater_monthly_multipliers', true)
-    arg.setDisplayName('Pool: Heater Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeBoolArgument('hot_tub_present', true)
     arg.setDisplayName('Hot Tub: Present')
     arg.setDescription('Whether there is a hot tub.')
@@ -3044,24 +2903,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('hot_tub_pump_weekday_fractions', true)
-    arg.setDisplayName('Hot Tub: Pump Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('hot_tub_pump_weekend_fractions', true)
-    arg.setDisplayName('Hot Tub: Pump Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('hot_tub_pump_monthly_multipliers', true)
-    arg.setDisplayName('Hot Tub: Pump Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('hot_tub_heater_type', heater_type_choices, true)
     arg.setDisplayName('Hot Tub: Heater Type')
     arg.setDescription("The type of hot tub heater. Use 'none' if there is no hot tub heater.")
@@ -3088,24 +2929,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue(1.0)
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('hot_tub_heater_weekday_fractions', true)
-    arg.setDisplayName('Hot Tub: Heater Weekday Schedule')
-    arg.setDescription('Specify the 24-hour weekday schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('hot_tub_heater_weekend_fractions', true)
-    arg.setDisplayName('Hot Tub: Heater Weekend Schedule')
-    arg.setDescription('Specify the 24-hour weekend schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
-    arg = OpenStudio::Measure::OSArgument::makeStringArgument('hot_tub_heater_monthly_multipliers', true)
-    arg.setDisplayName('Hot Tub: Heater Month Schedule')
-    arg.setDescription('Specify the 12-month schedule.')
-    arg.setDefaultValue(Constants.Auto)
-    args << arg
-
     return args
   end
 
@@ -3123,7 +2946,6 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     # assign the user inputs to variables
     args = get_argument_values(runner, user_arguments)
     args[:hpxml_path] = runner.getStringArgumentValue('hpxml_path', user_arguments)
-    args[:weather_dir] = runner.getStringArgumentValue('weather_dir', user_arguments)
     args[:software_program_used] = runner.getOptionalStringArgumentValue('software_program_used', user_arguments)
     args[:software_program_version] = runner.getOptionalStringArgumentValue('software_program_version', user_arguments)
     args[:geometry_roof_pitch] = { '1:12' => 1.0 / 12.0, '2:12' => 2.0 / 12.0, '3:12' => 3.0 / 12.0, '4:12' => 4.0 / 12.0, '5:12' => 5.0 / 12.0, '6:12' => 6.0 / 12.0, '7:12' => 7.0 / 12.0, '8:12' => 8.0 / 12.0, '9:12' => 9.0 / 12.0, '10:12' => 10.0 / 12.0, '11:12' => 11.0 / 12.0, '12:12' => 12.0 / 12.0 }[args[:geometry_roof_pitch]]
@@ -3142,32 +2964,19 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
       return false
     end
 
-    # Get weather object
-    weather_dir = args[:weather_dir]
-    unless (Pathname.new weather_dir).absolute?
-      weather_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', weather_dir))
+    # Create EpwFile object
+    epw_path = args[:weather_station_epw_filepath]
+    if not File.exist? epw_path
+      epw_path = File.join(File.expand_path(File.join(File.dirname(__FILE__), '..', 'weather')), epw_path) # a filename was entered for weather_station_epw_filepath
     end
-    epw_path = File.join(weather_dir, args[:weather_station_epw_filepath])
-    if not File.exist?(epw_path)
+    if not File.exist? epw_path
       runner.registerError("Could not find EPW file at '#{epw_path}'.")
       return false
     end
-    cache_path = epw_path.gsub('.epw', '-cache.csv')
-    if not File.exist?(cache_path)
-      # Process weather file to create cache .csv
-      runner.registerWarning("'#{cache_path}' could not be found; regenerating it.")
-      epw_file = OpenStudio::EpwFile.new(epw_path)
-      OpenStudio::Model::WeatherFile.setWeatherFile(model, epw_file)
-      weather = WeatherProcess.new(model, runner)
-      File.open(cache_path, 'wb') do |file|
-        weather.dump_to_csv(file)
-      end
-    else
-      weather = WeatherProcess.new(nil, nil, cache_path)
-    end
+    epw_file = OpenStudio::EpwFile.new(epw_path)
 
     # Create HPXML file
-    hpxml_doc = HPXMLFile.create(runner, model, args, weather)
+    hpxml_doc = HPXMLFile.create(runner, model, args, epw_file)
     if not hpxml_doc
       runner.registerError('Unsuccessful creation of HPXML file.')
       return false
@@ -3196,11 +3005,18 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
              simulation_control_run_period_begin_day_of_month: runner.getOptionalIntegerArgumentValue('simulation_control_run_period_begin_day_of_month', user_arguments),
              simulation_control_run_period_end_month: runner.getOptionalIntegerArgumentValue('simulation_control_run_period_end_month', user_arguments),
              simulation_control_run_period_end_day_of_month: runner.getOptionalIntegerArgumentValue('simulation_control_run_period_end_day_of_month', user_arguments),
+             simulation_control_run_period_calendar_year: runner.getOptionalIntegerArgumentValue('simulation_control_run_period_calendar_year', user_arguments),
              simulation_control_daylight_saving_enabled: runner.getOptionalStringArgumentValue('simulation_control_daylight_saving_enabled', user_arguments),
              simulation_control_daylight_saving_begin_month: runner.getOptionalIntegerArgumentValue('simulation_control_daylight_saving_begin_month', user_arguments),
              simulation_control_daylight_saving_begin_day_of_month: runner.getOptionalIntegerArgumentValue('simulation_control_daylight_saving_begin_day_of_month', user_arguments),
              simulation_control_daylight_saving_end_month: runner.getOptionalIntegerArgumentValue('simulation_control_daylight_saving_end_month', user_arguments),
              simulation_control_daylight_saving_end_day_of_month: runner.getOptionalIntegerArgumentValue('simulation_control_daylight_saving_end_day_of_month', user_arguments),
+             schedules_type: runner.getStringArgumentValue('schedules_type', user_arguments),
+             schedules_path: runner.getOptionalStringArgumentValue('schedules_path', user_arguments),
+             schedules_vacancy_begin_month: runner.getOptionalIntegerArgumentValue('schedules_vacancy_begin_month', user_arguments),
+             schedules_vacancy_begin_day_of_month: runner.getOptionalIntegerArgumentValue('schedules_vacancy_begin_day_of_month', user_arguments),
+             schedules_vacancy_end_month: runner.getOptionalIntegerArgumentValue('schedules_vacancy_end_month', user_arguments),
+             schedules_vacancy_end_day_of_month: runner.getOptionalIntegerArgumentValue('schedules_vacancy_end_day_of_month', user_arguments),
              weather_station_epw_filepath: runner.getStringArgumentValue('weather_station_epw_filepath', user_arguments),
              site_type: runner.getOptionalStringArgumentValue('site_type', user_arguments),
              geometry_unit_type: runner.getStringArgumentValue('geometry_unit_type', user_arguments),
@@ -3369,6 +3185,23 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
              mech_vent_sensible_recovery_efficiency_type: runner.getStringArgumentValue('mech_vent_sensible_recovery_efficiency_type', user_arguments),
              mech_vent_sensible_recovery_efficiency: runner.getDoubleArgumentValue('mech_vent_sensible_recovery_efficiency', user_arguments),
              mech_vent_fan_power: runner.getDoubleArgumentValue('mech_vent_fan_power', user_arguments),
+             mech_vent_is_shared_system: runner.getBoolArgumentValue('mech_vent_is_shared_system', user_arguments),
+             shared_mech_vent_in_unit_flow_rate: runner.getOptionalDoubleArgumentValue('shared_mech_vent_in_unit_flow_rate', user_arguments),
+             shared_mech_vent_frac_recirculation: runner.getOptionalDoubleArgumentValue('shared_mech_vent_frac_recirculation', user_arguments),
+             shared_mech_vent_preheating_fuel: runner.getOptionalStringArgumentValue('shared_mech_vent_preheating_fuel', user_arguments),
+             shared_mech_vent_preheating_efficiency: runner.getOptionalDoubleArgumentValue('shared_mech_vent_preheating_efficiency', user_arguments),
+             shared_mech_vent_preheating_fraction_heat_load_served: runner.getOptionalDoubleArgumentValue('shared_mech_vent_preheating_fraction_heat_load_served', user_arguments),
+             shared_mech_vent_precooling_fuel: runner.getOptionalStringArgumentValue('shared_mech_vent_precooling_fuel', user_arguments),
+             shared_mech_vent_precooling_efficiency: runner.getOptionalDoubleArgumentValue('shared_mech_vent_precooling_efficiency', user_arguments),
+             shared_mech_vent_precooling_fraction_cool_load_served: runner.getOptionalDoubleArgumentValue('shared_mech_vent_precooling_fraction_cool_load_served', user_arguments),
+             mech_vent_fan_type_2: runner.getStringArgumentValue('mech_vent_fan_type_2', user_arguments),
+             mech_vent_flow_rate_2: runner.getDoubleArgumentValue('mech_vent_flow_rate_2', user_arguments),
+             mech_vent_hours_in_operation_2: runner.getDoubleArgumentValue('mech_vent_hours_in_operation_2', user_arguments),
+             mech_vent_total_recovery_efficiency_type_2: runner.getStringArgumentValue('mech_vent_total_recovery_efficiency_type_2', user_arguments),
+             mech_vent_total_recovery_efficiency_2: runner.getDoubleArgumentValue('mech_vent_total_recovery_efficiency_2', user_arguments),
+             mech_vent_sensible_recovery_efficiency_type_2: runner.getStringArgumentValue('mech_vent_sensible_recovery_efficiency_type_2', user_arguments),
+             mech_vent_sensible_recovery_efficiency_2: runner.getDoubleArgumentValue('mech_vent_sensible_recovery_efficiency_2', user_arguments),
+             mech_vent_fan_power_2: runner.getDoubleArgumentValue('mech_vent_fan_power_2', user_arguments),
              kitchen_fans_present: runner.getBoolArgumentValue('kitchen_fans_present', user_arguments),
              kitchen_fans_quantity: runner.getOptionalIntegerArgumentValue('kitchen_fans_quantity', user_arguments),
              kitchen_fans_flow_rate: runner.getOptionalDoubleArgumentValue('kitchen_fans_flow_rate', user_arguments),
@@ -3444,31 +3277,20 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
              lighting_fraction_lfl_interior: runner.getDoubleArgumentValue('lighting_fraction_lfl_interior', user_arguments),
              lighting_fraction_led_interior: runner.getDoubleArgumentValue('lighting_fraction_led_interior', user_arguments),
              lighting_usage_multiplier_interior: runner.getDoubleArgumentValue('lighting_usage_multiplier_interior', user_arguments),
-             lighting_weekday_fractions_interior: runner.getStringArgumentValue('lighting_weekday_fractions_interior', user_arguments),
-             lighting_weekend_fractions_interior: runner.getStringArgumentValue('lighting_weekend_fractions_interior', user_arguments),
-             lighting_monthly_multipliers_interior: runner.getStringArgumentValue('lighting_monthly_multipliers_interior', user_arguments),
              lighting_fraction_cfl_exterior: runner.getDoubleArgumentValue('lighting_fraction_cfl_exterior', user_arguments),
              lighting_fraction_lfl_exterior: runner.getDoubleArgumentValue('lighting_fraction_lfl_exterior', user_arguments),
              lighting_fraction_led_exterior: runner.getDoubleArgumentValue('lighting_fraction_led_exterior', user_arguments),
              lighting_usage_multiplier_exterior: runner.getDoubleArgumentValue('lighting_usage_multiplier_exterior', user_arguments),
-             lighting_weekday_fractions_exterior: runner.getStringArgumentValue('lighting_weekday_fractions_exterior', user_arguments),
-             lighting_weekend_fractions_exterior: runner.getStringArgumentValue('lighting_weekend_fractions_exterior', user_arguments),
-             lighting_monthly_multipliers_exterior: runner.getStringArgumentValue('lighting_monthly_multipliers_exterior', user_arguments),
              lighting_fraction_cfl_garage: runner.getDoubleArgumentValue('lighting_fraction_cfl_garage', user_arguments),
              lighting_fraction_lfl_garage: runner.getDoubleArgumentValue('lighting_fraction_lfl_garage', user_arguments),
              lighting_fraction_led_garage: runner.getDoubleArgumentValue('lighting_fraction_led_garage', user_arguments),
              lighting_usage_multiplier_garage: runner.getDoubleArgumentValue('lighting_usage_multiplier_garage', user_arguments),
-             lighting_weekday_fractions_garage: runner.getStringArgumentValue('lighting_weekday_fractions_garage', user_arguments),
-             lighting_weekend_fractions_garage: runner.getStringArgumentValue('lighting_weekend_fractions_garage', user_arguments),
-             lighting_monthly_multipliers_garage: runner.getStringArgumentValue('lighting_monthly_multipliers_garage', user_arguments),
              holiday_lighting_present: runner.getBoolArgumentValue('holiday_lighting_present', user_arguments),
              holiday_lighting_daily_kwh: runner.getStringArgumentValue('holiday_lighting_daily_kwh', user_arguments),
              holiday_lighting_period_begin_month: runner.getStringArgumentValue('holiday_lighting_period_begin_month', user_arguments),
              holiday_lighting_period_begin_day_of_month: runner.getStringArgumentValue('holiday_lighting_period_begin_day_of_month', user_arguments),
              holiday_lighting_period_end_month: runner.getStringArgumentValue('holiday_lighting_period_end_month', user_arguments),
              holiday_lighting_period_end_day_of_month: runner.getStringArgumentValue('holiday_lighting_period_end_day_of_month', user_arguments),
-             holiday_lighting_weekday_fractions_exterior: runner.getStringArgumentValue('holiday_lighting_weekday_fractions_exterior', user_arguments),
-             holiday_lighting_weekend_fractions_exterior: runner.getStringArgumentValue('holiday_lighting_weekend_fractions_exterior', user_arguments),
              dehumidifier_present: runner.getBoolArgumentValue('dehumidifier_present', user_arguments),
              dehumidifier_efficiency_type: runner.getStringArgumentValue('dehumidifier_efficiency_type', user_arguments),
              dehumidifier_efficiency_ef: runner.getDoubleArgumentValue('dehumidifier_efficiency_ef', user_arguments),
@@ -3495,6 +3317,7 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
              clothes_dryer_efficiency_ef: runner.getDoubleArgumentValue('clothes_dryer_efficiency_ef', user_arguments),
              clothes_dryer_efficiency_cef: runner.getStringArgumentValue('clothes_dryer_efficiency_cef', user_arguments),
              clothes_dryer_control_type: runner.getStringArgumentValue('clothes_dryer_control_type', user_arguments),
+             clothes_dryer_vented_flow_rate: runner.getStringArgumentValue('clothes_dryer_vented_flow_rate', user_arguments),
              clothes_dryer_usage_multiplier: runner.getDoubleArgumentValue('clothes_dryer_usage_multiplier', user_arguments),
              dishwasher_present: runner.getBoolArgumentValue('dishwasher_present', user_arguments),
              dishwasher_location: runner.getStringArgumentValue('dishwasher_location', user_arguments),
@@ -3511,110 +3334,65 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
              refrigerator_location: runner.getStringArgumentValue('refrigerator_location', user_arguments),
              refrigerator_rated_annual_kwh: runner.getStringArgumentValue('refrigerator_rated_annual_kwh', user_arguments),
              refrigerator_usage_multiplier: runner.getDoubleArgumentValue('refrigerator_usage_multiplier', user_arguments),
-             refrigerator_weekday_fractions: runner.getStringArgumentValue('refrigerator_weekday_fractions', user_arguments),
-             refrigerator_weekend_fractions: runner.getStringArgumentValue('refrigerator_weekend_fractions', user_arguments),
-             refrigerator_monthly_multipliers: runner.getStringArgumentValue('refrigerator_monthly_multipliers', user_arguments),
              extra_refrigerator_present: runner.getBoolArgumentValue('extra_refrigerator_present', user_arguments),
              extra_refrigerator_location: runner.getStringArgumentValue('extra_refrigerator_location', user_arguments),
              extra_refrigerator_rated_annual_kwh: runner.getStringArgumentValue('extra_refrigerator_rated_annual_kwh', user_arguments),
              extra_refrigerator_usage_multiplier: runner.getDoubleArgumentValue('extra_refrigerator_usage_multiplier', user_arguments),
-             extra_refrigerator_weekday_fractions: runner.getStringArgumentValue('extra_refrigerator_weekday_fractions', user_arguments),
-             extra_refrigerator_weekend_fractions: runner.getStringArgumentValue('extra_refrigerator_weekend_fractions', user_arguments),
-             extra_refrigerator_monthly_multipliers: runner.getStringArgumentValue('extra_refrigerator_monthly_multipliers', user_arguments),
              freezer_present: runner.getBoolArgumentValue('freezer_present', user_arguments),
              freezer_location: runner.getStringArgumentValue('freezer_location', user_arguments),
              freezer_rated_annual_kwh: runner.getStringArgumentValue('freezer_rated_annual_kwh', user_arguments),
              freezer_usage_multiplier: runner.getDoubleArgumentValue('freezer_usage_multiplier', user_arguments),
-             freezer_weekday_fractions: runner.getStringArgumentValue('freezer_weekday_fractions', user_arguments),
-             freezer_weekend_fractions: runner.getStringArgumentValue('freezer_weekend_fractions', user_arguments),
-             freezer_monthly_multipliers: runner.getStringArgumentValue('freezer_monthly_multipliers', user_arguments),
              cooking_range_oven_present: runner.getBoolArgumentValue('cooking_range_oven_present', user_arguments),
              cooking_range_oven_location: runner.getStringArgumentValue('cooking_range_oven_location', user_arguments),
              cooking_range_oven_fuel_type: runner.getStringArgumentValue('cooking_range_oven_fuel_type', user_arguments),
              cooking_range_oven_is_induction: runner.getOptionalStringArgumentValue('cooking_range_oven_is_induction', user_arguments),
              cooking_range_oven_is_convection: runner.getOptionalStringArgumentValue('cooking_range_oven_is_convection', user_arguments),
              cooking_range_oven_usage_multiplier: runner.getDoubleArgumentValue('cooking_range_oven_usage_multiplier', user_arguments),
-             cooking_range_oven_weekday_fractions: runner.getStringArgumentValue('cooking_range_oven_weekday_fractions', user_arguments),
-             cooking_range_oven_weekend_fractions: runner.getStringArgumentValue('cooking_range_oven_weekend_fractions', user_arguments),
-             cooking_range_oven_monthly_multipliers: runner.getStringArgumentValue('cooking_range_oven_monthly_multipliers', user_arguments),
              ceiling_fan_present: runner.getBoolArgumentValue('ceiling_fan_present', user_arguments),
              ceiling_fan_efficiency: runner.getStringArgumentValue('ceiling_fan_efficiency', user_arguments),
              ceiling_fan_quantity: runner.getStringArgumentValue('ceiling_fan_quantity', user_arguments),
              ceiling_fan_cooling_setpoint_temp_offset: runner.getDoubleArgumentValue('ceiling_fan_cooling_setpoint_temp_offset', user_arguments),
              plug_loads_television_annual_kwh: runner.getStringArgumentValue('plug_loads_television_annual_kwh', user_arguments),
              plug_loads_television_usage_multiplier: runner.getDoubleArgumentValue('plug_loads_television_usage_multiplier', user_arguments),
-             plug_loads_television_weekday_fractions: runner.getStringArgumentValue('plug_loads_television_weekday_fractions', user_arguments),
-             plug_loads_television_weekend_fractions: runner.getStringArgumentValue('plug_loads_television_weekend_fractions', user_arguments),
-             plug_loads_television_monthly_multipliers: runner.getStringArgumentValue('plug_loads_television_monthly_multipliers', user_arguments),
              plug_loads_other_annual_kwh: runner.getStringArgumentValue('plug_loads_other_annual_kwh', user_arguments),
              plug_loads_other_frac_sensible: runner.getStringArgumentValue('plug_loads_other_frac_sensible', user_arguments),
              plug_loads_other_frac_latent: runner.getStringArgumentValue('plug_loads_other_frac_latent', user_arguments),
              plug_loads_other_usage_multiplier: runner.getDoubleArgumentValue('plug_loads_other_usage_multiplier', user_arguments),
-             plug_loads_other_weekday_fractions: runner.getStringArgumentValue('plug_loads_other_weekday_fractions', user_arguments),
-             plug_loads_other_weekend_fractions: runner.getStringArgumentValue('plug_loads_other_weekend_fractions', user_arguments),
-             plug_loads_other_monthly_multipliers: runner.getStringArgumentValue('plug_loads_other_monthly_multipliers', user_arguments),
              plug_loads_well_pump_present: runner.getBoolArgumentValue('plug_loads_well_pump_present', user_arguments),
              plug_loads_well_pump_annual_kwh: runner.getStringArgumentValue('plug_loads_well_pump_annual_kwh', user_arguments),
              plug_loads_well_pump_usage_multiplier: runner.getDoubleArgumentValue('plug_loads_well_pump_usage_multiplier', user_arguments),
-             plug_loads_well_pump_weekday_fractions: runner.getStringArgumentValue('plug_loads_well_pump_weekday_fractions', user_arguments),
-             plug_loads_well_pump_weekend_fractions: runner.getStringArgumentValue('plug_loads_well_pump_weekend_fractions', user_arguments),
-             plug_loads_well_pump_monthly_multipliers: runner.getStringArgumentValue('plug_loads_well_pump_monthly_multipliers', user_arguments),
              plug_loads_vehicle_present: runner.getBoolArgumentValue('plug_loads_vehicle_present', user_arguments),
              plug_loads_vehicle_annual_kwh: runner.getStringArgumentValue('plug_loads_vehicle_annual_kwh', user_arguments),
              plug_loads_vehicle_usage_multiplier: runner.getDoubleArgumentValue('plug_loads_vehicle_usage_multiplier', user_arguments),
-             plug_loads_vehicle_weekday_fractions: runner.getStringArgumentValue('plug_loads_vehicle_weekday_fractions', user_arguments),
-             plug_loads_vehicle_weekend_fractions: runner.getStringArgumentValue('plug_loads_vehicle_weekend_fractions', user_arguments),
-             plug_loads_vehicle_monthly_multipliers: runner.getStringArgumentValue('plug_loads_vehicle_monthly_multipliers', user_arguments),
              fuel_loads_grill_present: runner.getBoolArgumentValue('fuel_loads_grill_present', user_arguments),
              fuel_loads_grill_fuel_type: runner.getStringArgumentValue('fuel_loads_grill_fuel_type', user_arguments),
              fuel_loads_grill_annual_therm: runner.getStringArgumentValue('fuel_loads_grill_annual_therm', user_arguments),
              fuel_loads_grill_location: runner.getStringArgumentValue('fuel_loads_grill_location', user_arguments),
              fuel_loads_grill_usage_multiplier: runner.getDoubleArgumentValue('fuel_loads_grill_usage_multiplier', user_arguments),
-             fuel_loads_grill_weekday_fractions: runner.getStringArgumentValue('fuel_loads_grill_weekday_fractions', user_arguments),
-             fuel_loads_grill_weekend_fractions: runner.getStringArgumentValue('fuel_loads_grill_weekend_fractions', user_arguments),
-             fuel_loads_grill_monthly_multipliers: runner.getStringArgumentValue('fuel_loads_grill_monthly_multipliers', user_arguments),
              fuel_loads_lighting_present: runner.getBoolArgumentValue('fuel_loads_lighting_present', user_arguments),
              fuel_loads_lighting_fuel_type: runner.getStringArgumentValue('fuel_loads_lighting_fuel_type', user_arguments),
              fuel_loads_lighting_annual_therm: runner.getStringArgumentValue('fuel_loads_lighting_annual_therm', user_arguments),
              fuel_loads_lighting_location: runner.getStringArgumentValue('fuel_loads_lighting_location', user_arguments),
              fuel_loads_lighting_usage_multiplier: runner.getDoubleArgumentValue('fuel_loads_lighting_usage_multiplier', user_arguments),
-             fuel_loads_lighting_weekday_fractions: runner.getStringArgumentValue('fuel_loads_lighting_weekday_fractions', user_arguments),
-             fuel_loads_lighting_weekend_fractions: runner.getStringArgumentValue('fuel_loads_lighting_weekend_fractions', user_arguments),
-             fuel_loads_lighting_monthly_multipliers: runner.getStringArgumentValue('fuel_loads_lighting_monthly_multipliers', user_arguments),
              fuel_loads_fireplace_present: runner.getBoolArgumentValue('fuel_loads_fireplace_present', user_arguments),
              fuel_loads_fireplace_fuel_type: runner.getStringArgumentValue('fuel_loads_fireplace_fuel_type', user_arguments),
              fuel_loads_fireplace_annual_therm: runner.getStringArgumentValue('fuel_loads_fireplace_annual_therm', user_arguments),
              fuel_loads_fireplace_location: runner.getStringArgumentValue('fuel_loads_fireplace_location', user_arguments),
              fuel_loads_fireplace_usage_multiplier: runner.getDoubleArgumentValue('fuel_loads_fireplace_usage_multiplier', user_arguments),
-             fuel_loads_fireplace_weekday_fractions: runner.getStringArgumentValue('fuel_loads_fireplace_weekday_fractions', user_arguments),
-             fuel_loads_fireplace_weekend_fractions: runner.getStringArgumentValue('fuel_loads_fireplace_weekend_fractions', user_arguments),
-             fuel_loads_fireplace_monthly_multipliers: runner.getStringArgumentValue('fuel_loads_fireplace_monthly_multipliers', user_arguments),
              pool_present: runner.getBoolArgumentValue('pool_present', user_arguments),
              pool_pump_annual_kwh: runner.getStringArgumentValue('pool_pump_annual_kwh', user_arguments),
              pool_pump_usage_multiplier: runner.getDoubleArgumentValue('pool_pump_usage_multiplier', user_arguments),
-             pool_pump_weekday_fractions: runner.getStringArgumentValue('pool_pump_weekday_fractions', user_arguments),
-             pool_pump_weekend_fractions: runner.getStringArgumentValue('pool_pump_weekend_fractions', user_arguments),
-             pool_pump_monthly_multipliers: runner.getStringArgumentValue('pool_pump_monthly_multipliers', user_arguments),
              pool_heater_type: runner.getStringArgumentValue('pool_heater_type', user_arguments),
              pool_heater_annual_kwh: runner.getStringArgumentValue('pool_heater_annual_kwh', user_arguments),
              pool_heater_annual_therm: runner.getStringArgumentValue('pool_heater_annual_therm', user_arguments),
              pool_heater_usage_multiplier: runner.getDoubleArgumentValue('pool_heater_usage_multiplier', user_arguments),
-             pool_heater_weekday_fractions: runner.getStringArgumentValue('pool_heater_weekday_fractions', user_arguments),
-             pool_heater_weekend_fractions: runner.getStringArgumentValue('pool_heater_weekend_fractions', user_arguments),
-             pool_heater_monthly_multipliers: runner.getStringArgumentValue('pool_heater_monthly_multipliers', user_arguments),
              hot_tub_present: runner.getBoolArgumentValue('hot_tub_present', user_arguments),
              hot_tub_pump_annual_kwh: runner.getStringArgumentValue('hot_tub_pump_annual_kwh', user_arguments),
              hot_tub_pump_usage_multiplier: runner.getDoubleArgumentValue('hot_tub_pump_usage_multiplier', user_arguments),
-             hot_tub_pump_weekday_fractions: runner.getStringArgumentValue('hot_tub_pump_weekday_fractions', user_arguments),
-             hot_tub_pump_weekend_fractions: runner.getStringArgumentValue('hot_tub_pump_weekend_fractions', user_arguments),
-             hot_tub_pump_monthly_multipliers: runner.getStringArgumentValue('hot_tub_pump_monthly_multipliers', user_arguments),
              hot_tub_heater_type: runner.getStringArgumentValue('hot_tub_heater_type', user_arguments),
              hot_tub_heater_annual_kwh: runner.getStringArgumentValue('hot_tub_heater_annual_kwh', user_arguments),
              hot_tub_heater_annual_therm: runner.getStringArgumentValue('hot_tub_heater_annual_therm', user_arguments),
-             hot_tub_heater_usage_multiplier: runner.getDoubleArgumentValue('hot_tub_heater_usage_multiplier', user_arguments),
-             hot_tub_heater_weekday_fractions: runner.getStringArgumentValue('hot_tub_heater_weekday_fractions', user_arguments),
-             hot_tub_heater_weekend_fractions: runner.getStringArgumentValue('hot_tub_heater_weekend_fractions', user_arguments),
-             hot_tub_heater_monthly_multipliers: runner.getStringArgumentValue('hot_tub_heater_monthly_multipliers', user_arguments) }
+             hot_tub_heater_usage_multiplier: runner.getDoubleArgumentValue('hot_tub_heater_usage_multiplier', user_arguments) }
   end
 
   def validate_arguments(args)
@@ -3740,12 +3518,15 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
 end
 
 class HPXMLFile
-  def self.create(runner, model, args, weather)
+  def self.create(runner, model, args, epw_file)
     model_geometry = OpenStudio::Model::Model.new
 
     success = create_geometry_envelope(runner, model_geometry, args)
     return false if not success
 
+    success = create_schedules(runner, model, epw_file, args)
+    return false if not success
+
     hpxml = HPXML.new
 
     set_header(hpxml, runner, args)
@@ -3753,7 +3534,7 @@ class HPXMLFile
     set_neighbor_buildings(hpxml, runner, args)
     set_building_occupancy(hpxml, runner, args)
     set_building_construction(hpxml, runner, args)
-    set_climate_and_risk_zones(hpxml, runner, args, weather)
+    set_climate_and_risk_zones(hpxml, runner, args, epw_file)
     set_air_infiltration_measurements(hpxml, runner, args)
     set_attics(hpxml, runner, model_geometry, args)
     set_foundations(hpxml, runner, model_geometry, args)
@@ -3775,8 +3556,8 @@ class HPXMLFile
     set_water_heating_systems(hpxml, runner, args)
     set_hot_water_distribution(hpxml, runner, args)
     set_water_fixtures(hpxml, runner, args)
-    set_solar_thermal(hpxml, runner, args, weather)
-    set_pv_systems(hpxml, runner, args, weather)
+    set_solar_thermal(hpxml, runner, args, epw_file)
+    set_pv_systems(hpxml, runner, args, epw_file)
     set_lighting(hpxml, runner, args)
     set_dehumidifier(hpxml, runner, args)
     set_clothes_washer(hpxml, runner, args)
@@ -3832,6 +3613,50 @@ class HPXMLFile
     return true
   end
 
+  def self.create_schedules(runner, model, epw_file, args)
+    if ['default', 'user-specified'].include? args[:schedules_type]
+      if args[:schedules_type] == 'user-specified'
+        args[:schedules_path] = args[:schedules_path].get
+      else
+        args[:schedules_path] = nil
+      end
+      return true
+    end
+
+    # set the calendar year
+    year_description = model.getYearDescription
+    year_description.setCalendarYear(2007) # default to TMY
+    if epw_file.startDateActualYear.is_initialized # AMY
+      year_description.setCalendarYear(epw_file.startDateActualYear.get)
+    end
+
+    # set the timestep
+    timestep = model.getTimestep
+    timestep.setNumberOfTimestepsPerHour(1)
+    if args[:simulation_control_timestep].is_initialized
+      timestep.setNumberOfTimestepsPerHour(60 / args[:simulation_control_timestep].get)
+    end
+
+    schedule_generator = ScheduleGenerator.new(runner: runner, model: model, epw_file: epw_file)
+
+    # create the schedule
+    if args[:geometry_num_occupants] == Constants.Auto
+      args[:geometry_num_occupants] = Geometry.get_occupancy_default_num(args[:geometry_num_bedrooms])
+    else
+      args[:geometry_num_occupants] = Integer(args[:geometry_num_occupants])
+    end
+    args[:resources_path] = File.join(File.dirname(__FILE__), 'resources')
+    success = schedule_generator.create(args: args)
+    return false if not success
+
+    # export the schedule
+    args[:schedules_path] = '../schedules.csv'
+    success = schedule_generator.export(schedules_path: File.expand_path(args[:schedules_path]))
+    return false if not success
+
+    return true
+  end
+
   def self.set_header(hpxml, runner, args)
     hpxml.header.xml_type = 'HPXML'
     hpxml.header.xml_generated_by = 'BuildResidentialHPXML'
@@ -3861,6 +3686,9 @@ class HPXMLFile
     if args[:simulation_control_run_period_end_day_of_month].is_initialized
       hpxml.header.sim_end_day_of_month = args[:simulation_control_run_period_end_day_of_month].get
     end
+    if args[:simulation_control_run_period_calendar_year].is_initialized
+      hpxml.header.sim_calendar_year = args[:simulation_control_run_period_calendar_year].get
+    end
 
     if args[:simulation_control_daylight_saving_enabled].is_initialized
       hpxml.header.dst_enabled = args[:simulation_control_daylight_saving_enabled].get
@@ -3880,6 +3708,7 @@ class HPXMLFile
 
     hpxml.header.building_id = 'MyBuilding'
     hpxml.header.event_type = 'proposed workscope'
+    hpxml.header.schedules_path = args[:schedules_path]
   end
 
   def self.set_site(hpxml, runner, args)
@@ -3956,15 +3785,16 @@ class HPXMLFile
     end
   end
 
-  def self.set_climate_and_risk_zones(hpxml, runner, args, weather)
+  def self.set_climate_and_risk_zones(hpxml, runner, args, epw_file)
     hpxml.climate_and_risk_zones.weather_station_id = 'WeatherStation'
-    iecc_zone = Location.get_climate_zone_iecc(weather.header.Station)
+    iecc_zone = Location.get_climate_zone_iecc(epw_file.wmoNumber)
 
     unless iecc_zone.nil?
       hpxml.climate_and_risk_zones.iecc_year = 2006
       hpxml.climate_and_risk_zones.iecc_zone = iecc_zone
     end
-    hpxml.climate_and_risk_zones.weather_station_name = args[:weather_station_epw_filepath].gsub('.epw', '')
+    weather_station_name = File.basename(args[:weather_station_epw_filepath]).gsub('.epw', '')
+    hpxml.climate_and_risk_zones.weather_station_name = weather_station_name
     hpxml.climate_and_risk_zones.weather_station_epw_filepath = args[:weather_station_epw_filepath]
   end
 
@@ -4745,6 +4575,22 @@ class HPXMLFile
         end
       end
 
+      if args[:mech_vent_is_shared_system]
+        is_shared_system = args[:mech_vent_is_shared_system]
+        in_unit_flow_rate = args[:shared_mech_vent_in_unit_flow_rate].get
+        fraction_recirculation = args[:shared_mech_vent_frac_recirculation].get
+        if args[:shared_mech_vent_preheating_fuel].is_initialized && args[:shared_mech_vent_preheating_efficiency].is_initialized && args[:shared_mech_vent_preheating_fraction_heat_load_served].is_initialized
+          preheating_fuel = args[:shared_mech_vent_preheating_fuel].get
+          preheating_efficiency_cop = args[:shared_mech_vent_preheating_efficiency].get
+          preheating_fraction_load_served = args[:shared_mech_vent_preheating_fraction_heat_load_served].get
+        end
+        if args[:shared_mech_vent_precooling_fuel].is_initialized && args[:shared_mech_vent_precooling_efficiency].is_initialized && args[:shared_mech_vent_precooling_fraction_cool_load_served].is_initialized
+          precooling_fuel = args[:shared_mech_vent_precooling_fuel].get
+          precooling_efficiency_cop = args[:shared_mech_vent_precooling_efficiency].get
+          precooling_fraction_load_served = args[:shared_mech_vent_precooling_fraction_cool_load_served].get
+        end
+      end
+
       hpxml.ventilation_fans.add(id: 'MechanicalVentilation',
                                  fan_type: args[:mech_vent_fan_type],
                                  rated_flow_rate: args[:mech_vent_flow_rate],
@@ -4755,6 +4601,59 @@ class HPXMLFile
                                  sensible_recovery_efficiency: sensible_recovery_efficiency,
                                  sensible_recovery_efficiency_adjusted: sensible_recovery_efficiency_adjusted,
                                  fan_power: args[:mech_vent_fan_power],
+                                 distribution_system_idref: distribution_system_idref,
+                                 is_shared_system: is_shared_system,
+                                 in_unit_flow_rate: in_unit_flow_rate,
+                                 fraction_recirculation: fraction_recirculation,
+                                 preheating_fuel: preheating_fuel,
+                                 preheating_efficiency_cop: preheating_efficiency_cop,
+                                 preheating_fraction_load_served: preheating_fraction_load_served,
+                                 precooling_fuel: precooling_fuel,
+                                 precooling_efficiency_cop: precooling_efficiency_cop,
+                                 precooling_fraction_load_served: precooling_fraction_load_served)
+    end
+
+    if args[:mech_vent_fan_type_2] != 'none'
+
+      if args[:mech_vent_fan_type_2].include? 'recovery ventilator'
+
+        if args[:mech_vent_fan_type_2].include? 'energy'
+
+          if args[:mech_vent_total_recovery_efficiency_type_2] == 'Unadjusted'
+            total_recovery_efficiency = args[:mech_vent_total_recovery_efficiency_2]
+          elsif args[:mech_vent_total_recovery_efficiency_type_2] == 'Adjusted'
+            total_recovery_efficiency_adjusted = args[:mech_vent_total_recovery_efficiency_2]
+          end
+
+        end
+
+        if args[:mech_vent_sensible_recovery_efficiency_type_2] == 'Unadjusted'
+          sensible_recovery_efficiency = args[:mech_vent_sensible_recovery_efficiency_2]
+        elsif args[:mech_vent_sensible_recovery_efficiency_type_2] == 'Adjusted'
+          sensible_recovery_efficiency_adjusted = args[:mech_vent_sensible_recovery_efficiency_2]
+        end
+
+      end
+
+      distribution_system_idref = nil
+      if args[:mech_vent_fan_type_2] == HPXML::MechVentTypeCFIS
+        hpxml.hvac_distributions.each do |hvac_distribution|
+          next unless hvac_distribution.distribution_system_type == HPXML::HVACDistributionTypeAir
+
+          distribution_system_idref = hvac_distribution.id
+        end
+      end
+
+      hpxml.ventilation_fans.add(id: 'SecondMechanicalVentilation',
+                                 fan_type: args[:mech_vent_fan_type_2],
+                                 rated_flow_rate: args[:mech_vent_flow_rate_2],
+                                 hours_in_operation: args[:mech_vent_hours_in_operation_2],
+                                 used_for_whole_building_ventilation: true,
+                                 total_recovery_efficiency: total_recovery_efficiency,
+                                 total_recovery_efficiency_adjusted: total_recovery_efficiency_adjusted,
+                                 sensible_recovery_efficiency: sensible_recovery_efficiency,
+                                 sensible_recovery_efficiency_adjusted: sensible_recovery_efficiency_adjusted,
+                                 fan_power: args[:mech_vent_fan_power_2],
                                  distribution_system_idref: distribution_system_idref)
     end
 
@@ -4991,19 +4890,19 @@ class HPXMLFile
     end
   end
 
-  def self.get_absolute_tilt(tilt_str, roof_pitch, weather)
+  def self.get_absolute_tilt(tilt_str, roof_pitch, epw_file)
     tilt_str = tilt_str.downcase
     if tilt_str.start_with? 'roofpitch'
       roof_angle = Math.atan(roof_pitch / 12.0) * 180.0 / Math::PI
       return Float(eval(tilt_str.gsub('roofpitch', roof_angle.to_s)))
     elsif tilt_str.start_with? 'latitude'
-      return Float(eval(tilt_str.gsub('latitude', weather.header.Latitude.to_s)))
+      return Float(eval(tilt_str.gsub('latitude', epw_file.latitude.to_s)))
     else
       return Float(tilt_str)
     end
   end
 
-  def self.set_solar_thermal(hpxml, runner, args, weather)
+  def self.set_solar_thermal(hpxml, runner, args, epw_file)
     return if args[:solar_thermal_system_type] == 'none'
 
     if args[:solar_thermal_solar_fraction] > 0
@@ -5013,7 +4912,7 @@ class HPXMLFile
       collector_loop_type = args[:solar_thermal_collector_loop_type]
       collector_type = args[:solar_thermal_collector_type]
       collector_azimuth = args[:solar_thermal_collector_azimuth]
-      collector_tilt = get_absolute_tilt(args[:solar_thermal_collector_tilt], hpxml.roofs[-1].pitch, weather)
+      collector_tilt = get_absolute_tilt(args[:solar_thermal_collector_tilt], hpxml.roofs[-1].pitch, epw_file)
       collector_frta = args[:solar_thermal_collector_rated_optical_efficiency]
       collector_frul = args[:solar_thermal_collector_rated_thermal_losses]
 
@@ -5040,7 +4939,7 @@ class HPXMLFile
                                     solar_fraction: solar_fraction)
   end
 
-  def self.set_pv_systems(hpxml, runner, args, weather)
+  def self.set_pv_systems(hpxml, runner, args, epw_file)
     [args[:pv_system_module_type_1], args[:pv_system_module_type_2]].each_with_index do |module_type, i|
       next if module_type == 'none'
 
@@ -5064,7 +4963,7 @@ class HPXMLFile
                            module_type: module_type,
                            tracking: [args[:pv_system_tracking_1], args[:pv_system_tracking_2]][i],
                            array_azimuth: [args[:pv_system_array_azimuth_1], args[:pv_system_array_azimuth_2]][i],
-                           array_tilt: get_absolute_tilt([args[:pv_system_array_tilt_1], args[:pv_system_array_tilt_2]][i], hpxml.roofs[-1].pitch, weather),
+                           array_tilt: get_absolute_tilt([args[:pv_system_array_tilt_1], args[:pv_system_array_tilt_2]][i], hpxml.roofs[-1].pitch, epw_file),
                            max_power_output: max_power_output,
                            inverter_efficiency: inverter_efficiency,
                            system_losses_fraction: system_losses_fraction,
@@ -5115,50 +5014,14 @@ class HPXMLFile
       hpxml.lighting.interior_usage_multiplier = args[:lighting_usage_multiplier_interior]
     end
 
-    if args[:lighting_weekday_fractions_interior] != Constants.Auto
-      hpxml.lighting.interior_weekday_fractions = args[:lighting_weekday_fractions_interior]
-    end
-
-    if args[:lighting_weekend_fractions_interior] != Constants.Auto
-      hpxml.lighting.interior_weekend_fractions = args[:lighting_weekend_fractions_interior]
-    end
-
-    if args[:lighting_monthly_multipliers_interior] != Constants.Auto
-      hpxml.lighting.interior_monthly_multipliers = args[:lighting_monthly_multipliers_interior]
-    end
-
     if args[:lighting_usage_multiplier_exterior] != 1.0
       hpxml.lighting.exterior_usage_multiplier = args[:lighting_usage_multiplier_exterior]
     end
 
-    if args[:lighting_weekday_fractions_exterior] != Constants.Auto
-      hpxml.lighting.exterior_weekday_fractions = args[:lighting_weekday_fractions_exterior]
-    end
-
-    if args[:lighting_weekend_fractions_exterior] != Constants.Auto
-      hpxml.lighting.exterior_weekend_fractions = args[:lighting_weekend_fractions_exterior]
-    end
-
-    if args[:lighting_monthly_multipliers_exterior] != Constants.Auto
-      hpxml.lighting.exterior_monthly_multipliers = args[:lighting_monthly_multipliers_exterior]
-    end
-
     if args[:lighting_usage_multiplier_garage] != 1.0
       hpxml.lighting.garage_usage_multiplier = args[:lighting_usage_multiplier_garage]
     end
 
-    if args[:lighting_weekday_fractions_garage] != Constants.Auto
-      hpxml.lighting.garage_weekday_fractions = args[:lighting_weekday_fractions_garage]
-    end
-
-    if args[:lighting_weekend_fractions_garage] != Constants.Auto
-      hpxml.lighting.garage_weekend_fractions = args[:lighting_weekend_fractions_garage]
-    end
-
-    if args[:lighting_monthly_multipliers_garage] != Constants.Auto
-      hpxml.lighting.garage_monthly_multipliers = args[:lighting_monthly_multipliers_garage]
-    end
-
     return unless args[:holiday_lighting_present]
 
     hpxml.lighting.holiday_exists = true
@@ -5182,14 +5045,6 @@ class HPXMLFile
     if args[:holiday_lighting_period_end_day_of_month] != Constants.Auto
       hpxml.lighting.holiday_period_end_day_of_month = args[:holiday_lighting_period_end_day_of_month]
     end
-
-    if args[:holiday_lighting_weekday_fractions_exterior] != Constants.Auto
-      hpxml.lighting.holiday_weekday_fractions = args[:holiday_lighting_weekday_fractions_exterior]
-    end
-
-    if args[:holiday_lighting_weekend_fractions_exterior] != Constants.Auto
-      hpxml.lighting.holiday_weekend_fractions = args[:holiday_lighting_weekend_fractions_exterior]
-    end
   end
 
   def self.set_dehumidifier(hpxml, runner, args)
@@ -5291,6 +5146,14 @@ class HPXMLFile
       control_type = args[:clothes_dryer_control_type]
     end
 
+    if args[:clothes_dryer_vented_flow_rate] != Constants.Auto
+      is_vented = false
+      if Float(args[:clothes_dryer_vented_flow_rate]) > 0
+        is_vented = true
+        vented_flow_rate = args[:clothes_dryer_vented_flow_rate]
+      end
+    end
+
     if args[:clothes_dryer_usage_multiplier] != 1.0
       usage_multiplier = args[:clothes_dryer_usage_multiplier]
     end
@@ -5301,6 +5164,8 @@ class HPXMLFile
                              energy_factor: energy_factor,
                              combined_energy_factor: combined_energy_factor,
                              control_type: control_type,
+                             is_vented: is_vented,
+                             vented_flow_rate: vented_flow_rate,
                              usage_multiplier: usage_multiplier)
   end
 
@@ -5370,18 +5235,6 @@ class HPXMLFile
       usage_multiplier = args[:refrigerator_usage_multiplier]
     end
 
-    if args[:refrigerator_weekday_fractions] != Constants.Auto
-      refrigerator_weekday_fractions = args[:refrigerator_weekday_fractions]
-    end
-
-    if args[:refrigerator_weekend_fractions] != Constants.Auto
-      refrigerator_weekend_fractions = args[:refrigerator_weekend_fractions]
-    end
-
-    if args[:refrigerator_monthly_multipliers] != Constants.Auto
-      refrigerator_monthly_multipliers = args[:refrigerator_monthly_multipliers]
-    end
-
     if args[:extra_refrigerator_present]
       primary_indicator = true
     end
@@ -5390,10 +5243,7 @@ class HPXMLFile
                             location: location,
                             rated_annual_kwh: refrigerator_rated_annual_kwh,
                             primary_indicator: primary_indicator,
-                            usage_multiplier: usage_multiplier,
-                            weekday_fractions: refrigerator_weekday_fractions,
-                            weekend_fractions: refrigerator_weekend_fractions,
-                            monthly_multipliers: refrigerator_monthly_multipliers)
+                            usage_multiplier: usage_multiplier)
   end
 
   def self.set_extra_refrigerator(hpxml, runner, args)
@@ -5411,26 +5261,11 @@ class HPXMLFile
       usage_multiplier = args[:extra_refrigerator_usage_multiplier]
     end
 
-    if args[:extra_refrigerator_weekday_fractions] != Constants.Auto
-      weekday_fractions = args[:extra_refrigerator_weekday_fractions]
-    end
-
-    if args[:extra_refrigerator_weekend_fractions] != Constants.Auto
-      weekend_fractions = args[:extra_refrigerator_weekend_fractions]
-    end
-
-    if args[:extra_refrigerator_monthly_multipliers] != Constants.Auto
-      monthly_multipliers = args[:extra_refrigerator_monthly_multipliers]
-    end
-
     hpxml.refrigerators.add(id: 'ExtraRefrigerator',
                             location: location,
                             rated_annual_kwh: rated_annual_kwh,
                             primary_indicator: false,
-                            usage_multiplier: usage_multiplier,
-                            weekday_fractions: weekday_fractions,
-                            weekend_fractions: weekend_fractions,
-                            monthly_multipliers: monthly_multipliers)
+                            usage_multiplier: usage_multiplier)
   end
 
   def self.set_freezer(hpxml, runner, args)
@@ -5448,25 +5283,10 @@ class HPXMLFile
       usage_multiplier = args[:freezer_usage_multiplier]
     end
 
-    if args[:freezer_weekday_fractions] != Constants.Auto
-      weekday_fractions = args[:freezer_weekday_fractions]
-    end
-
-    if args[:freezer_weekend_fractions] != Constants.Auto
-      weekend_fractions = args[:freezer_weekend_fractions]
-    end
-
-    if args[:freezer_monthly_multipliers] != Constants.Auto
-      monthly_multipliers = args[:freezer_monthly_multipliers]
-    end
-
     hpxml.freezers.add(id: 'Freezer',
                        location: location,
                        rated_annual_kwh: rated_annual_kwh,
-                       usage_multiplier: usage_multiplier,
-                       weekday_fractions: weekday_fractions,
-                       weekend_fractions: weekend_fractions,
-                       monthly_multipliers: monthly_multipliers)
+                       usage_multiplier: usage_multiplier)
   end
 
   def self.set_cooking_range_oven(hpxml, runner, args)
@@ -5484,26 +5304,11 @@ class HPXMLFile
       usage_multiplier = args[:cooking_range_oven_usage_multiplier]
     end
 
-    if args[:cooking_range_oven_weekday_fractions] != Constants.Auto
-      cooking_range_oven_weekday_fractions = args[:cooking_range_oven_weekday_fractions]
-    end
-
-    if args[:cooking_range_oven_weekend_fractions] != Constants.Auto
-      cooking_range_oven_weekend_fractions = args[:cooking_range_oven_weekend_fractions]
-    end
-
-    if args[:cooking_range_oven_monthly_multipliers] != Constants.Auto
-      cooking_range_oven_monthly_multipliers = args[:cooking_range_oven_monthly_multipliers]
-    end
-
     hpxml.cooking_ranges.add(id: 'CookingRange',
                              location: location,
                              fuel_type: args[:cooking_range_oven_fuel_type],
                              is_induction: is_induction,
-                             usage_multiplier: usage_multiplier,
-                             weekday_fractions: cooking_range_oven_weekday_fractions,
-                             weekend_fractions: cooking_range_oven_weekend_fractions,
-                             monthly_multipliers: cooking_range_oven_monthly_multipliers)
+                             usage_multiplier: usage_multiplier)
 
     if args[:cooking_range_oven_is_convection].is_initialized
       is_convection = args[:cooking_range_oven_is_convection].get
@@ -5538,25 +5343,10 @@ class HPXMLFile
       usage_multiplier = args[:plug_loads_television_usage_multiplier]
     end
 
-    if args[:plug_loads_television_weekday_fractions] != Constants.Auto
-      weekday_fractions = args[:plug_loads_television_weekday_fractions]
-    end
-
-    if args[:plug_loads_television_weekend_fractions] != Constants.Auto
-      weekend_fractions = args[:plug_loads_television_weekend_fractions]
-    end
-
-    if args[:plug_loads_television_monthly_multipliers] != Constants.Auto
-      monthly_multipliers = args[:plug_loads_television_monthly_multipliers]
-    end
-
     hpxml.plug_loads.add(id: 'PlugLoadsTelevision',
                          plug_load_type: HPXML::PlugLoadTypeTelevision,
                          kWh_per_year: kWh_per_year,
-                         usage_multiplier: usage_multiplier,
-                         weekday_fractions: weekday_fractions,
-                         weekend_fractions: weekend_fractions,
-                         monthly_multipliers: monthly_multipliers)
+                         usage_multiplier: usage_multiplier)
   end
 
   def self.set_plug_loads_other(hpxml, runner, args)
@@ -5576,27 +5366,12 @@ class HPXMLFile
       usage_multiplier = args[:plug_loads_other_usage_multiplier]
     end
 
-    if args[:plug_loads_other_weekday_fractions] != Constants.Auto
-      weekday_fractions = args[:plug_loads_other_weekday_fractions]
-    end
-
-    if args[:plug_loads_other_weekend_fractions] != Constants.Auto
-      weekend_fractions = args[:plug_loads_other_weekend_fractions]
-    end
-
-    if args[:plug_loads_other_monthly_multipliers] != Constants.Auto
-      monthly_multipliers = args[:plug_loads_other_monthly_multipliers]
-    end
-
     hpxml.plug_loads.add(id: 'PlugLoadsOther',
                          plug_load_type: HPXML::PlugLoadTypeOther,
                          kWh_per_year: kWh_per_year,
                          frac_sensible: frac_sensible,
                          frac_latent: frac_latent,
-                         usage_multiplier: usage_multiplier,
-                         weekday_fractions: weekday_fractions,
-                         weekend_fractions: weekend_fractions,
-                         monthly_multipliers: monthly_multipliers)
+                         usage_multiplier: usage_multiplier)
   end
 
   def self.set_plug_loads_well_pump(hpxml, runner, args)
@@ -5679,27 +5454,12 @@ class HPXMLFile
         usage_multiplier = args[:fuel_loads_grill_usage_multiplier]
       end
 
-      if args[:fuel_loads_grill_weekday_fractions] != Constants.Auto
-        weekday_fractions = args[:fuel_loads_grill_weekday_fractions]
-      end
-
-      if args[:fuel_loads_grill_weekend_fractions] != Constants.Auto
-        weekend_fractions = args[:fuel_loads_grill_weekend_fractions]
-      end
-
-      if args[:fuel_loads_grill_monthly_multipliers] != Constants.Auto
-        monthly_multipliers = args[:fuel_loads_grill_monthly_multipliers]
-      end
-
       hpxml.fuel_loads.add(id: 'FuelLoadsGrill',
                            fuel_load_type: HPXML::FuelLoadTypeGrill,
                            fuel_type: args[:fuel_loads_grill_fuel_type],
                            location: location,
                            therm_per_year: therm_per_year,
-                           usage_multiplier: usage_multiplier,
-                           weekday_fractions: weekday_fractions,
-                           weekend_fractions: weekend_fractions,
-                           monthly_multipliers: monthly_multipliers)
+                           usage_multiplier: usage_multiplier)
     end
   end
 
@@ -5717,27 +5477,12 @@ class HPXMLFile
         usage_multiplier = args[:fuel_loads_lighting_usage_multiplier]
       end
 
-      if args[:fuel_loads_lighting_weekday_fractions] != Constants.Auto
-        weekday_fractions = args[:fuel_loads_lighting_weekday_fractions]
-      end
-
-      if args[:fuel_loads_lighting_weekend_fractions] != Constants.Auto
-        weekend_fractions = args[:fuel_loads_lighting_weekend_fractions]
-      end
-
-      if args[:fuel_loads_lighting_monthly_multipliers] != Constants.Auto
-        monthly_multipliers = args[:fuel_loads_lighting_monthly_multipliers]
-      end
-
       hpxml.fuel_loads.add(id: 'FuelLoadsLighting',
                            fuel_load_type: HPXML::FuelLoadTypeLighting,
                            fuel_type: args[:fuel_loads_lighting_fuel_type],
                            location: location,
                            therm_per_year: therm_per_year,
-                           usage_multiplier: usage_multiplier,
-                           weekday_fractions: weekday_fractions,
-                           weekend_fractions: weekend_fractions,
-                           monthly_multipliers: monthly_multipliers)
+                           usage_multiplier: usage_multiplier)
     end
   end
 
@@ -5755,27 +5500,12 @@ class HPXMLFile
         usage_multiplier = args[:fuel_loads_fireplace_usage_multiplier]
       end
 
-      if args[:fuel_loads_fireplace_weekday_fractions] != Constants.Auto
-        weekday_fractions = args[:fuel_loads_fireplace_weekday_fractions]
-      end
-
-      if args[:fuel_loads_fireplace_weekend_fractions] != Constants.Auto
-        weekend_fractions = args[:fuel_loads_fireplace_weekend_fractions]
-      end
-
-      if args[:fuel_loads_fireplace_monthly_multipliers] != Constants.Auto
-        monthly_multipliers = args[:fuel_loads_fireplace_monthly_multipliers]
-      end
-
       hpxml.fuel_loads.add(id: 'FuelLoadsFireplace',
                            fuel_load_type: HPXML::FuelLoadTypeFireplace,
                            fuel_type: args[:fuel_loads_fireplace_fuel_type],
                            location: location,
                            therm_per_year: therm_per_year,
-                           usage_multiplier: usage_multiplier,
-                           weekday_fractions: weekday_fractions,
-                           weekend_fractions: weekend_fractions,
-                           monthly_multipliers: monthly_multipliers)
+                           usage_multiplier: usage_multiplier)
     end
   end
 
@@ -5790,18 +5520,6 @@ class HPXMLFile
       pump_usage_multiplier = args[:pool_pump_usage_multiplier]
     end
 
-    if args[:pool_pump_weekday_fractions] != Constants.Auto
-      pump_weekday_fractions = args[:pool_pump_weekday_fractions]
-    end
-
-    if args[:pool_pump_weekend_fractions] != Constants.Auto
-      pump_weekend_fractions = args[:pool_pump_weekend_fractions]
-    end
-
-    if args[:pool_pump_monthly_multipliers] != Constants.Auto
-      pump_monthly_multipliers = args[:pool_pump_monthly_multipliers]
-    end
-
     if args[:pool_heater_type] != 'none'
       heater_type = args[:pool_heater_type]
     end
@@ -5820,31 +5538,13 @@ class HPXMLFile
       heater_usage_multiplier = args[:pool_heater_usage_multiplier]
     end
 
-    if args[:pool_heater_weekday_fractions] != Constants.Auto
-      heater_weekday_fractions = args[:pool_heater_weekday_fractions]
-    end
-
-    if args[:pool_heater_weekend_fractions] != Constants.Auto
-      heater_weekend_fractions = args[:pool_heater_weekend_fractions]
-    end
-
-    if args[:pool_heater_monthly_multipliers] != Constants.Auto
-      heater_monthly_multipliers = args[:pool_heater_monthly_multipliers]
-    end
-
     hpxml.pools.add(id: 'Pool',
                     pump_kwh_per_year: pump_kwh_per_year,
                     pump_usage_multiplier: pump_usage_multiplier,
-                    pump_weekday_fractions: pump_weekday_fractions,
-                    pump_weekend_fractions: pump_weekend_fractions,
-                    pump_monthly_multipliers: pump_monthly_multipliers,
                     heater_type: heater_type,
                     heater_load_units: heater_load_units,
                     heater_load_value: heater_load_value,
-                    heater_usage_multiplier: heater_usage_multiplier,
-                    heater_weekday_fractions: heater_weekday_fractions,
-                    heater_weekend_fractions: heater_weekend_fractions,
-                    heater_monthly_multipliers: heater_monthly_multipliers)
+                    heater_usage_multiplier: heater_usage_multiplier)
   end
 
   def self.set_hot_tub(hpxml, runner, args)
@@ -5858,18 +5558,6 @@ class HPXMLFile
       pump_usage_multiplier = args[:hot_tub_pump_usage_multiplier]
     end
 
-    if args[:hot_tub_pump_weekday_fractions] != Constants.Auto
-      pump_weekday_fractions = args[:hot_tub_pump_weekday_fractions]
-    end
-
-    if args[:hot_tub_pump_weekend_fractions] != Constants.Auto
-      pump_weekend_fractions = args[:hot_tub_pump_weekend_fractions]
-    end
-
-    if args[:hot_tub_pump_monthly_multipliers] != Constants.Auto
-      pump_monthly_multipliers = args[:hot_tub_pump_monthly_multipliers]
-    end
-
     if args[:hot_tub_heater_type] != 'none'
       heater_type = args[:hot_tub_heater_type]
     end
@@ -5888,31 +5576,13 @@ class HPXMLFile
       heater_usage_multiplier = args[:hot_tub_heater_usage_multiplier]
     end
 
-    if args[:hot_tub_heater_weekday_fractions] != Constants.Auto
-      heater_weekday_fractions = args[:hot_tub_heater_weekday_fractions]
-    end
-
-    if args[:hot_tub_heater_weekend_fractions] != Constants.Auto
-      heater_weekend_fractions = args[:hot_tub_heater_weekend_fractions]
-    end
-
-    if args[:hot_tub_heater_monthly_multipliers] != Constants.Auto
-      heater_monthly_multipliers = args[:hot_tub_heater_monthly_multipliers]
-    end
-
     hpxml.hot_tubs.add(id: 'HotTub',
                        pump_kwh_per_year: pump_kwh_per_year,
                        pump_usage_multiplier: pump_usage_multiplier,
-                       pump_weekday_fractions: pump_weekday_fractions,
-                       pump_weekend_fractions: pump_weekend_fractions,
-                       pump_monthly_multipliers: pump_monthly_multipliers,
                        heater_type: heater_type,
                        heater_load_units: heater_load_units,
                        heater_load_value: heater_load_value,
-                       heater_usage_multiplier: heater_usage_multiplier,
-                       heater_weekday_fractions: heater_weekday_fractions,
-                       heater_weekend_fractions: heater_weekend_fractions,
-                       heater_monthly_multipliers: heater_monthly_multipliers)
+                       heater_usage_multiplier: heater_usage_multiplier)
   end
 
   def self.valid_attr(attr)