urbanopt-cli 0.8.3 → 0.9.0

data/example_files/resources/hpxml-measures/tasks.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-def create_hpxmls
-  require_relative 'HPXMLtoOpenStudio/resources/constants'
-  require_relative 'HPXMLtoOpenStudio/resources/hpxml'
-  require_relative 'HPXMLtoOpenStudio/resources/meta_measure'
+Dir["#{File.dirname(__FILE__)}/HPXMLtoOpenStudio/resources/*.rb"].each do |resource_file|
+  next if resource_file.include? 'minitest_helper.rb'
+
+  require resource_file
+end
 
+def create_hpxmls
   this_dir = File.dirname(__FILE__)
   tests_dir = File.join(this_dir, 'workflow/sample_files')
 
@@ -59,6 +61,7 @@ def create_hpxmls
     'base-atticroof-unvented-insulated-roof.xml' => 'base.xml',
     'base-atticroof-vented.xml' => 'base.xml',
     'base-battery.xml' => 'base.xml',
+    'base-battery-scheduled.xml' => 'base-battery.xml',
     'base-bldgtype-multifamily.xml' => 'base.xml',
     'base-bldgtype-multifamily-adjacent-to-multifamily-buffer-space.xml' => 'base-bldgtype-multifamily.xml',
     'base-bldgtype-multifamily-adjacent-to-multiple.xml' => 'base-bldgtype-multifamily.xml',
@@ -84,6 +87,7 @@ def create_hpxmls
     'base-bldgtype-multifamily-shared-generator.xml' => 'base-bldgtype-multifamily.xml',
     'base-bldgtype-multifamily-shared-ground-loop-ground-to-air-heat-pump.xml' => 'base-bldgtype-multifamily.xml',
     'base-bldgtype-multifamily-shared-laundry-room.xml' => 'base-bldgtype-multifamily.xml',
+    'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml' => 'base-bldgtype-multifamily-shared-laundry-room.xml',
     'base-bldgtype-multifamily-shared-mechvent.xml' => 'base-bldgtype-multifamily.xml',
     'base-bldgtype-multifamily-shared-mechvent-multiple.xml' => 'base-bldgtype-multifamily.xml',
     'base-bldgtype-multifamily-shared-mechvent-preconditioning.xml' => 'base-bldgtype-multifamily-shared-mechvent.xml',
@@ -107,6 +111,7 @@ def create_hpxmls
     'base-dhw-desuperheater-var-speed.xml' => 'base-hvac-central-ac-only-var-speed.xml',
     'base-dhw-dwhr.xml' => 'base.xml',
     'base-dhw-indirect.xml' => 'base-hvac-boiler-gas-only.xml',
+    'base-dhw-indirect-detailed-setpoints.xml' => 'base-dhw-indirect.xml',
     'base-dhw-indirect-dse.xml' => 'base-dhw-indirect.xml',
     'base-dhw-indirect-outside.xml' => 'base-dhw-indirect.xml',
     'base-dhw-indirect-standbyloss.xml' => 'base-dhw-indirect.xml',
@@ -130,6 +135,7 @@ def create_hpxmls
     'base-dhw-solar-indirect-flat-plate.xml' => 'base.xml',
     'base-dhw-solar-thermosyphon-flat-plate.xml' => 'base-dhw-solar-indirect-flat-plate.xml',
     'base-dhw-tank-coal.xml' => 'base-dhw-tank-gas.xml',
+    'base-dhw-tank-detailed-setpoints.xml' => 'base.xml',
     'base-dhw-tank-elec-uef.xml' => 'base.xml',
     'base-dhw-tank-gas.xml' => 'base.xml',
     'base-dhw-tank-gas-uef.xml' => 'base-dhw-tank-gas.xml',
@@ -141,11 +147,8 @@ def create_hpxmls
     'base-dhw-tank-heat-pump-with-solar.xml' => 'base-dhw-tank-heat-pump.xml',
     'base-dhw-tank-heat-pump-with-solar-fraction.xml' => 'base-dhw-tank-heat-pump.xml',
     'base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml' => 'base-dhw-tank-heat-pump-uef.xml',
-    'base-dhw-tank-heat-pump-detailed-setpoints.xml' => 'base-dhw-tank-heat-pump-uef.xml',
-    'base-dhw-tank-heat-pump-detailed-operating-modes.xml' => 'base-dhw-tank-heat-pump-uef.xml',
     'base-dhw-tank-heat-pump-detailed-schedules.xml' => 'base-dhw-tank-heat-pump-uef.xml',
     'base-dhw-tank-model-type-stratified.xml' => 'base.xml',
-    'base-dhw-tank-detailed-setpoints.xml' => 'base.xml',
     'base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml' => 'base-dhw-tank-model-type-stratified.xml',
     'base-dhw-tank-oil.xml' => 'base-dhw-tank-gas.xml',
     'base-dhw-tank-wood.xml' => 'base-dhw-tank-gas.xml',
@@ -164,6 +167,8 @@ def create_hpxmls
     'base-enclosure-beds-2.xml' => 'base.xml',
     'base-enclosure-beds-4.xml' => 'base.xml',
     'base-enclosure-beds-5.xml' => 'base.xml',
+    'base-enclosure-ceilingtypes.xml' => 'base.xml',
+    'base-enclosure-floortypes.xml' => 'base-foundation-ambient.xml',
     'base-enclosure-garage.xml' => 'base.xml',
     'base-enclosure-infil-ach-house-pressure.xml' => 'base.xml',
     'base-enclosure-infil-cfm-house-pressure.xml' => 'base-enclosure-infil-cfm50.xml',
@@ -181,6 +186,7 @@ def create_hpxmls
     'base-enclosure-split-surfaces.xml' => 'base-enclosure-skylights.xml', # Surfaces should collapse via HPXML.collapse_enclosure_surfaces()
     'base-enclosure-split-surfaces2.xml' => 'base-enclosure-skylights.xml', # Surfaces should NOT collapse via HPXML.collapse_enclosure_surfaces()
     'base-enclosure-walltypes.xml' => 'base.xml',
+    'base-enclosure-windows-natural-ventilation-availability.xml' => 'base.xml',
     'base-enclosure-windows-none.xml' => 'base.xml',
     'base-enclosure-windows-physical-properties.xml' => 'base.xml',
     'base-enclosure-windows-shading.xml' => 'base.xml',
@@ -190,7 +196,7 @@ def create_hpxmls
     'base-foundation-basement-garage.xml' => 'base.xml',
     'base-foundation-complex.xml' => 'base.xml',
     'base-foundation-conditioned-basement-slab-insulation.xml' => 'base.xml',
-    'base-foundation-conditioned-basement-wall-interior-insulation.xml' => 'base.xml',
+    'base-foundation-conditioned-basement-wall-insulation.xml' => 'base.xml',
     'base-foundation-conditioned-crawlspace.xml' => 'base.xml',
     'base-foundation-multiple.xml' => 'base-foundation-unconditioned-basement.xml',
     'base-foundation-slab.xml' => 'base.xml',
@@ -205,6 +211,7 @@ def create_hpxmls
     'base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml' => 'base-hvac-air-to-air-heat-pump-1-speed.xml',
     'base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml' => 'base-hvac-air-to-air-heat-pump-1-speed.xml',
     'base-hvac-air-to-air-heat-pump-1-speed-backup-lockout-temperature.xml' => 'base-hvac-air-to-air-heat-pump-1-speed.xml',
+    'base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml' => 'base-hvac-air-to-air-heat-pump-1-speed.xml',
     'base-hvac-air-to-air-heat-pump-2-speed.xml' => 'base.xml',
     'base-hvac-air-to-air-heat-pump-var-speed.xml' => 'base.xml',
     'base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml' => 'base-hvac-air-to-air-heat-pump-var-speed.xml',
@@ -216,6 +223,7 @@ def create_hpxmls
     'base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-acca.xml' => 'base-hvac-air-to-air-heat-pump-1-speed.xml',
     'base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-hers.xml' => 'base-hvac-air-to-air-heat-pump-1-speed.xml',
     'base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-maxload.xml' => 'base-hvac-air-to-air-heat-pump-1-speed.xml',
+    'base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-maxload-miami-fl.xml' => 'base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-maxload.xml',
     'base-hvac-autosize-air-to-air-heat-pump-2-speed-sizing-methodology-acca.xml' => 'base-hvac-air-to-air-heat-pump-2-speed.xml',
     'base-hvac-autosize-air-to-air-heat-pump-2-speed-sizing-methodology-hers.xml' => 'base-hvac-air-to-air-heat-pump-2-speed.xml',
     'base-hvac-autosize-air-to-air-heat-pump-2-speed-sizing-methodology-maxload.xml' => 'base-hvac-air-to-air-heat-pump-2-speed.xml',
@@ -256,10 +264,14 @@ def create_hpxmls
     'base-hvac-autosize-mini-split-heat-pump-ductless-backup-stove.xml' => 'base-hvac-mini-split-heat-pump-ductless-backup-stove.xml',
     'base-hvac-autosize-mini-split-air-conditioner-only-ducted.xml' => 'base-hvac-mini-split-air-conditioner-only-ducted.xml',
     'base-hvac-autosize-ptac.xml' => 'base-hvac-ptac.xml',
-    'base-hvac-autosize-ptac-with-heating.xml' => 'base-hvac-ptac-with-heating.xml',
+    'base-hvac-autosize-ptac-with-heating.xml' => 'base-hvac-ptac-with-heating-electricity.xml',
     'base-hvac-autosize-pthp-sizing-methodology-acca.xml' => 'base-hvac-pthp.xml',
     'base-hvac-autosize-pthp-sizing-methodology-hers.xml' => 'base-hvac-pthp.xml',
     'base-hvac-autosize-pthp-sizing-methodology-maxload.xml' => 'base-hvac-pthp.xml',
+    'base-hvac-autosize-room-ac-with-reverse-cycle-sizing-methodology-acca.xml' => 'base-hvac-room-ac-with-reverse-cycle.xml',
+    'base-hvac-autosize-room-ac-with-reverse-cycle-sizing-methodology-hers.xml' => 'base-hvac-room-ac-with-reverse-cycle.xml',
+    'base-hvac-autosize-room-ac-with-reverse-cycle-sizing-methodology-maxload.xml' => 'base-hvac-room-ac-with-reverse-cycle.xml',
+    'base-hvac-autosize-room-ac-with-heating.xml' => 'base-hvac-room-ac-with-heating.xml',
     'base-hvac-autosize-room-ac-only.xml' => 'base-hvac-room-ac-only.xml',
     'base-hvac-autosize-stove-oil-only.xml' => 'base-hvac-stove-oil-only.xml',
     'base-hvac-autosize-wall-furnace-elec-only.xml' => 'base-hvac-wall-furnace-elec-only.xml',
@@ -271,6 +283,7 @@ def create_hpxmls
     'base-hvac-boiler-propane-only.xml' => 'base-hvac-boiler-gas-only.xml',
     'base-hvac-boiler-wood-only.xml' => 'base-hvac-boiler-gas-only.xml',
     'base-hvac-central-ac-only-1-speed.xml' => 'base.xml',
+    'base-hvac-central-ac-only-1-speed-seer2.xml' => 'base-hvac-central-ac-only-1-speed.xml',
     'base-hvac-central-ac-only-2-speed.xml' => 'base.xml',
     'base-hvac-central-ac-only-var-speed.xml' => 'base.xml',
     'base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml' => 'base-hvac-central-ac-only-1-speed.xml',
@@ -283,6 +296,7 @@ def create_hpxmls
     'base-hvac-ducts-leakage-cfm50.xml' => 'base.xml',
     'base-hvac-ducts-leakage-percent.xml' => 'base.xml',
     'base-hvac-ducts-area-fractions.xml' => 'base-enclosure-2stories.xml',
+    'base-hvac-ducts-area-multipliers.xml' => 'base.xml',
     'base-hvac-elec-resistance-only.xml' => 'base.xml',
     'base-hvac-evap-cooler-furnace-gas.xml' => 'base.xml',
     'base-hvac-evap-cooler-only.xml' => 'base.xml',
@@ -323,14 +337,17 @@ def create_hpxmls
     'base-hvac-mini-split-heat-pump-ductless.xml' => 'base-hvac-mini-split-heat-pump-ducted.xml',
     'base-hvac-mini-split-heat-pump-ductless-backup-stove.xml' => 'base-hvac-mini-split-heat-pump-ductless.xml',
     'base-hvac-multiple.xml' => 'base.xml',
-    'base-hvac-none.xml' => 'base.xml',
+    'base-hvac-none.xml' => 'base-location-honolulu-hi.xml',
     'base-hvac-portable-heater-gas-only.xml' => 'base.xml',
     'base-hvac-ptac.xml' => 'base.xml',
-    'base-hvac-ptac-with-heating.xml' => 'base-hvac-ptac.xml',
+    'base-hvac-ptac-with-heating-electricity.xml' => 'base-hvac-ptac.xml',
+    'base-hvac-ptac-with-heating-natural-gas.xml' => 'base-hvac-ptac.xml',
     'base-hvac-pthp.xml' => 'base-hvac-ground-to-air-heat-pump.xml',
     'base-hvac-room-ac-only.xml' => 'base.xml',
     'base-hvac-room-ac-only-33percent.xml' => 'base-hvac-room-ac-only.xml',
     'base-hvac-room-ac-only-ceer.xml' => 'base-hvac-room-ac-only.xml',
+    'base-hvac-room-ac-with-heating.xml' => 'base-hvac-room-ac-only.xml',
+    'base-hvac-room-ac-with-reverse-cycle.xml' => 'base-hvac-pthp.xml',
     'base-hvac-room-ac-only-detailed-setpoints.xml' => 'base-hvac-room-ac-only.xml',
     'base-hvac-seasons.xml' => 'base.xml',
     'base-hvac-setpoints.xml' => 'base.xml',
@@ -360,6 +377,8 @@ def create_hpxmls
     'base-mechvent-cfis-airflow-fraction-zero.xml' => 'base-mechvent-cfis.xml',
     'base-mechvent-cfis-dse.xml' => 'base-hvac-dse.xml',
     'base-mechvent-cfis-evap-cooler-only-ducted.xml' => 'base-hvac-evap-cooler-only-ducted.xml',
+    'base-mechvent-cfis-supplemental-fan-exhaust.xml' => 'base-mechvent-cfis.xml',
+    'base-mechvent-cfis-supplemental-fan-supply.xml' => 'base-mechvent-cfis.xml',
     'base-mechvent-erv.xml' => 'base.xml',
     'base-mechvent-erv-atre-asre.xml' => 'base.xml',
     'base-mechvent-exhaust.xml' => 'base.xml',
@@ -370,9 +389,17 @@ def create_hpxmls
     'base-mechvent-supply.xml' => 'base.xml',
     'base-mechvent-whole-house-fan.xml' => 'base.xml',
     'base-misc-additional-properties.xml' => 'base.xml',
+    'base-misc-bills.xml' => 'base.xml',
+    'base-misc-bills-none.xml' => 'base.xml',
+    'base-misc-bills-pv.xml' => 'base-pv.xml',
+    'base-misc-bills-pv-detailed-only.xml' => 'base-pv.xml',
+    'base-misc-bills-pv-mixed.xml' => 'base-pv.xml',
     'base-misc-defaults.xml' => 'base.xml',
     'base-misc-emissions.xml' => 'base-pv-battery.xml',
     'base-misc-generators.xml' => 'base.xml',
+    'base-misc-generators-battery.xml' => 'base-misc-generators.xml',
+    'base-misc-generators-battery-scheduled.xml' => 'base-misc-generators-battery.xml',
+    'base-misc-ground-conductivity.xml' => 'base.xml',
     'base-misc-loads-large-uncommon.xml' => 'base-schedules-simple.xml',
     'base-misc-loads-large-uncommon2.xml' => 'base-misc-loads-large-uncommon.xml',
     'base-misc-loads-none.xml' => 'base.xml',
@@ -383,13 +410,19 @@ def create_hpxmls
     'base-pv.xml' => 'base.xml',
     'base-pv-battery.xml' => 'base-battery.xml',
     'base-pv-battery-ah.xml' => 'base-pv-battery.xml',
-    'base-pv-battery-lifetime-model.xml' => 'base-pv-battery.xml',
     'base-pv-battery-garage.xml' => 'base-enclosure-garage.xml',
+    # 'base-pv-battery-lifetime-model.xml' => 'base-pv-battery.xml',
+    'base-pv-battery-round-trip-efficiency.xml' => 'base-pv-battery.xml',
+    'base-pv-battery-scheduled.xml' => 'base-pv-battery.xml',
+    'base-pv-generators.xml' => 'base-pv.xml',
+    'base-pv-generators-battery.xml' => 'base-pv-generators.xml',
+    'base-pv-generators-battery-scheduled.xml' => 'base-pv-generators-battery.xml',
     'base-schedules-simple.xml' => 'base.xml',
     'base-schedules-detailed-all-10-mins.xml' => 'base-simcontrol-timestep-10-mins.xml',
     'base-schedules-detailed-occupancy-smooth.xml' => 'base.xml',
     'base-schedules-detailed-occupancy-stochastic.xml' => 'base.xml',
     'base-schedules-detailed-occupancy-stochastic-vacancy.xml' => 'base.xml',
+    'base-schedules-detailed-occupancy-stochastic-10-mins.xml' => 'base.xml',
     'base-schedules-detailed-setpoints.xml' => 'base.xml',
     'base-schedules-detailed-setpoints-daily-schedules.xml' => 'base.xml',
     'base-schedules-detailed-setpoints-daily-setbacks.xml' => 'base.xml',
@@ -397,12 +430,15 @@ def create_hpxmls
     'base-simcontrol-daylight-saving-custom.xml' => 'base.xml',
     'base-simcontrol-daylight-saving-disabled.xml' => 'base.xml',
     'base-simcontrol-runperiod-1-month.xml' => 'base.xml',
-    'base-simcontrol-timestep-10-mins.xml' => 'base.xml'
+    'base-simcontrol-temperature-capacitance-multiplier.xml' => 'base.xml',
+    'base-simcontrol-timestep-10-mins.xml' => 'base.xml',
+    'base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml' => 'base-simcontrol-timestep-10-mins.xml',
+    'base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml' => 'base-simcontrol-timestep-10-mins.xml',
+    'base-simcontrol-timestep-30-mins.xml' => 'base.xml',
   }
 
   puts "Generating #{hpxmls_files.size} HPXML files..."
 
-  hpxml_docs = {}
   hpxmls_files.each_with_index do |(hpxml_file, orig_parent), i|
     puts "[#{i + 1}/#{hpxmls_files.size}] Generating #{hpxml_file}..."
 
@@ -451,7 +487,7 @@ def create_hpxmls
       if hpxml_file.include? 'ASHRAE_Standard_140'
         hpxml_path = File.absolute_path(File.join(tests_dir, '..', 'tests', hpxml_file))
         hpxml = HPXML.new(hpxml_path: hpxml_path, collapse_enclosure: false)
-        apply_hpxml_modification_ashrae_140(hpxml_file, hpxml)
+        apply_hpxml_modification_ashrae_140(hpxml)
       else
         hpxml_path = File.absolute_path(File.join(tests_dir, hpxml_file))
         hpxml = HPXML.new(hpxml_path: hpxml_path, collapse_enclosure: false)
@@ -465,14 +501,17 @@ def create_hpxmls
         hpxml_element = XMLHelper.get_element(hpxml_doc, '/HPXML')
         building_element = XMLHelper.get_element(hpxml_element, 'Building')
         for i in 2..3
-          new_building_element = deep_copy_object(building_element)
+          new_building_element = Marshal.load(Marshal.dump(building_element)) # Deep copy
 
           # Make all IDs unique so the HPXML is valid
           new_building_element.each_node do |node|
             next unless node.is_a?(Oga::XML::Element)
-            next if XMLHelper.get_attribute_value(node, 'id').nil?
 
-            XMLHelper.add_attribute(node, 'id', "#{XMLHelper.get_attribute_value(node, 'id')}_#{i}")
+            if not XMLHelper.get_attribute_value(node, 'id').nil?
+              XMLHelper.add_attribute(node, 'id', "#{XMLHelper.get_attribute_value(node, 'id')}_#{i}")
+            elsif not XMLHelper.get_attribute_value(node, 'idref').nil?
+              XMLHelper.add_attribute(node, 'idref', "#{XMLHelper.get_attribute_value(node, 'idref')}_#{i}")
+            end
           end
 
           hpxml_element.children << new_building_element
@@ -480,7 +519,13 @@ def create_hpxmls
       end
 
       XMLHelper.write_file(hpxml_doc, hpxml_path)
-      hpxml_docs[File.basename(hpxml_file)] = deep_copy_object(hpxml_doc)
+
+      schema_path = File.join(File.dirname(__FILE__), 'HPXMLtoOpenStudio', 'resources', 'hpxml_schema', 'HPXML.xsd')
+      errors, _ = XMLValidator.validate_against_schema(hpxml_path, schema_path)
+      if errors.size > 0
+        puts "\nError: Did not successfully validate #{hpxml_file}."
+        exit!
+      end
     rescue Exception => e
       puts "\n#{e}\n#{e.backtrace.join('\n')}"
       puts "\nError: Did not successfully generate #{hpxml_file}."
@@ -506,21 +551,15 @@ def create_hpxmls
       puts "Warning: Extra HPXML file found at #{File.absolute_path(hpxml)}"
     end
   end
-
-  if hpxml_docs.size != hpxmls_files.size
-    return
-  end
-
-  return hpxml_docs
 end
 
 def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   if hpxml_file.include? 'ASHRAE_Standard_140'
-    args['hpxml_path'] = "../workflow/tests/#{hpxml_file}"
+    args['hpxml_path'] = "workflow/tests/#{hpxml_file}"
   else
-    args['hpxml_path'] = "../workflow/sample_files/#{hpxml_file}"
+    args['hpxml_path'] = "workflow/sample_files/#{hpxml_file}"
   end
-  args['apply_validation'] = true
+  args['apply_validation'] = false
 
   if ['base.xml'].include? hpxml_file
     args['simulation_control_timestep'] = 60
@@ -553,10 +592,9 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['geometry_unit_num_bedrooms'] = 3
     args['geometry_unit_num_bathrooms'] = 2
     args['geometry_unit_num_occupants'] = 3
-    args['geometry_has_flue_or_chimney'] = Constants.Auto
     args['floor_over_foundation_assembly_r'] = 0
     args['floor_over_garage_assembly_r'] = 0
-    args['foundation_wall_type'] = Constants.Auto
+    args['floor_type'] = HPXML::FloorTypeWoodFrame
     args['foundation_wall_thickness'] = 8.0
     args['foundation_wall_insulation_r'] = 8.9
     args['foundation_wall_insulation_distance_to_top'] = 0.0
@@ -579,10 +617,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['neighbor_back_distance'] = 0
     args['neighbor_left_distance'] = 0
     args['neighbor_right_distance'] = 0
-    args['neighbor_front_height'] = Constants.Auto
-    args['neighbor_back_height'] = Constants.Auto
-    args['neighbor_left_height'] = Constants.Auto
-    args['neighbor_right_height'] = Constants.Auto
     args['wall_type'] = HPXML::WallTypeWoodStud
     args['wall_siding_type'] = HPXML::SidingTypeWood
     args['wall_color'] = HPXML::ColorMedium
@@ -624,7 +658,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['air_leakage_units'] = HPXML::UnitsACH
     args['air_leakage_house_pressure'] = 50
     args['air_leakage_value'] = 3
-    args['site_shielding_of_home'] = Constants.Auto
     args['heating_system_type'] = HPXML::HVACTypeFurnace
     args['heating_system_fuel'] = HPXML::FuelTypeNaturalGas
     args['heating_system_heating_efficiency'] = 0.92
@@ -646,7 +679,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['heat_pump_cooling_compressor_type'] = HPXML::HVACCompressorTypeSingleStage
     args['heat_pump_cooling_sensible_heat_fraction'] = 0.73
     args['heat_pump_heating_capacity'] = 36000.0
-    args['heat_pump_heating_capacity_17_f'] = Constants.Auto
     args['heat_pump_cooling_capacity'] = 36000.0
     args['heat_pump_fraction_heat_load_served'] = 1
     args['heat_pump_fraction_cool_load_served'] = 1
@@ -670,7 +702,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['heating_system_2_type'] = 'none'
     args['heating_system_2_fuel'] = HPXML::FuelTypeElectricity
     args['heating_system_2_heating_efficiency'] = 1.0
-    args['heating_system_2_heating_capacity'] = Constants.Auto
     args['heating_system_2_fraction_heat_load_served'] = 0.25
     args['mech_vent_fan_type'] = 'none'
     args['mech_vent_flow_rate'] = 110
@@ -690,8 +721,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['kitchen_fans_quantity'] = 0
     args['bathroom_fans_quantity'] = 0
     args['whole_house_fan_present'] = false
-    args['whole_house_fan_flow_rate'] = 4500
-    args['whole_house_fan_power'] = 300
     args['water_heater_type'] = HPXML::WaterHeaterTypeStorage
     args['water_heater_fuel_type'] = HPXML::FuelTypeElectricity
     args['water_heater_location'] = HPXML::LocationLivingSpace
@@ -700,7 +729,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['water_heater_efficiency'] = 0.95
     args['water_heater_recovery_efficiency'] = 0.76
     args['water_heater_heating_capacity'] = 18767
-    args['water_heater_standby_loss'] = 0
     args['water_heater_jacket_rvalue'] = 0
     args['water_heater_setpoint_temperature'] = 125
     args['water_heater_num_units_served'] = 1
@@ -716,7 +744,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['dwhr_efficiency'] = 0.55
     args['water_fixtures_shower_low_flow'] = true
     args['water_fixtures_sink_low_flow'] = false
-    args['water_fixtures_usage_multiplier'] = 1.0
     args['solar_thermal_system_type'] = 'none'
     args['solar_thermal_collector_area'] = 40.0
     args['solar_thermal_collector_loop_type'] = HPXML::SolarThermalLoopTypeDirect
@@ -725,46 +752,34 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['solar_thermal_collector_tilt'] = 20
     args['solar_thermal_collector_rated_optical_efficiency'] = 0.5
     args['solar_thermal_collector_rated_thermal_losses'] = 0.2799
-    args['solar_thermal_storage_volume'] = Constants.Auto
     args['solar_thermal_solar_fraction'] = 0
-    args['pv_system_module_type'] = 'none'
-    args['pv_system_location'] = Constants.Auto
-    args['pv_system_tracking'] = Constants.Auto
+    args['pv_system_present'] = false
     args['pv_system_array_azimuth'] = 180
     args['pv_system_array_tilt'] = 20
     args['pv_system_max_power_output'] = 4000
-    args['pv_system_inverter_efficiency'] = 0.96
-    args['pv_system_system_losses_fraction'] = 0.14
-    args['pv_system_num_bedrooms_served'] = 3
-    args['pv_system_2_module_type'] = 'none'
-    args['pv_system_2_location'] = Constants.Auto
-    args['pv_system_2_tracking'] = Constants.Auto
+    args['pv_system_2_present'] = false
     args['pv_system_2_array_azimuth'] = 180
     args['pv_system_2_array_tilt'] = 20
     args['pv_system_2_max_power_output'] = 4000
-    args['battery_location'] = 'none'
-    args['battery_power'] = Constants.Auto
-    args['battery_capacity'] = Constants.Auto
+    args['battery_present'] = false
+    args['lighting_present'] = true
     args['lighting_interior_fraction_cfl'] = 0.4
     args['lighting_interior_fraction_lfl'] = 0.1
     args['lighting_interior_fraction_led'] = 0.25
-    args['lighting_interior_usage_multiplier'] = 1.0
     args['lighting_exterior_fraction_cfl'] = 0.4
     args['lighting_exterior_fraction_lfl'] = 0.1
     args['lighting_exterior_fraction_led'] = 0.25
-    args['lighting_exterior_usage_multiplier'] = 1.0
     args['lighting_garage_fraction_cfl'] = 0.4
     args['lighting_garage_fraction_lfl'] = 0.1
     args['lighting_garage_fraction_led'] = 0.25
-    args['lighting_garage_usage_multiplier'] = 1.0
     args['holiday_lighting_present'] = false
-    args['holiday_lighting_daily_kwh'] = Constants.Auto
     args['dehumidifier_type'] = 'none'
     args['dehumidifier_efficiency_type'] = 'EnergyFactor'
     args['dehumidifier_efficiency'] = 1.8
     args['dehumidifier_capacity'] = 40
     args['dehumidifier_rh_setpoint'] = 0.5
     args['dehumidifier_fraction_dehumidification_load_served'] = 1
+    args['clothes_washer_present'] = true
     args['clothes_washer_location'] = HPXML::LocationLivingSpace
     args['clothes_washer_efficiency_type'] = 'IntegratedModifiedEnergyFactor'
     args['clothes_washer_efficiency'] = 1.21
@@ -774,13 +789,13 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['clothes_washer_label_annual_gas_cost'] = 27.0
     args['clothes_washer_label_usage'] = 6.0
     args['clothes_washer_capacity'] = 3.2
-    args['clothes_washer_usage_multiplier'] = 1.0
+    args['clothes_dryer_present'] = true
     args['clothes_dryer_location'] = HPXML::LocationLivingSpace
     args['clothes_dryer_fuel_type'] = HPXML::FuelTypeElectricity
     args['clothes_dryer_efficiency_type'] = 'CombinedEnergyFactor'
     args['clothes_dryer_efficiency'] = 3.73
     args['clothes_dryer_vented_flow_rate'] = 150.0
-    args['clothes_dryer_usage_multiplier'] = 1.0
+    args['dishwasher_present'] = true
     args['dishwasher_location'] = HPXML::LocationLivingSpace
     args['dishwasher_efficiency_type'] = 'RatedAnnualkWh'
     args['dishwasher_efficiency'] = 307
@@ -789,66 +804,35 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['dishwasher_label_annual_gas_cost'] = 22.32
     args['dishwasher_label_usage'] = 4.0
     args['dishwasher_place_setting_capacity'] = 12
-    args['dishwasher_usage_multiplier'] = 1.0
+    args['refrigerator_present'] = true
     args['refrigerator_location'] = HPXML::LocationLivingSpace
     args['refrigerator_rated_annual_kwh'] = 650.0
-    args['refrigerator_usage_multiplier'] = 1.0
-    args['extra_refrigerator_location'] = 'none'
-    args['extra_refrigerator_rated_annual_kwh'] = Constants.Auto
-    args['extra_refrigerator_usage_multiplier'] = 1.0
-    args['freezer_location'] = 'none'
-    args['freezer_rated_annual_kwh'] = Constants.Auto
-    args['freezer_usage_multiplier'] = 1.0
+    args['extra_refrigerator_present'] = false
+    args['freezer_present'] = false
+    args['cooking_range_oven_present'] = true
     args['cooking_range_oven_location'] = HPXML::LocationLivingSpace
     args['cooking_range_oven_fuel_type'] = HPXML::FuelTypeElectricity
     args['cooking_range_oven_is_induction'] = false
     args['cooking_range_oven_is_convection'] = false
-    args['cooking_range_oven_usage_multiplier'] = 1.0
     args['ceiling_fan_present'] = false
-    args['ceiling_fan_efficiency'] = Constants.Auto
-    args['ceiling_fan_quantity'] = Constants.Auto
-    args['ceiling_fan_cooling_setpoint_temp_offset'] = 0
     args['misc_plug_loads_television_present'] = true
     args['misc_plug_loads_television_annual_kwh'] = 620.0
-    args['misc_plug_loads_television_usage_multiplier'] = 1.0
     args['misc_plug_loads_other_annual_kwh'] = 2457.0
     args['misc_plug_loads_other_frac_sensible'] = 0.855
     args['misc_plug_loads_other_frac_latent'] = 0.045
-    args['misc_plug_loads_other_usage_multiplier'] = 1.0
     args['misc_plug_loads_well_pump_present'] = false
-    args['misc_plug_loads_well_pump_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_well_pump_usage_multiplier'] = 0.0
     args['misc_plug_loads_vehicle_present'] = false
-    args['misc_plug_loads_vehicle_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_vehicle_usage_multiplier'] = 0.0
     args['misc_fuel_loads_grill_present'] = false
     args['misc_fuel_loads_grill_fuel_type'] = HPXML::FuelTypeNaturalGas
-    args['misc_fuel_loads_grill_annual_therm'] = Constants.Auto
-    args['misc_fuel_loads_grill_usage_multiplier'] = 0.0
     args['misc_fuel_loads_lighting_present'] = false
     args['misc_fuel_loads_lighting_fuel_type'] = HPXML::FuelTypeNaturalGas
-    args['misc_fuel_loads_lighting_annual_therm'] = Constants.Auto
-    args['misc_fuel_loads_lighting_usage_multiplier'] = 0.0
     args['misc_fuel_loads_fireplace_present'] = false
     args['misc_fuel_loads_fireplace_fuel_type'] = HPXML::FuelTypeNaturalGas
-    args['misc_fuel_loads_fireplace_annual_therm'] = Constants.Auto
-    args['misc_fuel_loads_fireplace_frac_sensible'] = Constants.Auto
-    args['misc_fuel_loads_fireplace_frac_latent'] = Constants.Auto
-    args['misc_fuel_loads_fireplace_usage_multiplier'] = 0.0
     args['pool_present'] = false
-    args['pool_pump_annual_kwh'] = Constants.Auto
-    args['pool_pump_usage_multiplier'] = 1.0
     args['pool_heater_type'] = HPXML::HeaterTypeElectricResistance
-    args['pool_heater_annual_kwh'] = Constants.Auto
-    args['pool_heater_annual_therm'] = Constants.Auto
-    args['pool_heater_usage_multiplier'] = 1.0
     args['hot_tub_present'] = false
-    args['hot_tub_pump_annual_kwh'] = Constants.Auto
-    args['hot_tub_pump_usage_multiplier'] = 1.0
     args['hot_tub_heater_type'] = HPXML::HeaterTypeElectricResistance
-    args['hot_tub_heater_annual_kwh'] = Constants.Auto
-    args['hot_tub_heater_annual_therm'] = Constants.Auto
-    args['hot_tub_heater_usage_multiplier'] = 1.0
+    args['utility_bill_scenario_names'] = 'Bills'
   elsif ['ASHRAE_Standard_140/L100AC.xml'].include? hpxml_file
     args['weather_station_epw_filepath'] = 'USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw'
     args['geometry_unit_type'] = HPXML::ResidentialTypeSFD
@@ -874,12 +858,10 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['geometry_attic_type'] = HPXML::AtticTypeVented
     args['geometry_eaves_depth'] = 0
     args['geometry_unit_num_bedrooms'] = 3
-    args['geometry_unit_num_bathrooms'] = Constants.Auto
     args['geometry_unit_num_occupants'] = 0
-    args['geometry_has_flue_or_chimney'] = Constants.Auto
     args['floor_over_foundation_assembly_r'] = 14.15
     args['floor_over_garage_assembly_r'] = 0
-    args['foundation_wall_type'] = Constants.Auto
+    args['floor_type'] = HPXML::FloorTypeWoodFrame
     args['foundation_wall_thickness'] = 6.0
     args['foundation_wall_insulation_r'] = 0
     args['foundation_wall_insulation_distance_to_top'] = 0
@@ -902,10 +884,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['neighbor_back_distance'] = 0
     args['neighbor_left_distance'] = 0
     args['neighbor_right_distance'] = 0
-    args['neighbor_front_height'] = Constants.Auto
-    args['neighbor_back_height'] = Constants.Auto
-    args['neighbor_left_height'] = Constants.Auto
-    args['neighbor_right_height'] = Constants.Auto
     args['wall_type'] = HPXML::WallTypeWoodStud
     args['wall_siding_type'] = HPXML::SidingTypeWood
     args['wall_color'] = HPXML::ColorMedium
@@ -947,18 +925,15 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['air_leakage_units'] = HPXML::UnitsACHNatural
     args['air_leakage_house_pressure'] = 50
     args['air_leakage_value'] = 0.67
-    args['site_shielding_of_home'] = Constants.Auto
     args['heating_system_type'] = 'none'
     args['heating_system_fuel'] = HPXML::FuelTypeNaturalGas
     args['heating_system_heating_efficiency'] = 0
-    args['heating_system_heating_capacity'] = Constants.Auto
     args['heating_system_fraction_heat_load_served'] = 0
     args['cooling_system_type'] = 'none'
     args['cooling_system_cooling_efficiency_type'] = HPXML::UnitsSEER
     args['cooling_system_cooling_efficiency'] = 0
     args['cooling_system_cooling_compressor_type'] = HPXML::HVACCompressorTypeSingleStage
     args['cooling_system_cooling_sensible_heat_fraction'] = 0
-    args['cooling_system_cooling_capacity'] = Constants.Auto
     args['cooling_system_fraction_cool_load_served'] = 0
     args['cooling_system_is_ducted'] = false
     args['heat_pump_type'] = 'none'
@@ -968,15 +943,11 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['heat_pump_cooling_efficiency'] = 0
     args['heat_pump_cooling_compressor_type'] = HPXML::HVACCompressorTypeSingleStage
     args['heat_pump_cooling_sensible_heat_fraction'] = 0
-    args['heat_pump_heating_capacity'] = Constants.Auto
-    args['heat_pump_heating_capacity_17_f'] = Constants.Auto
-    args['heat_pump_cooling_capacity'] = Constants.Auto
     args['heat_pump_fraction_heat_load_served'] = 0
     args['heat_pump_fraction_cool_load_served'] = 0
     args['heat_pump_backup_type'] = 'none'
     args['heat_pump_backup_fuel'] = HPXML::FuelTypeElectricity
     args['heat_pump_backup_heating_efficiency'] = 0
-    args['heat_pump_backup_heating_capacity'] = Constants.Auto
     args['hvac_control_heating_weekday_setpoint'] = 68
     args['hvac_control_heating_weekend_setpoint'] = 68
     args['hvac_control_cooling_weekday_setpoint'] = 78
@@ -993,7 +964,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['heating_system_2_type'] = 'none'
     args['heating_system_2_fuel'] = HPXML::FuelTypeElectricity
     args['heating_system_2_heating_efficiency'] = 0
-    args['heating_system_2_heating_capacity'] = Constants.Auto
     args['heating_system_2_fraction_heat_load_served'] = 0
     args['mech_vent_fan_type'] = 'none'
     args['mech_vent_flow_rate'] = 0
@@ -1013,8 +983,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['kitchen_fans_quantity'] = 0
     args['bathroom_fans_quantity'] = 0
     args['whole_house_fan_present'] = false
-    args['whole_house_fan_flow_rate'] = 0
-    args['whole_house_fan_power'] = 0
     args['water_heater_type'] = 'none'
     args['water_heater_fuel_type'] = HPXML::FuelTypeElectricity
     args['water_heater_location'] = HPXML::LocationLivingSpace
@@ -1022,8 +990,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['water_heater_efficiency_type'] = 'EnergyFactor'
     args['water_heater_efficiency'] = 0
     args['water_heater_recovery_efficiency'] = 0
-    args['water_heater_heating_capacity'] = Constants.Auto
-    args['water_heater_standby_loss'] = 0
     args['water_heater_jacket_rvalue'] = 0
     args['water_heater_setpoint_temperature'] = 0
     args['water_heater_num_units_served'] = 0
@@ -1048,26 +1014,16 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['solar_thermal_collector_tilt'] = 0
     args['solar_thermal_collector_rated_optical_efficiency'] = 0
     args['solar_thermal_collector_rated_thermal_losses'] = 0
-    args['solar_thermal_storage_volume'] = Constants.Auto
     args['solar_thermal_solar_fraction'] = 0
-    args['pv_system_module_type'] = 'none'
-    args['pv_system_location'] = Constants.Auto
-    args['pv_system_tracking'] = Constants.Auto
+    args['pv_system_present'] = false
     args['pv_system_array_azimuth'] = 0
     args['pv_system_array_tilt'] = 0
     args['pv_system_max_power_output'] = 0
-    args['pv_system_inverter_efficiency'] = 0
-    args['pv_system_system_losses_fraction'] = 0
-    args['pv_system_num_bedrooms_served'] = 0
-    args['pv_system_2_module_type'] = 'none'
-    args['pv_system_2_location'] = Constants.Auto
-    args['pv_system_2_tracking'] = Constants.Auto
+    args['pv_system_2_present'] = false
     args['pv_system_2_array_azimuth'] = 0
     args['pv_system_2_array_tilt'] = 0
     args['pv_system_2_max_power_output'] = 0
-    args['battery_location'] = 'none'
-    args['battery_power'] = Constants.Auto
-    args['battery_capacity'] = Constants.Auto
+    args['battery_present'] = false
     args['lighting_present'] = false
     args['lighting_interior_fraction_cfl'] = 0
     args['lighting_interior_fraction_lfl'] = 0
@@ -1082,97 +1038,41 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['lighting_garage_fraction_led'] = 0
     args['lighting_garage_usage_multiplier'] = 0
     args['holiday_lighting_present'] = false
-    args['holiday_lighting_daily_kwh'] = Constants.Auto
     args['dehumidifier_type'] = 'none'
     args['dehumidifier_efficiency_type'] = 'EnergyFactor'
     args['dehumidifier_efficiency'] = 0
     args['dehumidifier_capacity'] = 0
     args['dehumidifier_rh_setpoint'] = 0
     args['dehumidifier_fraction_dehumidification_load_served'] = 0
-    args['clothes_washer_location'] = 'none'
+    args['clothes_washer_present'] = false
     args['clothes_washer_efficiency_type'] = 'IntegratedModifiedEnergyFactor'
-    args['clothes_washer_efficiency'] = 0
-    args['clothes_washer_rated_annual_kwh'] = 0
-    args['clothes_washer_label_electric_rate'] = 0
-    args['clothes_washer_label_gas_rate'] = 0
-    args['clothes_washer_label_annual_gas_cost'] = 0
-    args['clothes_washer_label_usage'] = 0
-    args['clothes_washer_capacity'] = 0
-    args['clothes_washer_usage_multiplier'] = 0
-    args['clothes_dryer_location'] = 'none'
+    args['clothes_dryer_present'] = false
     args['clothes_dryer_fuel_type'] = HPXML::FuelTypeElectricity
     args['clothes_dryer_efficiency_type'] = 'CombinedEnergyFactor'
-    args['clothes_dryer_efficiency'] = 0
-    args['clothes_dryer_vented_flow_rate'] = 0
-    args['clothes_dryer_usage_multiplier'] = 0
-    args['dishwasher_location'] = 'none'
+    args['dishwasher_present'] = false
     args['dishwasher_efficiency_type'] = 'RatedAnnualkWh'
-    args['dishwasher_efficiency'] = 0
-    args['dishwasher_label_electric_rate'] = 0
-    args['dishwasher_label_gas_rate'] = 0
-    args['dishwasher_label_annual_gas_cost'] = 0
-    args['dishwasher_label_usage'] = 0
-    args['dishwasher_place_setting_capacity'] = 0
-    args['dishwasher_usage_multiplier'] = 0
-    args['refrigerator_location'] = 'none'
-    args['refrigerator_rated_annual_kwh'] = 0
-    args['refrigerator_usage_multiplier'] = 0
-    args['extra_refrigerator_location'] = 'none'
-    args['extra_refrigerator_rated_annual_kwh'] = Constants.Auto
-    args['extra_refrigerator_usage_multiplier'] = 0
-    args['freezer_location'] = 'none'
-    args['freezer_rated_annual_kwh'] = Constants.Auto
-    args['freezer_usage_multiplier'] = 0
-    args['cooking_range_oven_location'] = 'none'
+    args['refrigerator_present'] = false
+    args['extra_refrigerator_present'] = false
+    args['freezer_present'] = false
+    args['cooking_range_oven_present'] = false
     args['cooking_range_oven_fuel_type'] = HPXML::FuelTypeElectricity
-    args['cooking_range_oven_is_induction'] = false
-    args['cooking_range_oven_is_convection'] = false
-    args['cooking_range_oven_usage_multiplier'] = 0
     args['ceiling_fan_present'] = false
-    args['ceiling_fan_efficiency'] = Constants.Auto
-    args['ceiling_fan_quantity'] = Constants.Auto
-    args['ceiling_fan_cooling_setpoint_temp_offset'] = 0
     args['misc_plug_loads_television_present'] = false
-    args['misc_plug_loads_television_annual_kwh'] = 0
-    args['misc_plug_loads_television_usage_multiplier'] = 0
     args['misc_plug_loads_other_annual_kwh'] = 7302.0
     args['misc_plug_loads_other_frac_sensible'] = 0.822
     args['misc_plug_loads_other_frac_latent'] = 0.178
-    args['misc_plug_loads_other_usage_multiplier'] = 1.0
     args['misc_plug_loads_well_pump_present'] = false
-    args['misc_plug_loads_well_pump_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_well_pump_usage_multiplier'] = 0
     args['misc_plug_loads_vehicle_present'] = false
-    args['misc_plug_loads_vehicle_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_vehicle_usage_multiplier'] = 0
     args['misc_fuel_loads_grill_present'] = false
     args['misc_fuel_loads_grill_fuel_type'] = HPXML::FuelTypeNaturalGas
-    args['misc_fuel_loads_grill_annual_therm'] = Constants.Auto
-    args['misc_fuel_loads_grill_usage_multiplier'] = 0
     args['misc_fuel_loads_lighting_present'] = false
     args['misc_fuel_loads_lighting_fuel_type'] = HPXML::FuelTypeNaturalGas
-    args['misc_fuel_loads_lighting_annual_therm'] = Constants.Auto
-    args['misc_fuel_loads_lighting_usage_multiplier'] = 0
     args['misc_fuel_loads_fireplace_present'] = false
     args['misc_fuel_loads_fireplace_fuel_type'] = HPXML::FuelTypeNaturalGas
-    args['misc_fuel_loads_fireplace_annual_therm'] = Constants.Auto
-    args['misc_fuel_loads_fireplace_frac_sensible'] = Constants.Auto
-    args['misc_fuel_loads_fireplace_frac_latent'] = Constants.Auto
-    args['misc_fuel_loads_fireplace_usage_multiplier'] = 0
     args['pool_present'] = false
-    args['pool_pump_annual_kwh'] = Constants.Auto
-    args['pool_pump_usage_multiplier'] = 0
     args['pool_heater_type'] = HPXML::HeaterTypeElectricResistance
-    args['pool_heater_annual_kwh'] = Constants.Auto
-    args['pool_heater_annual_therm'] = Constants.Auto
-    args['pool_heater_usage_multiplier'] = 0
     args['hot_tub_present'] = false
-    args['hot_tub_pump_annual_kwh'] = Constants.Auto
-    args['hot_tub_pump_usage_multiplier'] = 0
     args['hot_tub_heater_type'] = HPXML::HeaterTypeElectricResistance
-    args['hot_tub_heater_annual_kwh'] = Constants.Auto
-    args['hot_tub_heater_annual_therm'] = Constants.Auto
-    args['hot_tub_heater_usage_multiplier'] = 0
   end
 
   # ASHRAE 140
@@ -1249,7 +1149,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   if ['base-appliances-coal.xml'].include? hpxml_file
     args['clothes_dryer_fuel_type'] = HPXML::FuelTypeCoal
     args['clothes_dryer_efficiency'] = 3.3
-    args['clothes_dryer_vented_flow_rate'] = Constants.Auto
+    args.delete('clothes_dryer_vented_flow_rate')
     args['cooking_range_oven_fuel_type'] = HPXML::FuelTypeCoal
   elsif ['base-appliances-dehumidifier.xml'].include? hpxml_file
     args['dehumidifier_type'] = HPXML::DehumidifierTypePortable
@@ -1261,7 +1161,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-appliances-gas.xml'].include? hpxml_file
     args['clothes_dryer_fuel_type'] = HPXML::FuelTypeNaturalGas
     args['clothes_dryer_efficiency'] = 3.3
-    args['clothes_dryer_vented_flow_rate'] = Constants.Auto
+    args.delete('clothes_dryer_vented_flow_rate')
     args['cooking_range_oven_fuel_type'] = HPXML::FuelTypeNaturalGas
   elsif ['base-appliances-modified.xml'].include? hpxml_file
     args['clothes_washer_efficiency_type'] = 'ModifiedEnergyFactor'
@@ -1273,27 +1173,27 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['dishwasher_efficiency'] = 0.7
     args['dishwasher_place_setting_capacity'] = 6
   elsif ['base-appliances-none.xml'].include? hpxml_file
-    args['clothes_washer_location'] = 'none'
-    args['clothes_dryer_location'] = 'none'
-    args['dishwasher_location'] = 'none'
-    args['refrigerator_location'] = 'none'
-    args['cooking_range_oven_location'] = 'none'
+    args['clothes_washer_present'] = false
+    args['clothes_dryer_present'] = false
+    args['dishwasher_present'] = false
+    args['refrigerator_present'] = false
+    args['cooking_range_oven_present'] = false
   elsif ['base-appliances-oil.xml',
          'base-appliances-oil-location-miami-fl.xml'].include? hpxml_file
     args['clothes_dryer_fuel_type'] = HPXML::FuelTypeOil
     args['clothes_dryer_efficiency'] = 3.3
-    args['clothes_dryer_vented_flow_rate'] = Constants.Auto
+    args.delete('clothes_dryer_vented_flow_rate')
     args['cooking_range_oven_fuel_type'] = HPXML::FuelTypeOil
   elsif ['base-appliances-propane.xml',
          'base-appliances-propane-location-portland-or.xml'].include? hpxml_file
     args['clothes_dryer_fuel_type'] = HPXML::FuelTypePropane
     args['clothes_dryer_efficiency'] = 3.3
-    args['clothes_dryer_vented_flow_rate'] = Constants.Auto
+    args.delete('clothes_dryer_vented_flow_rate')
     args['cooking_range_oven_fuel_type'] = HPXML::FuelTypePropane
   elsif ['base-appliances-wood.xml'].include? hpxml_file
     args['clothes_dryer_fuel_type'] = HPXML::FuelTypeWoodCord
     args['clothes_dryer_efficiency'] = 3.3
-    args['clothes_dryer_vented_flow_rate'] = Constants.Auto
+    args.delete('clothes_dryer_vented_flow_rate')
     args['cooking_range_oven_fuel_type'] = HPXML::FuelTypeWoodCord
   end
 
@@ -1352,6 +1252,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   if ['base-bldgtype-single-family-attached.xml'].include? hpxml_file
     args['geometry_unit_type'] = HPXML::ResidentialTypeSFA
     args['geometry_unit_cfa'] = 1800.0
+    args['geometry_unit_aspect_ratio'] = 0.6667
     args['geometry_building_num_units'] = 3
     args['geometry_unit_right_wall_is_adiabatic'] = true
     args['window_front_wwr'] = 0.18
@@ -1384,6 +1285,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   if ['base-bldgtype-multifamily.xml'].include? hpxml_file
     args['geometry_unit_type'] = HPXML::ResidentialTypeApartment
     args['geometry_unit_cfa'] = 900.0
+    args['geometry_unit_aspect_ratio'] = 0.6667
     args['geometry_foundation_type'] = HPXML::FoundationTypeAboveApartment
     args['geometry_attic_type'] = HPXML::AtticTypeBelowApartment
     args['geometry_unit_right_wall_is_adiabatic'] = true
@@ -1432,6 +1334,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['mech_vent_shared_precooling_efficiency'] = 4.0
     args['mech_vent_shared_precooling_fraction_cool_load_served'] = 0.8
   elsif ['base-bldgtype-multifamily-shared-pv.xml'].include? hpxml_file
+    args['pv_system_present'] = true
     args['pv_system_num_bedrooms_served'] = 6 * 3
     args['pv_system_location'] = HPXML::LocationGround
     args['pv_system_module_type'] = HPXML::PVModuleTypeStandard
@@ -1457,19 +1360,19 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
       'base-bldgtype-multifamily-calctype-operational.xml'].include? hpxml_file
     args['occupancy_calculation_type'] = HPXML::OccupancyCalculationTypeOperational
     args['geometry_unit_num_occupants'] = 1
-    args['misc_plug_loads_television_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_other_annual_kwh'] = Constants.Auto
-    args['pool_pump_annual_kwh'] = Constants.Auto
-    args['pool_heater_annual_therm'] = Constants.Auto
-    args['pool_heater_annual_kwh'] = Constants.Auto
-    args['hot_tub_pump_annual_kwh'] = Constants.Auto
-    args['hot_tub_heater_annual_therm'] = Constants.Auto
-    args['hot_tub_heater_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_well_pump_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_vehicle_annual_kwh'] = Constants.Auto
-    args['misc_fuel_loads_grill_annual_therm'] = Constants.Auto
-    args['misc_fuel_loads_lighting_annual_therm'] = Constants.Auto
-    args['misc_fuel_loads_fireplace_annual_therm'] = Constants.Auto
+    args.delete('misc_plug_loads_television_annual_kwh')
+    args.delete('misc_plug_loads_other_annual_kwh')
+    args.delete('pool_pump_annual_kwh')
+    args.delete('pool_heater_annual_therm')
+    args.delete('pool_heater_annual_kwh')
+    args.delete('hot_tub_pump_annual_kwh')
+    args.delete('hot_tub_heater_annual_therm')
+    args.delete('hot_tub_heater_annual_kwh')
+    args.delete('misc_plug_loads_well_pump_annual_kwh')
+    args.delete('misc_plug_loads_vehicle_annual_kwh')
+    args.delete('misc_fuel_loads_grill_annual_therm')
+    args.delete('misc_fuel_loads_lighting_annual_therm')
+    args.delete('misc_fuel_loads_fireplace_annual_therm')
   elsif ['base-calctype-operational-misc-defaults.xml'].include? hpxml_file
     args['occupancy_calculation_type'] = HPXML::OccupancyCalculationTypeOperational
     args['geometry_unit_num_occupants'] = 5
@@ -1478,7 +1381,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   # DHW
   if ['base-dhw-combi-tankless.xml'].include? hpxml_file
     args['water_heater_type'] = HPXML::WaterHeaterTypeCombiTankless
-    args['water_heater_tank_volume'] = Constants.Auto
+    args.delete('water_heater_tank_volume')
   elsif ['base-dhw-combi-tankless-outside.xml',
          'base-dhw-indirect-outside.xml',
          'base-dhw-tank-gas-outside.xml',
@@ -1507,7 +1410,6 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['water_fixtures_sink_low_flow'] = true
   elsif ['base-dhw-none.xml'].include? hpxml_file
     args['water_heater_type'] = 'none'
-    args['dishwasher_location'] = 'none'
   elsif ['base-dhw-recirc-demand.xml'].include? hpxml_file
     args['hot_water_distribution_system_type'] = HPXML::DHWDistTypeRecirc
     args['hot_water_distribution_recirc_control_type'] = HPXML::DHWRecirControlTypeSensor
@@ -1581,7 +1483,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['solar_thermal_storage_volume'] = 60
   elsif ['base-dhw-tankless-electric.xml'].include? hpxml_file
     args['water_heater_type'] = HPXML::WaterHeaterTypeTankless
-    args['water_heater_tank_volume'] = Constants.Auto
+    args.delete('water_heater_tank_volume')
     args['water_heater_efficiency'] = 0.99
   elsif ['base-dhw-tankless-electric-uef.xml'].include? hpxml_file
     args['water_heater_efficiency_type'] = 'UniformEnergyFactor'
@@ -1589,7 +1491,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-dhw-tankless-gas.xml'].include? hpxml_file
     args['water_heater_type'] = HPXML::WaterHeaterTypeTankless
     args['water_heater_fuel_type'] = HPXML::FuelTypeNaturalGas
-    args['water_heater_tank_volume'] = Constants.Auto
+    args.delete('water_heater_tank_volume')
     args['water_heater_efficiency'] = 0.82
   elsif ['base-dhw-tankless-gas-uef.xml'].include? hpxml_file
     args['water_heater_efficiency_type'] = 'UniformEnergyFactor'
@@ -1609,7 +1511,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-dhw-desuperheater-tankless.xml'].include? hpxml_file
     args['water_heater_uses_desuperheater'] = true
     args['water_heater_type'] = HPXML::WaterHeaterTypeTankless
-    args['water_heater_tank_volume'] = Constants.Auto
+    args.delete('water_heater_tank_volume')
     args['water_heater_efficiency'] = 0.99
   elsif ['base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml'].include? hpxml_file
     args['water_heater_operating_mode'] = HPXML::WaterHeaterOperatingModeHeatPumpOnly
@@ -1688,6 +1590,8 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['overhangs_right_depth'] = 1.5
     args['overhangs_right_distance_to_top_of_window'] = 2.0
     args['overhangs_right_distance_to_bottom_of_window'] = 6.0
+  elsif ['base-enclosure-windows-natural-ventilation-availability.xml'].include? hpxml_file
+    args['window_natvent_availability'] = 7
   elsif ['base-enclosure-windows-none.xml'].include? hpxml_file
     args['window_area_front'] = 0
     args['window_area_back'] = 0
@@ -1715,7 +1619,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-foundation-conditioned-basement-slab-insulation.xml'].include? hpxml_file
     args['slab_under_insulation_r'] = 10
     args['slab_under_width'] = 4
-  elsif ['base-foundation-conditioned-basement-wall-interior-insulation.xml'].include? hpxml_file
+  elsif ['base-foundation-conditioned-basement-wall-insulation.xml'].include? hpxml_file
     args['foundation_wall_type'] = HPXML::FoundationWallTypeConcreteBlockFoamCore
     args['foundation_wall_insulation_r'] = 18.9
     args['foundation_wall_insulation_distance_to_top'] = 1.0
@@ -1724,7 +1628,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['geometry_foundation_type'] = HPXML::FoundationTypeSlab
     args['geometry_foundation_height'] = 0.0
     args['geometry_foundation_height_above_grade'] = 0.0
-    args['foundation_wall_insulation_distance_to_bottom'] = Constants.Auto
+    args.delete('foundation_wall_insulation_distance_to_bottom')
     args['slab_under_insulation_r'] = 5
     args['slab_under_width'] = 999
     args['slab_carpet_fraction'] = 1.0
@@ -1805,6 +1709,11 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['heat_pump_type'] = HPXML::HVACTypeHeatPumpAirToAir
     args['heat_pump_heating_capacity_17_f'] = args['heat_pump_heating_capacity'] * 0.6
     args['heat_pump_backup_type'] = HPXML::HeatPumpBackupTypeIntegrated
+  elsif ['base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml'].include? hpxml_file
+    args['heat_pump_cooling_efficiency_type'] = HPXML::UnitsSEER2
+    args['heat_pump_cooling_efficiency'] = (args['heat_pump_cooling_efficiency'] * 0.95).round(1)
+    args['heat_pump_heating_efficiency_type'] = HPXML::UnitsHSPF2
+    args['heat_pump_heating_efficiency'] = (args['heat_pump_heating_efficiency'] * 0.85).round(1)
   elsif ['base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml'].include? hpxml_file
     args['heat_pump_heating_capacity'] = 0.0
     args['heat_pump_heating_capacity_17_f'] = 0.0
@@ -1848,21 +1757,23 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-switchover-temperature.xml'].include? hpxml_file
     args['heat_pump_backup_heating_switchover_temp'] = 25
   elsif hpxml_file.include? 'autosize'
-    args['heating_system_heating_capacity'] = Constants.Auto
-    args['heating_system_2_heating_capacity'] = Constants.Auto
-    args['cooling_system_cooling_capacity'] = Constants.Auto
+    args.delete('heating_system_heating_capacity')
+    args.delete('heating_system_2_heating_capacity')
+    args.delete('cooling_system_cooling_capacity')
+    args.delete('heat_pump_heating_capacity')
+    args.delete('cooling_system_integrated_heating_system_capacity')
     if hpxml_file.include? 'sizing-methodology-hers'
-      args['heat_pump_heating_capacity'] = Constants.AutoHERSForHP
+      args['heat_pump_sizing_methodology'] = HPXML::HeatPumpSizingHERS
     elsif hpxml_file.include? 'sizing-methodology-maxload'
-      args['heat_pump_heating_capacity'] = Constants.AutoMaxLoadForHP
+      args['heat_pump_sizing_methodology'] = HPXML::HeatPumpSizingMaxLoad
     elsif hpxml_file.include? 'sizing-methodology-acca'
-      args['heat_pump_heating_capacity'] = Constants.Auto
+      args['heat_pump_sizing_methodology'] = HPXML::HeatPumpSizingACCA
     else
-      args['heat_pump_heating_capacity'] = Constants.AutoHERSForHP
+      args['heat_pump_sizing_methodology'] = HPXML::HeatPumpSizingHERS
     end
-    args['heat_pump_heating_capacity_17_f'] = Constants.Auto
-    args['heat_pump_backup_heating_capacity'] = Constants.Auto
-    args['heat_pump_cooling_capacity'] = Constants.Auto
+    args.delete('heat_pump_heating_capacity_17_f')
+    args.delete('heat_pump_backup_heating_capacity')
+    args.delete('heat_pump_cooling_capacity')
   elsif ['base-hvac-boiler-coal-only.xml',
          'base-hvac-furnace-coal-only.xml'].include? hpxml_file
     args['heating_system_fuel'] = HPXML::FuelTypeCoal
@@ -1887,6 +1798,9 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['heating_system_fuel'] = HPXML::FuelTypeWoodCord
   elsif ['base-hvac-central-ac-only-1-speed.xml'].include? hpxml_file
     args['heating_system_type'] = 'none'
+  elsif ['base-hvac-central-ac-only-1-speed-seer2.xml'].include? hpxml_file
+    args['cooling_system_cooling_efficiency_type'] = HPXML::UnitsSEER2
+    args['cooling_system_cooling_efficiency'] = (args['cooling_system_cooling_efficiency'] * 0.95).round(1)
   elsif ['base-hvac-central-ac-only-2-speed.xml'].include? hpxml_file
     args['heating_system_type'] = 'none'
     args['cooling_system_cooling_efficiency'] = 18.0
@@ -2013,8 +1927,8 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['heat_pump_cooling_capacity'] = 0.0
     args['heat_pump_fraction_cool_load_served'] = 0
   elsif ['base-hvac-seasons.xml'].include? hpxml_file
-    args['hvac_control_heating_season_period'] = 'Nov 1 - Jun 30'
-    args['hvac_control_cooling_season_period'] = 'Jun 1 - Oct 31'
+    args['hvac_control_heating_season_period'] = 'Nov 1 - May 1'
+    args['hvac_control_cooling_season_period'] = 'Jun 1 - Oct 1'
   elsif ['base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml',
          'base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml',
          'base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml',
@@ -2094,6 +2008,18 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-hvac-room-ac-only-33percent.xml'].include? hpxml_file
     args['cooling_system_fraction_cool_load_served'] = 0.33
     args['cooling_system_cooling_capacity'] = 8000.0
+  elsif ['base-hvac-room-ac-with-heating.xml',
+         'base-hvac-ptac-with-heating-electricity.xml',
+         'base-hvac-ptac-with-heating-natural-gas.xml'].include? hpxml_file
+    args['cooling_system_integrated_heating_system_capacity'] = 36000.0
+    args['cooling_system_integrated_heating_system_fraction_heat_load_served'] = 1.0
+    if ['base-hvac-ptac-with-heating-natural-gas.xml'].include? hpxml_file
+      args['cooling_system_integrated_heating_system_fuel'] = HPXML::FuelTypeNaturalGas
+      args['cooling_system_integrated_heating_system_efficiency_percent'] = 0.8
+    else
+      args['cooling_system_integrated_heating_system_fuel'] = HPXML::FuelTypeElectricity
+      args['cooling_system_integrated_heating_system_efficiency_percent'] = 1.0
+    end
   elsif ['base-hvac-setpoints.xml'].include? hpxml_file
     args['hvac_control_heating_weekday_setpoint'] = 60
     args['hvac_control_heating_weekend_setpoint'] = 60
@@ -2120,15 +2046,14 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['heat_pump_type'] = HPXML::HVACTypeHeatPumpPTHP
     args['heat_pump_cooling_efficiency'] = 11.4
     args['heat_pump_cooling_sensible_heat_fraction'] = 0.65
+  elsif ['base-hvac-room-ac-with-reverse-cycle.xml'].include? hpxml_file
+    args['heat_pump_type'] = HPXML::HVACTypeHeatPumpRoom
   elsif ['base-hvac-ptac.xml'].include? hpxml_file
     args['heating_system_type'] = 'none'
     args['cooling_system_type'] = HPXML::HVACTypePTAC
     args['cooling_system_cooling_efficiency_type'] = HPXML::UnitsEER
     args['cooling_system_cooling_efficiency'] = 10.7
     args['cooling_system_cooling_sensible_heat_fraction'] = 0.65
-  elsif ['base-hvac-ptac-with-heating.xml'].include? hpxml_file
-    args['heating_system_type'] = HPXML::HVACTypePTACHeating
-    args['heating_system_heating_efficiency'] = 1.0
   end
 
   # Lighting
@@ -2178,6 +2103,10 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['site_state_code'] = 'FL'
     args['weather_station_epw_filepath'] = 'USA_FL_Miami.Intl.AP.722020_TMY3.epw'
     args['heating_system_heating_capacity'] = 12000.0
+  elsif ['base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-maxload-miami-fl.xml'].include? hpxml_file
+    args['site_iecc_zone'] = '1A'
+    args['site_state_code'] = 'FL'
+    args['weather_station_epw_filepath'] = 'USA_FL_Miami.Intl.AP.722020_TMY3.epw'
   elsif ['base-location-phoenix-az.xml'].include? hpxml_file
     args['site_iecc_zone'] = '2B'
     args['site_state_code'] = 'AZ'
@@ -2197,6 +2126,8 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-misc-defaults.xml'].include? hpxml_file
     args.delete('site_iecc_zone')
     args.delete('site_state_code')
+  elsif ['base-misc-ground-conductivity.xml'].include? hpxml_file
+    args['site_ground_conductivity'] = 0.8
   end
 
   # Mechanical Ventilation
@@ -2250,6 +2181,8 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['mech_vent_fan_type'] = HPXML::MechVentTypeSupply
   elsif ['base-mechvent-whole-house-fan.xml'].include? hpxml_file
     args['whole_house_fan_present'] = true
+    args['whole_house_fan_flow_rate'] = 4500.0
+    args['whole_house_fan_power'] = 300.0
   end
 
   # Misc
@@ -2258,16 +2191,43 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   end
   if ['base-misc-additional-properties.xml'].include? hpxml_file
     args['additional_properties'] += '|LowIncome=false|Remodeled|Description=2-story home in Denver|comma=,|special=<|special2=>|special3=/|special4=\\'
+  elsif ['base-misc-bills.xml'].include? hpxml_file
+    args['utility_bill_scenario_names'] = 'Bills'
+    args['utility_bill_electricity_fixed_charges'] = '12'
+    args['utility_bill_electricity_marginal_rates'] = '0.12'
+    args['utility_bill_natural_gas_fixed_charges'] = '12'
+    args['utility_bill_natural_gas_marginal_rates'] = '1.10'
+  elsif ['base-misc-bills-none.xml'].include? hpxml_file
+    args.delete('utility_bill_scenario_names')
+  elsif ['base-misc-bills-pv.xml'].include? hpxml_file
+    args['pv_system_max_power_output'] = 10000 # Ensure there is excess annual PV production
+    args['utility_bill_scenario_names'] = 'Net Metering w/ Wholesale Excess Rate, Net Metering w/ Retail Excess Rate, Feed-In Tariff'
+    args['utility_bill_electricity_fixed_charges'] = '10, 10, 10'
+    args['utility_bill_electricity_marginal_rates'] = '0.12, 0.12, 0.12'
+    args['utility_bill_natural_gas_fixed_charges'] = '11, 11, 11'
+    args['utility_bill_natural_gas_marginal_rates'] = '1.10, 1.10, 1.10'
+    args['utility_bill_pv_compensation_types'] = "#{HPXML::PVCompensationTypeNetMetering}, #{HPXML::PVCompensationTypeNetMetering}, #{HPXML::PVCompensationTypeFeedInTariff}"
+    args['utility_bill_pv_net_metering_annual_excess_sellback_rate_types'] = "#{HPXML::PVAnnualExcessSellbackRateTypeUserSpecified}, #{HPXML::PVAnnualExcessSellbackRateTypeRetailElectricityCost}, NA"
+    args['utility_bill_pv_net_metering_annual_excess_sellback_rates'] = '0.035, NA, NA'
+    args['utility_bill_pv_feed_in_tariff_rates'] = 'NA, NA, 0.13'
+    args['utility_bill_pv_monthly_grid_connection_fee_units'] = "#{HPXML::UnitsDollarsPerkW}, #{HPXML::UnitsDollarsPerkW}, #{HPXML::UnitsDollars}"
+    args['utility_bill_pv_monthly_grid_connection_fees'] = '2.5, 2.5, 7.5'
+  elsif ['base-misc-bills-pv-detailed-only.xml'].include? hpxml_file
+    args['utility_bill_scenario_names'] = 'Tiered, TOU, Tiered and TOU, Real-Time Pricing'
+    args['utility_bill_electricity_filepaths'] = '../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json, ../../ReportUtilityBills/resources/detailed_rates/Sample Time-of-Use Rate.json, ../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Time-of-Use Rate.json, ../../ReportUtilityBills/resources/detailed_rates/Sample Real-Time Pricing Rate.json'
+  elsif ['base-misc-bills-pv-mixed.xml'].include? hpxml_file
+    args['utility_bill_scenario_names'] = 'Simple, Detailed'
+    args['utility_bill_electricity_filepaths'] = 'NA, ../../ReportUtilityBills/resources/detailed_rates/Sample Tiered Rate.json'
   elsif ['base-misc-defaults.xml'].include? hpxml_file
     args.delete('simulation_control_timestep')
     args.delete('site_type')
-    args['geometry_unit_num_bathrooms'] = Constants.Auto
-    args['geometry_unit_num_occupants'] = Constants.Auto
-    args['foundation_wall_insulation_distance_to_top'] = Constants.Auto
-    args['foundation_wall_insulation_distance_to_bottom'] = Constants.Auto
-    args['foundation_wall_thickness'] = Constants.Auto
-    args['slab_thickness'] = Constants.Auto
-    args['slab_carpet_fraction'] = Constants.Auto
+    args.delete('geometry_unit_num_bathrooms')
+    args.delete('geometry_unit_num_occupants')
+    args.delete('foundation_wall_insulation_distance_to_top')
+    args.delete('foundation_wall_insulation_distance_to_bottom')
+    args.delete('foundation_wall_thickness')
+    args.delete('slab_thickness')
+    args.delete('slab_carpet_fraction')
     args.delete('roof_material_type')
     args['roof_color'] = HPXML::ColorLight
     args.delete('roof_material_type')
@@ -2278,66 +2238,68 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args.delete('cooling_system_cooling_compressor_type')
     args.delete('cooling_system_cooling_sensible_heat_fraction')
     args['mech_vent_fan_type'] = HPXML::MechVentTypeExhaust
-    args['mech_vent_hours_in_operation'] = Constants.Auto
-    args['mech_vent_fan_power'] = Constants.Auto
-    args['ducts_supply_location'] = Constants.Auto
-    args['ducts_return_location'] = Constants.Auto
-    args['ducts_supply_surface_area'] = Constants.Auto
-    args['ducts_return_surface_area'] = Constants.Auto
+    args.delete('mech_vent_hours_in_operation')
+    args.delete('mech_vent_fan_power')
+    args.delete('ducts_supply_location')
+    args.delete('ducts_return_location')
+    args.delete('ducts_supply_surface_area')
+    args.delete('ducts_return_surface_area')
     args['ducts_number_of_return_registers'] = 2
-    args['kitchen_fans_quantity'] = Constants.Auto
-    args['bathroom_fans_quantity'] = Constants.Auto
-    args['water_heater_location'] = Constants.Auto
-    args['water_heater_tank_volume'] = Constants.Auto
-    args['water_heater_setpoint_temperature'] = Constants.Auto
-    args['hot_water_distribution_standard_piping_length'] = Constants.Auto
-    args['hot_water_distribution_pipe_r'] = Constants.Auto
+    args.delete('kitchen_fans_quantity')
+    args.delete('bathroom_fans_quantity')
+    args.delete('water_heater_location')
+    args.delete('water_heater_tank_volume')
+    args.delete('water_heater_setpoint_temperature')
+    args.delete('hot_water_distribution_standard_piping_length')
+    args.delete('hot_water_distribution_pipe_r')
     args['solar_thermal_system_type'] = HPXML::SolarThermalSystemType
     args['solar_thermal_collector_type'] = HPXML::SolarThermalTypeSingleGlazing
     args['solar_thermal_collector_rated_optical_efficiency'] = 0.77
     args['solar_thermal_collector_rated_thermal_losses'] = 0.793
-    args['pv_system_module_type'] = Constants.Auto
+    args['pv_system_present'] = true
+    args.delete('pv_system_module_type')
     args.delete('pv_system_inverter_efficiency')
     args.delete('pv_system_system_losses_fraction')
-    args['battery_location'] = Constants.Auto
-    args['clothes_washer_location'] = Constants.Auto
-    args['clothes_washer_efficiency'] = Constants.Auto
-    args['clothes_washer_rated_annual_kwh'] = Constants.Auto
-    args['clothes_washer_label_electric_rate'] = Constants.Auto
-    args['clothes_washer_label_gas_rate'] = Constants.Auto
-    args['clothes_washer_label_annual_gas_cost'] = Constants.Auto
-    args['clothes_washer_label_usage'] = Constants.Auto
-    args['clothes_washer_capacity'] = Constants.Auto
-    args['clothes_dryer_location'] = Constants.Auto
-    args['clothes_dryer_efficiency'] = Constants.Auto
-    args['clothes_dryer_vented_flow_rate'] = Constants.Auto
-    args['dishwasher_location'] = Constants.Auto
-    args['dishwasher_efficiency'] = Constants.Auto
-    args['dishwasher_label_electric_rate'] = Constants.Auto
-    args['dishwasher_label_gas_rate'] = Constants.Auto
-    args['dishwasher_label_annual_gas_cost'] = Constants.Auto
-    args['dishwasher_label_usage'] = Constants.Auto
-    args['dishwasher_place_setting_capacity'] = Constants.Auto
-    args['refrigerator_location'] = Constants.Auto
-    args['refrigerator_rated_annual_kwh'] = Constants.Auto
-    args['cooking_range_oven_location'] = Constants.Auto
+    args['battery_present'] = true
+    args.delete('battery_location')
+    args.delete('clothes_washer_location')
+    args.delete('clothes_washer_efficiency')
+    args.delete('clothes_washer_rated_annual_kwh')
+    args.delete('clothes_washer_label_electric_rate')
+    args.delete('clothes_washer_label_gas_rate')
+    args.delete('clothes_washer_label_annual_gas_cost')
+    args.delete('clothes_washer_label_usage')
+    args.delete('clothes_washer_capacity')
+    args.delete('clothes_dryer_location')
+    args.delete('clothes_dryer_efficiency')
+    args.delete('clothes_dryer_vented_flow_rate')
+    args.delete('dishwasher_location')
+    args.delete('dishwasher_efficiency')
+    args.delete('dishwasher_label_electric_rate')
+    args.delete('dishwasher_label_gas_rate')
+    args.delete('dishwasher_label_annual_gas_cost')
+    args.delete('dishwasher_label_usage')
+    args.delete('dishwasher_place_setting_capacity')
+    args.delete('refrigerator_location')
+    args.delete('refrigerator_rated_annual_kwh')
+    args.delete('cooking_range_oven_location')
     args.delete('cooking_range_oven_is_induction')
     args.delete('cooking_range_oven_is_convection')
     args['ceiling_fan_present'] = true
-    args['misc_plug_loads_television_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_other_annual_kwh'] = Constants.Auto
-    args['misc_plug_loads_other_frac_sensible'] = Constants.Auto
-    args['misc_plug_loads_other_frac_latent'] = Constants.Auto
-    args['mech_vent_flow_rate'] = Constants.Auto
-    args['kitchen_fans_flow_rate'] = Constants.Auto
-    args['bathroom_fans_flow_rate'] = Constants.Auto
+    args.delete('misc_plug_loads_television_annual_kwh')
+    args.delete('misc_plug_loads_other_annual_kwh')
+    args.delete('misc_plug_loads_other_frac_sensible')
+    args.delete('misc_plug_loads_other_frac_latent')
+    args.delete('mech_vent_flow_rate')
+    args.delete('kitchen_fans_flow_rate')
+    args.delete('bathroom_fans_flow_rate')
     args['whole_house_fan_present'] = true
-    args['whole_house_fan_flow_rate'] = Constants.Auto
-    args['whole_house_fan_power'] = Constants.Auto
-    args['hvac_control_heating_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_heating_weekend_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekend_setpoint'] = Constants.Auto
+    args.delete('whole_house_fan_flow_rate')
+    args.delete('whole_house_fan_power')
+    args.delete('hvac_control_heating_weekday_setpoint')
+    args.delete('hvac_control_heating_weekend_setpoint')
+    args.delete('hvac_control_cooling_weekday_setpoint')
+    args.delete('hvac_control_cooling_weekend_setpoint')
   elsif ['base-misc-emissions.xml'].include? hpxml_file
     args['emissions_scenario_names'] = 'Cambium Hourly MidCase LRMER RMPA, Cambium Hourly LowRECosts LRMER RMPA, Cambium Annual MidCase AER National, eGRID RMPA, eGRID RMPA'
     args['emissions_types'] = 'CO2e, CO2e, CO2e, SO2, NOx'
@@ -2346,29 +2308,26 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['emissions_electricity_number_of_header_rows'] = '1, 1, , , '
     args['emissions_electricity_column_numbers'] = '17, 17, , , '
   elsif ['base-misc-loads-large-uncommon.xml'].include? hpxml_file
-    args['extra_refrigerator_location'] = Constants.Auto
+    args.delete('extra_refrigerator_location')
+    args['extra_refrigerator_present'] = true
     args['extra_refrigerator_rated_annual_kwh'] = 700.0
+    args['freezer_present'] = true
     args['freezer_location'] = HPXML::LocationLivingSpace
     args['freezer_rated_annual_kwh'] = 300.0
     args['misc_plug_loads_well_pump_present'] = true
     args['misc_plug_loads_well_pump_annual_kwh'] = 475.0
-    args['misc_plug_loads_well_pump_usage_multiplier'] = 1.0
     args['misc_plug_loads_vehicle_present'] = true
     args['misc_plug_loads_vehicle_annual_kwh'] = 1500.0
-    args['misc_plug_loads_vehicle_usage_multiplier'] = 1.0
     args['misc_fuel_loads_grill_present'] = true
     args['misc_fuel_loads_grill_fuel_type'] = HPXML::FuelTypePropane
     args['misc_fuel_loads_grill_annual_therm'] = 25.0
-    args['misc_fuel_loads_grill_usage_multiplier'] = 1.0
     args['misc_fuel_loads_lighting_present'] = true
     args['misc_fuel_loads_lighting_annual_therm'] = 28.0
-    args['misc_fuel_loads_lighting_usage_multiplier'] = 1.0
     args['misc_fuel_loads_fireplace_present'] = true
     args['misc_fuel_loads_fireplace_fuel_type'] = HPXML::FuelTypeWoodCord
     args['misc_fuel_loads_fireplace_annual_therm'] = 55.0
     args['misc_fuel_loads_fireplace_frac_sensible'] = 0.5
     args['misc_fuel_loads_fireplace_frac_latent'] = 0.1
-    args['misc_fuel_loads_fireplace_usage_multiplier'] = 1.0
     args['pool_present'] = true
     args['pool_heater_type'] = HPXML::HeaterTypeGas
     args['pool_pump_annual_kwh'] = 2700.0
@@ -2397,6 +2356,7 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     args['clothes_dryer_usage_multiplier'] = 0.9
     args['dishwasher_usage_multiplier'] = 0.9
     args['refrigerator_usage_multiplier'] = 0.9
+    args['freezer_present'] = true
     args['freezer_location'] = HPXML::LocationLivingSpace
     args['freezer_rated_annual_kwh'] = 300.0
     args['freezer_usage_multiplier'] = 0.9
@@ -2430,15 +2390,21 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-misc-loads-none.xml'].include? hpxml_file
     args['misc_plug_loads_television_present'] = false
     args['misc_plug_loads_other_annual_kwh'] = 0.0
-    args['misc_plug_loads_other_frac_sensible'] = Constants.Auto
-    args['misc_plug_loads_other_frac_latent'] = Constants.Auto
+    args.delete('misc_plug_loads_other_frac_sensible')
+    args.delete('misc_plug_loads_other_frac_latent')
   end
 
   # PV
-  if ['base-pv.xml'].include? hpxml_file
+  if ['base-pv.xml',
+      'base-pv-battery.xml',
+      'base-pv-battery-garage.xml'].include? hpxml_file
+    args['pv_system_present'] = true
     args['pv_system_module_type'] = HPXML::PVModuleTypeStandard
     args['pv_system_location'] = HPXML::LocationRoof
     args['pv_system_tracking'] = HPXML::PVTrackingTypeFixed
+    args['pv_system_inverter_efficiency'] = 0.96
+    args['pv_system_system_losses_fraction'] = 0.14
+    args['pv_system_2_present'] = true
     args['pv_system_2_module_type'] = HPXML::PVModuleTypePremium
     args['pv_system_2_location'] = HPXML::LocationRoof
     args['pv_system_2_tracking'] = HPXML::PVTrackingTypeFixed
@@ -2447,33 +2413,21 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   end
 
   # Battery
-  if ['base-battery.xml'].include? hpxml_file
-    args['battery_location'] = HPXML::LocationOutside
-    args['battery_power'] = '15000'
-    args['battery_capacity'] = '20'
-    args['battery_usable_capacity'] = '18'
-  elsif ['base-pv-battery.xml'].include? hpxml_file
-    args['pv_system_module_type'] = HPXML::PVModuleTypeStandard
-    args['pv_system_location'] = HPXML::LocationRoof
-    args['pv_system_tracking'] = HPXML::PVTrackingTypeFixed
-    args['pv_system_2_module_type'] = HPXML::PVModuleTypePremium
-    args['pv_system_2_location'] = HPXML::LocationRoof
-    args['pv_system_2_tracking'] = HPXML::PVTrackingTypeFixed
-    args['pv_system_2_array_azimuth'] = 90
-    args['pv_system_2_max_power_output'] = 1500
-  elsif ['base-pv-battery-garage.xml'].include? hpxml_file
-    args['pv_system_module_type'] = HPXML::PVModuleTypeStandard
-    args['pv_system_location'] = HPXML::LocationRoof
-    args['pv_system_tracking'] = HPXML::PVTrackingTypeFixed
-    args['pv_system_2_module_type'] = HPXML::PVModuleTypePremium
-    args['pv_system_2_location'] = HPXML::LocationRoof
-    args['pv_system_2_tracking'] = HPXML::PVTrackingTypeFixed
-    args['pv_system_2_array_azimuth'] = 90
-    args['pv_system_2_max_power_output'] = 1500
-    args['battery_location'] = HPXML::LocationGarage
-    args['battery_power'] = '15000'
-    args['battery_capacity'] = '20'
-    args['battery_usable_capacity'] = '18'
+  if ['base-battery.xml',
+      'base-misc-generators-battery.xml',
+      'base-pv-battery-garage.xml',
+      'base-pv-generators-battery.xml'].include? hpxml_file
+    args['battery_present'] = true
+    if hpxml_file == 'base-pv-battery-garage.xml'
+      args['battery_location'] = HPXML::LocationGarage
+    else
+      args['battery_location'] = HPXML::LocationOutside
+    end
+    args['battery_power'] = 6000
+    args['battery_capacity'] = 20
+    args['battery_usable_capacity'] = 18
+  elsif ['base-pv-battery-round-trip-efficiency.xml'].include? hpxml_file
+    args['battery_round_trip_efficiency'] = 0.8
   end
 
   # Simulation Control
@@ -2485,9 +2439,17 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
   elsif ['base-simcontrol-daylight-saving-disabled.xml'].include? hpxml_file
     args['simulation_control_daylight_saving_enabled'] = false
   elsif ['base-simcontrol-runperiod-1-month.xml'].include? hpxml_file
-    args['simulation_control_run_period'] = 'Jan 1 - Jan 31'
+    args['simulation_control_run_period'] = 'Feb 1 - Feb 28'
+  elsif ['base-simcontrol-temperature-capacitance-multiplier.xml'].include? hpxml_file
+    args['simulation_control_temperature_capacitance_multiplier'] = 7.0
   elsif ['base-simcontrol-timestep-10-mins.xml'].include? hpxml_file
     args['simulation_control_timestep'] = 10
+  elsif ['base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml'].include? hpxml_file
+    args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic-10-mins.csv'
+  elsif ['base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml'].include? hpxml_file
+    args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic.csv'
+  elsif ['base-simcontrol-timestep-30-mins.xml'].include? hpxml_file
+    args['simulation_control_timestep'] = 30
   end
 
   # Occupancy Schedules
@@ -2507,6 +2469,8 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
     sch_args['schedules_vacancy_period'] = 'Dec 1 - Jan 31'
     sch_args['output_csv_path'] = '../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic-vacancy.csv'
     sch_args['hpxml_output_path'] = sch_args['hpxml_path']
+  elsif ['base-schedules-detailed-occupancy-stochastic-10-mins.xml'].include? hpxml_file
+    args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic-10-mins.csv'
   elsif ['base-schedules-detailed-all-10-mins.xml'].include? hpxml_file
     sch_args['hpxml_path'] = args['hpxml_path']
     sch_args['schedules_type'] = 'stochastic'
@@ -2516,67 +2480,72 @@ def set_measure_argument_values(hpxml_file, args, sch_args, orig_parent)
 
   # Setpoint Schedules
   if ['base-schedules-detailed-setpoints.xml'].include? hpxml_file
-    args['hvac_control_heating_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_heating_weekend_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekend_setpoint'] = Constants.Auto
+    args.delete('hvac_control_heating_weekday_setpoint')
+    args.delete('hvac_control_heating_weekend_setpoint')
+    args.delete('hvac_control_cooling_weekday_setpoint')
+    args.delete('hvac_control_cooling_weekend_setpoint')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/setpoints.csv'
   elsif ['base-schedules-detailed-setpoints-daily-schedules.xml'].include? hpxml_file
-    args['hvac_control_heating_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_heating_weekend_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekend_setpoint'] = Constants.Auto
+    args.delete('hvac_control_heating_weekday_setpoint')
+    args.delete('hvac_control_heating_weekend_setpoint')
+    args.delete('hvac_control_cooling_weekday_setpoint')
+    args.delete('hvac_control_cooling_weekend_setpoint')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-daily-schedules.csv'
   elsif ['base-schedules-detailed-setpoints-daily-setbacks.xml'].include? hpxml_file
-    args['hvac_control_heating_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_heating_weekend_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekend_setpoint'] = Constants.Auto
+    args.delete('hvac_control_heating_weekday_setpoint')
+    args.delete('hvac_control_heating_weekend_setpoint')
+    args.delete('hvac_control_cooling_weekday_setpoint')
+    args.delete('hvac_control_cooling_weekend_setpoint')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-daily-setbacks.csv'
   elsif ['base-schedules-detailed-all-10-mins.xml'].include? hpxml_file
-    args['hvac_control_heating_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_heating_weekend_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekend_setpoint'] = Constants.Auto
+    args.delete('hvac_control_heating_weekday_setpoint')
+    args.delete('hvac_control_heating_weekend_setpoint')
+    args.delete('hvac_control_cooling_weekday_setpoint')
+    args.delete('hvac_control_cooling_weekend_setpoint')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-10-mins.csv'
   elsif ['base-hvac-furnace-gas-only-detailed-setpoints.xml'].include? hpxml_file
-    args['hvac_control_heating_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_heating_weekend_setpoint'] = Constants.Auto
+    args.delete('hvac_control_heating_weekday_setpoint')
+    args.delete('hvac_control_heating_weekend_setpoint')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-heating-only.csv'
   elsif ['base-hvac-room-ac-only-detailed-setpoints.xml'].include? hpxml_file
-    args['hvac_control_cooling_weekday_setpoint'] = Constants.Auto
-    args['hvac_control_cooling_weekend_setpoint'] = Constants.Auto
+    args.delete('hvac_control_cooling_weekday_setpoint')
+    args.delete('hvac_control_cooling_weekend_setpoint')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-cooling-only.csv'
   end
 
   # Water Heater Schedules
-  if ['base-dhw-tank-heat-pump-detailed-setpoints.xml'].include? hpxml_file
-    args['water_heater_setpoint_temperature'] = Constants.Auto
+  if ['base-dhw-tank-heat-pump-detailed-setpoints.xml',
+      'base-dhw-indirect-detailed-setpoints.xml',
+      'base-dhw-tank-detailed-setpoints.xml',
+      'base-dhw-tankless-detailed-setpoints.xml'].include? hpxml_file
+    args.delete('water_heater_setpoint_temperature')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-setpoints.csv'
   elsif ['base-dhw-tank-heat-pump-detailed-operating-modes.xml'].include? hpxml_file
-    args['water_heater_setpoint_temperature'] = Constants.Auto
+    args.delete('water_heater_setpoint_temperature')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-operating-modes.csv'
   elsif ['base-dhw-tank-heat-pump-detailed-schedules.xml'].include? hpxml_file
-    args['water_heater_setpoint_temperature'] = Constants.Auto
+    args.delete('water_heater_setpoint_temperature')
     args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-setpoints.csv, ../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-operating-modes.csv'
-  elsif ['base-dhw-tank-detailed-setpoints.xml'].include? hpxml_file
-    args['water_heater_setpoint_temperature'] = Constants.Auto
-    args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-setpoints.csv'
-  elsif ['base-dhw-tankless-detailed-setpoints.xml'].include? hpxml_file
-    args['water_heater_setpoint_temperature'] = Constants.Auto
-    args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-setpoints.csv'
   elsif ['base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml'].include? hpxml_file
     sch_args['hpxml_path'] = args['hpxml_path']
     sch_args['schedules_type'] = 'stochastic'
     sch_args['output_csv_path'] = '../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic.csv'
     sch_args['hpxml_output_path'] = sch_args['hpxml_path']
   elsif ['base-schedules-detailed-all-10-mins.xml'].include? hpxml_file
-    args['water_heater_setpoint_temperature'] = Constants.Auto
+    args.delete('water_heater_setpoint_temperature')
     args['schedules_filepaths'] += ', ../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-setpoints-10-mins.csv'
   end
+
+  # Battery Schedules
+  if ['base-battery-scheduled.xml',
+      'base-misc-generators-battery-scheduled.xml',
+      'base-pv-battery-scheduled.xml',
+      'base-pv-generators-battery-scheduled.xml'].include? hpxml_file
+    args['schedules_filepaths'] = '../../HPXMLtoOpenStudio/resources/schedule_files/battery.csv'
+  end
 end
 
-def apply_hpxml_modification_ashrae_140(hpxml_file, hpxml)
+def apply_hpxml_modification_ashrae_140(hpxml)
   # Set detailed HPXML values for ASHRAE 140 test files
 
   renumber_hpxml_ids(hpxml)
@@ -2586,7 +2555,7 @@ def apply_hpxml_modification_ashrae_140(hpxml_file, hpxml)
   # ------------ #
 
   hpxml.header.xml_generated_by = 'tasks.rb'
-  hpxml.header.created_date_and_time = Time.new(2000, 1, 1).strftime('%Y-%m-%dT%H:%M:%S%:z') # Hard-code to prevent diffs
+  hpxml.header.created_date_and_time = Time.new(2000, 1, 1, 0, 0, 0, '-07:00').strftime('%Y-%m-%dT%H:%M:%S%:z') # Hard-code to prevent diffs
   hpxml.header.apply_ashrae140_assumptions = true
 
   # --------------------- #
@@ -2630,11 +2599,11 @@ def apply_hpxml_modification_ashrae_140(hpxml_file, hpxml)
       end
     end
   end
-  hpxml.frame_floors.each do |frame_floor|
-    next unless frame_floor.is_ceiling
+  hpxml.floors.each do |floor|
+    next unless floor.is_ceiling
 
-    frame_floor.interior_finish_type = HPXML::InteriorFinishGypsumBoard
-    frame_floor.interior_finish_thickness = 0.5
+    floor.interior_finish_type = HPXML::InteriorFinishGypsumBoard
+    floor.interior_finish_thickness = 0.5
   end
   hpxml.foundation_walls.each do |fwall|
     if fwall.insulation_interior_r_value == 0
@@ -2695,7 +2664,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
 
   # General logic for all files
   hpxml.header.xml_generated_by = 'tasks.rb'
-  hpxml.header.created_date_and_time = Time.new(2000, 1, 1).strftime('%Y-%m-%dT%H:%M:%S%:z') # Hard-code to prevent diffs
+  hpxml.header.created_date_and_time = Time.new(2000, 1, 1, 0, 0, 0, '-07:00').strftime('%Y-%m-%dT%H:%M:%S%:z') # Hard-code to prevent diffs
 
   # Logic that can only be applied based on the file name
   if ['base-hvac-undersized-allow-increased-fixed-capacities.xml'].include? hpxml_file
@@ -2762,7 +2731,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
 
     roof.interior_finish_type = HPXML::InteriorFinishGypsumBoard
   end
-  (hpxml.walls + hpxml.foundation_walls + hpxml.frame_floors).each do |surface|
+  (hpxml.walls + hpxml.foundation_walls + hpxml.floors).each do |surface|
     if surface.is_a?(HPXML::FoundationWall) && surface.interior_adjacent_to != HPXML::LocationBasementConditioned
       surface.interior_finish_type = HPXML::InteriorFinishNone
     end
@@ -2775,7 +2744,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                  HPXML::LocationAtticVented,
                  HPXML::LocationOtherHousingUnit,
                  HPXML::LocationBasementConditioned].include?(surface.exterior_adjacent_to)
-    next if surface.is_a?(HPXML::FrameFloor) && surface.is_floor
+    next if surface.is_a?(HPXML::Floor) && surface.is_floor
 
     surface.interior_finish_type = HPXML::InteriorFinishGypsumBoard
   end
@@ -2817,12 +2786,12 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                w.exterior_adjacent_to == HPXML::LocationOtherHousingUnit
            }           [0]
     wall.exterior_adjacent_to = adjacent_to
-    hpxml.frame_floors[0].exterior_adjacent_to = adjacent_to
-    hpxml.frame_floors[1].exterior_adjacent_to = adjacent_to
+    hpxml.floors[0].exterior_adjacent_to = adjacent_to
+    hpxml.floors[1].exterior_adjacent_to = adjacent_to
     if hpxml_file != 'base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml'
       wall.insulation_assembly_r_value = 23
-      hpxml.frame_floors[0].insulation_assembly_r_value = 18.7
-      hpxml.frame_floors[1].insulation_assembly_r_value = 18.7
+      hpxml.floors[0].insulation_assembly_r_value = 18.7
+      hpxml.floors[1].insulation_assembly_r_value = 18.7
     end
     hpxml.windows.each do |window|
       window.area *= 0.35
@@ -2885,25 +2854,28 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                     emittance: 0.92,
                     interior_finish_type: HPXML::InteriorFinishGypsumBoard,
                     insulation_assembly_r_value: 4.0)
-    hpxml.frame_floors[0].delete
-    hpxml.frame_floors.add(id: "FrameFloor#{hpxml.frame_floors.size + 1}",
-                           exterior_adjacent_to: HPXML::LocationOtherNonFreezingSpace,
-                           interior_adjacent_to: HPXML::LocationLivingSpace,
-                           area: 550,
-                           insulation_assembly_r_value: 18.7,
-                           other_space_above_or_below: HPXML::FrameFloorOtherSpaceBelow)
-    hpxml.frame_floors.add(id: "FrameFloor#{hpxml.frame_floors.size + 1}",
-                           exterior_adjacent_to: HPXML::LocationOtherMultifamilyBufferSpace,
-                           interior_adjacent_to: HPXML::LocationLivingSpace,
-                           area: 200,
-                           insulation_assembly_r_value: 18.7,
-                           other_space_above_or_below: HPXML::FrameFloorOtherSpaceBelow)
-    hpxml.frame_floors.add(id: "FrameFloor#{hpxml.frame_floors.size + 1}",
-                           exterior_adjacent_to: HPXML::LocationOtherHeatedSpace,
-                           interior_adjacent_to: HPXML::LocationLivingSpace,
-                           area: 150,
-                           insulation_assembly_r_value: 2.1,
-                           other_space_above_or_below: HPXML::FrameFloorOtherSpaceBelow)
+    hpxml.floors[0].delete
+    hpxml.floors.add(id: "Floor#{hpxml.floors.size + 1}",
+                     exterior_adjacent_to: HPXML::LocationOtherNonFreezingSpace,
+                     interior_adjacent_to: HPXML::LocationLivingSpace,
+                     floor_type: HPXML::FloorTypeWoodFrame,
+                     area: 550,
+                     insulation_assembly_r_value: 18.7,
+                     floor_or_ceiling: HPXML::FloorOrCeilingFloor)
+    hpxml.floors.add(id: "Floor#{hpxml.floors.size + 1}",
+                     exterior_adjacent_to: HPXML::LocationOtherMultifamilyBufferSpace,
+                     interior_adjacent_to: HPXML::LocationLivingSpace,
+                     floor_type: HPXML::FloorTypeWoodFrame,
+                     area: 200,
+                     insulation_assembly_r_value: 18.7,
+                     floor_or_ceiling: HPXML::FloorOrCeilingFloor)
+    hpxml.floors.add(id: "Floor#{hpxml.floors.size + 1}",
+                     exterior_adjacent_to: HPXML::LocationOtherHeatedSpace,
+                     interior_adjacent_to: HPXML::LocationLivingSpace,
+                     floor_type: HPXML::FloorTypeWoodFrame,
+                     area: 150,
+                     insulation_assembly_r_value: 2.1,
+                     floor_or_ceiling: HPXML::FloorOrCeilingFloor)
     wall = hpxml.walls.select { |w|
              w.interior_adjacent_to == HPXML::LocationLivingSpace &&
                w.exterior_adjacent_to == HPXML::LocationOtherMultifamilyBufferSpace
@@ -3006,12 +2978,14 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.foundation_walls.each do |foundation_wall|
       foundation_wall.area = 1200.0 / hpxml.foundation_walls.size
     end
-    hpxml.frame_floors.add(id: "FrameFloor#{hpxml.frame_floors.size + 1}",
-                           exterior_adjacent_to: HPXML::LocationAtticUnvented,
-                           interior_adjacent_to: HPXML::LocationLivingSpace,
-                           area: 450,
-                           interior_finish_type: HPXML::InteriorFinishGypsumBoard,
-                           insulation_assembly_r_value: 39.3)
+    hpxml.floors.add(id: "Floor#{hpxml.floors.size + 1}",
+                     exterior_adjacent_to: HPXML::LocationAtticUnvented,
+                     interior_adjacent_to: HPXML::LocationLivingSpace,
+                     floor_type: HPXML::FloorTypeWoodFrame,
+                     area: 450,
+                     interior_finish_type: HPXML::InteriorFinishGypsumBoard,
+                     insulation_assembly_r_value: 39.3,
+                     floor_or_ceiling: HPXML::FloorOrCeilingCeiling)
     hpxml.slabs[0].area = 1350
     hpxml.slabs[0].exposed_perimeter = 150
     hpxml.windows[1].area = 108
@@ -3152,10 +3126,10 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.rim_joists[-1].id = "RimJoist#{hpxml.rim_joists.size}"
     hpxml.rim_joists[-1].interior_adjacent_to = HPXML::LocationLivingSpace
     hpxml.rim_joists[-1].area = 116
-  elsif ['base-foundation-conditioned-basement-wall-interior-insulation.xml'].include? hpxml_file
+  elsif ['base-foundation-conditioned-basement-wall-insulation.xml'].include? hpxml_file
     hpxml.foundation_walls.each do |foundation_wall|
       foundation_wall.insulation_interior_r_value = 10
-      foundation_wall.insulation_interior_distance_to_top = 0
+      foundation_wall.insulation_interior_distance_to_top = 1
       foundation_wall.insulation_interior_distance_to_bottom = 8
       foundation_wall.insulation_exterior_r_value = 8.9
       foundation_wall.insulation_exterior_distance_to_top = 1
@@ -3250,12 +3224,14 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                depth_below_grade: 3,
                                insulation_interior_r_value: 0,
                                insulation_exterior_r_value: 0)
-    hpxml.frame_floors[0].area = 675
-    hpxml.frame_floors.add(id: "FrameFloor#{hpxml.frame_floors.size + 1}",
-                           exterior_adjacent_to: HPXML::LocationCrawlspaceUnvented,
-                           interior_adjacent_to: HPXML::LocationLivingSpace,
-                           area: 675,
-                           insulation_assembly_r_value: 18.7)
+    hpxml.floors[0].area = 675
+    hpxml.floors.add(id: "Floor#{hpxml.floors.size + 1}",
+                     exterior_adjacent_to: HPXML::LocationCrawlspaceUnvented,
+                     interior_adjacent_to: HPXML::LocationLivingSpace,
+                     floor_type: HPXML::FloorTypeWoodFrame,
+                     area: 675,
+                     insulation_assembly_r_value: 18.7,
+                     floor_or_ceiling: HPXML::FloorOrCeilingFloor)
     hpxml.slabs[0].area = 675
     hpxml.slabs[0].exposed_perimeter = 75
     hpxml.slabs.add(id: "Slab#{hpxml.slabs.size + 1}",
@@ -3392,11 +3368,13 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                     solar_absorptance: 0.7,
                     emittance: 0.92,
                     insulation_assembly_r_value: 4)
-    hpxml.frame_floors.add(id: "FrameFloor#{hpxml.frame_floors.size + 1}",
-                           exterior_adjacent_to: HPXML::LocationGarage,
-                           interior_adjacent_to: HPXML::LocationLivingSpace,
-                           area: 400,
-                           insulation_assembly_r_value: 39.3)
+    hpxml.floors.add(id: "Floor#{hpxml.floors.size + 1}",
+                     exterior_adjacent_to: HPXML::LocationGarage,
+                     interior_adjacent_to: HPXML::LocationLivingSpace,
+                     floor_type: HPXML::FloorTypeWoodFrame,
+                     area: 400,
+                     insulation_assembly_r_value: 39.3,
+                     floor_or_ceiling: HPXML::FloorOrCeilingFloor)
     hpxml.slabs[0].area -= 400
     hpxml.slabs[0].exposed_perimeter -= 40
     hpxml.slabs.add(id: "Slab#{hpxml.slabs.size + 1}",
@@ -3421,6 +3399,45 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                     area: 4,
                     azimuth: 0,
                     r_value: 4.4)
+  elsif ['base-enclosure-ceilingtypes.xml'].include? hpxml_file
+    exterior_adjacent_to = hpxml.floors[0].exterior_adjacent_to
+    area = hpxml.floors[0].area
+    hpxml.floors.reverse_each do |floor|
+      floor.delete
+    end
+    floors_map = { HPXML::FloorTypeSIP => 16.1,
+                   HPXML::FloorTypeConcrete => 3.2,
+                   HPXML::FloorTypeSteelFrame => 8.1 }
+    floors_map.each_with_index do |(floor_type, assembly_r), _i|
+      hpxml.floors.add(id: "Floor#{hpxml.floors.size + 1}",
+                       exterior_adjacent_to: exterior_adjacent_to,
+                       interior_adjacent_to: HPXML::LocationLivingSpace,
+                       floor_type: floor_type,
+                       area: area / floors_map.size,
+                       insulation_assembly_r_value: assembly_r,
+                       floor_or_ceiling: HPXML::FloorOrCeilingCeiling)
+    end
+  elsif ['base-enclosure-floortypes.xml'].include? hpxml_file
+    exterior_adjacent_to = hpxml.floors[0].exterior_adjacent_to
+    area = hpxml.floors[0].area
+    ceiling = hpxml.floors[1].dup
+    hpxml.floors.reverse_each do |floor|
+      floor.delete
+    end
+    floors_map = { HPXML::FloorTypeSIP => 16.1,
+                   HPXML::FloorTypeConcrete => 3.2,
+                   HPXML::FloorTypeSteelFrame => 8.1 }
+    floors_map.each_with_index do |(floor_type, assembly_r), _i|
+      hpxml.floors.add(id: "Floor#{hpxml.floors.size + 1}",
+                       exterior_adjacent_to: exterior_adjacent_to,
+                       interior_adjacent_to: HPXML::LocationLivingSpace,
+                       floor_type: floor_type,
+                       area: area / floors_map.size,
+                       insulation_assembly_r_value: assembly_r,
+                       floor_or_ceiling: HPXML::FloorOrCeilingFloor)
+    end
+    hpxml.floors << ceiling
+    hpxml.floors[-1].id = "Floor#{hpxml.floors.size}"
   elsif ['base-enclosure-walltypes.xml'].include? hpxml_file
     hpxml.rim_joists.reverse_each do |rim_joist|
       rim_joist.delete
@@ -3435,7 +3452,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                     [HPXML::SidingTypeSyntheticStucco, HPXML::ColorMediumDark],
                     [HPXML::SidingTypeVinyl, HPXML::ColorLight],
                     [HPXML::SidingTypeNone, HPXML::ColorMedium]]
-    siding_types.each_with_index do |siding_type, i|
+    siding_types.each do |siding_type|
       hpxml.rim_joists.add(id: "RimJoist#{hpxml.rim_joists.size + 1}",
                            exterior_adjacent_to: HPXML::LocationOutside,
                            interior_adjacent_to: HPXML::LocationBasementConditioned,
@@ -3622,19 +3639,19 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.foundation_walls << hpxml.foundation_walls[-1].dup
     hpxml.foundation_walls[-1].id += '_tiny'
     hpxml.foundation_walls[-1].area = 0.05
-    for n in 1..hpxml.frame_floors.size
-      hpxml.frame_floors[n - 1].area /= 9.0
+    for n in 1..hpxml.floors.size
+      hpxml.floors[n - 1].area /= 9.0
       for i in 2..9
-        hpxml.frame_floors << hpxml.frame_floors[n - 1].dup
-        hpxml.frame_floors[-1].id += "_#{i}"
+        hpxml.floors << hpxml.floors[n - 1].dup
+        hpxml.floors[-1].id += "_#{i}"
         if hpxml_file == 'base-enclosure-split-surfaces2.xml'
-          hpxml.frame_floors[-1].insulation_assembly_r_value += 0.01 * i
+          hpxml.floors[-1].insulation_assembly_r_value += 0.01 * i
         end
       end
     end
-    hpxml.frame_floors << hpxml.frame_floors[-1].dup
-    hpxml.frame_floors[-1].id += '_tiny'
-    hpxml.frame_floors[-1].area = 0.05
+    hpxml.floors << hpxml.floors[-1].dup
+    hpxml.floors[-1].id += '_tiny'
+    hpxml.floors[-1].area = 0.05
     for n in 1..hpxml.slabs.size
       hpxml.slabs[n - 1].area /= 9.0
       hpxml.slabs[n - 1].exposed_perimeter /= 9.0
@@ -3650,7 +3667,6 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.slabs << hpxml.slabs[-1].dup
     hpxml.slabs[-1].id += '_tiny'
     hpxml.slabs[-1].area = 0.05
-    area_adjustments = []
     for n in 1..hpxml.windows.size
       hpxml.windows[n - 1].area /= 9.0
       hpxml.windows[n - 1].fraction_operable = 0.0
@@ -3687,7 +3703,6 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.skylights << hpxml.skylights[-1].dup
     hpxml.skylights[-1].id += '_tiny'
     hpxml.skylights[-1].area = 0.05
-    area_adjustments = []
     for n in 1..hpxml.doors.size
       hpxml.doors[n - 1].area /= 9.0
       for i in 2..9
@@ -3835,11 +3850,13 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                                                  duct_leakage_units: HPXML::UnitsCFM25,
                                                                  duct_leakage_value: 10,
                                                                  duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
-      hpxml.hvac_distributions[-1].ducts.add(duct_type: HPXML::DuctTypeSupply,
+      hpxml.hvac_distributions[-1].ducts.add(id: "Ducts#{hpxml.hvac_distributions[-1].ducts.size + 1}",
+                                             duct_type: HPXML::DuctTypeSupply,
                                              duct_insulation_r_value: 0,
                                              duct_location: HPXML::LocationOtherMultifamilyBufferSpace,
                                              duct_surface_area: 50)
-      hpxml.hvac_distributions[-1].ducts.add(duct_type: HPXML::DuctTypeReturn,
+      hpxml.hvac_distributions[-1].ducts.add(id: "Ducts#{hpxml.hvac_distributions[-1].ducts.size + 1}",
+                                             duct_type: HPXML::DuctTypeReturn,
                                              duct_insulation_r_value: 0,
                                              duct_location: HPXML::LocationOtherMultifamilyBufferSpace,
                                              duct_surface_area: 20)
@@ -3939,11 +3956,6 @@ def apply_hpxml_modification(hpxml_file, hpxml)
         hpxml.heating_systems[i].fraction_heat_load_served = 0.35
       end
     end
-  elsif ['base-misc-defaults.xml'].include? hpxml_file
-    hpxml.heating_systems[0].year_installed = 2009
-    hpxml.heating_systems[0].heating_efficiency_afue = nil
-    hpxml.cooling_systems[0].year_installed = 2009
-    hpxml.cooling_systems[0].cooling_efficiency_seer = nil
   elsif ['base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-electric.xml'].include? hpxml_file
     hpxml.heat_pumps[0].backup_heating_efficiency_afue = hpxml.heat_pumps[0].backup_heating_efficiency_percent
     hpxml.heat_pumps[0].backup_heating_efficiency_percent = nil
@@ -3951,7 +3963,9 @@ def apply_hpxml_modification(hpxml_file, hpxml)
          'base-enclosure-2stories-garage.xml',
          'base-hvac-ducts-area-fractions.xml'].include? hpxml_file
     hpxml.hvac_distributions[0].ducts << hpxml.hvac_distributions[0].ducts[0].dup
+    hpxml.hvac_distributions[0].ducts[-1].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size}"
     hpxml.hvac_distributions[0].ducts << hpxml.hvac_distributions[0].ducts[1].dup
+    hpxml.hvac_distributions[0].ducts[-1].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size}"
     hpxml.hvac_distributions[0].ducts[2].duct_location = HPXML::LocationExteriorWall
     hpxml.hvac_distributions[0].ducts[2].duct_surface_area = 37.5
     hpxml.hvac_distributions[0].ducts[3].duct_location = HPXML::LocationLivingSpace
@@ -3975,42 +3989,67 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.hvac_distributions.add(id: "HVACDistribution#{hpxml.hvac_distributions.size + 1}",
                                  distribution_system_type: HPXML::HVACDistributionTypeAir,
                                  air_type: HPXML::AirTypeRegularVelocity)
-    hpxml.hvac_distributions[-1].duct_leakage_measurements.add(duct_type: HPXML::DuctTypeSupply,
-                                                               duct_leakage_units: HPXML::UnitsCFM25,
-                                                               duct_leakage_value: 75,
-                                                               duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
-    hpxml.hvac_distributions[-1].duct_leakage_measurements.add(duct_type: HPXML::DuctTypeReturn,
-                                                               duct_leakage_units: HPXML::UnitsCFM25,
-                                                               duct_leakage_value: 25,
-                                                               duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
-    hpxml.hvac_distributions[0].ducts.add(duct_type: HPXML::DuctTypeSupply,
+    hpxml.hvac_distributions[0].duct_leakage_measurements.add(duct_type: HPXML::DuctTypeSupply,
+                                                              duct_leakage_units: HPXML::UnitsCFM25,
+                                                              duct_leakage_value: 75,
+                                                              duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
+    hpxml.hvac_distributions[0].duct_leakage_measurements.add(duct_type: HPXML::DuctTypeReturn,
+                                                              duct_leakage_units: HPXML::UnitsCFM25,
+                                                              duct_leakage_value: 25,
+                                                              duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
+    hpxml.hvac_distributions[0].ducts.add(id: "Ducts#{hpxml.hvac_distributions[0].ducts.size + 1}",
+                                          duct_type: HPXML::DuctTypeSupply,
                                           duct_insulation_r_value: 8,
                                           duct_location: HPXML::LocationAtticUnvented,
                                           duct_surface_area: 75)
-    hpxml.hvac_distributions[0].ducts.add(duct_type: HPXML::DuctTypeSupply,
+    hpxml.hvac_distributions[0].ducts.add(id: "Ducts#{hpxml.hvac_distributions[0].ducts.size + 1}",
+                                          duct_type: HPXML::DuctTypeSupply,
                                           duct_insulation_r_value: 8,
                                           duct_location: HPXML::LocationOutside,
                                           duct_surface_area: 75)
-    hpxml.hvac_distributions[0].ducts.add(duct_type: HPXML::DuctTypeReturn,
+    hpxml.hvac_distributions[0].ducts.add(id: "Ducts#{hpxml.hvac_distributions[0].ducts.size + 1}",
+                                          duct_type: HPXML::DuctTypeReturn,
                                           duct_insulation_r_value: 4,
                                           duct_location: HPXML::LocationAtticUnvented,
                                           duct_surface_area: 25)
-    hpxml.hvac_distributions[0].ducts.add(duct_type: HPXML::DuctTypeReturn,
+    hpxml.hvac_distributions[0].ducts.add(id: "Ducts#{hpxml.hvac_distributions[0].ducts.size + 1}",
+                                          duct_type: HPXML::DuctTypeReturn,
                                           duct_insulation_r_value: 4,
                                           duct_location: HPXML::LocationOutside,
                                           duct_surface_area: 25)
-    hpxml.hvac_distributions << hpxml.hvac_distributions[0].dup
-    hpxml.hvac_distributions[-1].id = "HVACDistribution#{hpxml.hvac_distributions.size}"
+    hpxml.hvac_distributions.add(id: "HVACDistribution#{hpxml.hvac_distributions.size + 1}",
+                                 distribution_system_type: HPXML::HVACDistributionTypeAir,
+                                 air_type: HPXML::AirTypeRegularVelocity)
+    hpxml.hvac_distributions[-1].duct_leakage_measurements << hpxml.hvac_distributions[0].duct_leakage_measurements[0].dup
+    hpxml.hvac_distributions[-1].duct_leakage_measurements << hpxml.hvac_distributions[0].duct_leakage_measurements[1].dup
+    for i in 0..3
+      hpxml.hvac_distributions[-1].ducts << hpxml.hvac_distributions[0].ducts[i].dup
+      hpxml.hvac_distributions[-1].ducts[-1].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size + i + 1}"
+    end
     hpxml.hvac_distributions.add(id: "HVACDistribution#{hpxml.hvac_distributions.size + 1}",
                                  distribution_system_type: HPXML::HVACDistributionTypeHydronic,
                                  hydronic_type: HPXML::HydronicTypeBaseboard)
     hpxml.hvac_distributions.add(id: "HVACDistribution#{hpxml.hvac_distributions.size + 1}",
                                  distribution_system_type: HPXML::HVACDistributionTypeHydronic,
                                  hydronic_type: HPXML::HydronicTypeBaseboard)
-    hpxml.hvac_distributions << hpxml.hvac_distributions[0].dup
-    hpxml.hvac_distributions[-1].id = "HVACDistribution#{hpxml.hvac_distributions.size}"
-    hpxml.hvac_distributions << hpxml.hvac_distributions[0].dup
-    hpxml.hvac_distributions[-1].id = "HVACDistribution#{hpxml.hvac_distributions.size}"
+    hpxml.hvac_distributions.add(id: "HVACDistribution#{hpxml.hvac_distributions.size + 1}",
+                                 distribution_system_type: HPXML::HVACDistributionTypeAir,
+                                 air_type: HPXML::AirTypeRegularVelocity)
+    hpxml.hvac_distributions[-1].duct_leakage_measurements << hpxml.hvac_distributions[0].duct_leakage_measurements[0].dup
+    hpxml.hvac_distributions[-1].duct_leakage_measurements << hpxml.hvac_distributions[0].duct_leakage_measurements[1].dup
+    for i in 0..3
+      hpxml.hvac_distributions[-1].ducts << hpxml.hvac_distributions[0].ducts[i].dup
+      hpxml.hvac_distributions[-1].ducts[-1].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size * 2 + i + 1}"
+    end
+    hpxml.hvac_distributions.add(id: "HVACDistribution#{hpxml.hvac_distributions.size + 1}",
+                                 distribution_system_type: HPXML::HVACDistributionTypeAir,
+                                 air_type: HPXML::AirTypeRegularVelocity)
+    hpxml.hvac_distributions[-1].duct_leakage_measurements << hpxml.hvac_distributions[0].duct_leakage_measurements[0].dup
+    hpxml.hvac_distributions[-1].duct_leakage_measurements << hpxml.hvac_distributions[0].duct_leakage_measurements[1].dup
+    for i in 0..3
+      hpxml.hvac_distributions[-1].ducts << hpxml.hvac_distributions[0].ducts[i].dup
+      hpxml.hvac_distributions[-1].ducts[-1].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size * 3 + i + 1}"
+    end
     hpxml.heating_systems.reverse_each do |heating_system|
       heating_system.delete
     end
@@ -4133,8 +4172,15 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                          primary_heating_system: true)
   elsif ['base-mechvent-multiple.xml',
          'base-bldgtype-multifamily-shared-mechvent-multiple.xml'].include? hpxml_file
-    hpxml.hvac_distributions << hpxml.hvac_distributions[0].dup
-    hpxml.hvac_distributions[1].id = "HVACDistribution#{hpxml.hvac_distributions.size}"
+    hpxml.hvac_distributions.add(id: "HVACDistribution#{hpxml.hvac_distributions.size + 1}",
+                                 distribution_system_type: HPXML::HVACDistributionTypeAir,
+                                 air_type: HPXML::AirTypeRegularVelocity)
+    hpxml.hvac_distributions[1].duct_leakage_measurements << hpxml.hvac_distributions[0].duct_leakage_measurements[0].dup
+    hpxml.hvac_distributions[1].duct_leakage_measurements << hpxml.hvac_distributions[0].duct_leakage_measurements[1].dup
+    hpxml.hvac_distributions[1].ducts << hpxml.hvac_distributions[0].ducts[0].dup
+    hpxml.hvac_distributions[1].ducts << hpxml.hvac_distributions[0].ducts[1].dup
+    hpxml.hvac_distributions[1].ducts[0].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size + 1}"
+    hpxml.hvac_distributions[1].ducts[1].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size + 2}"
     hpxml.heating_systems[0].heating_capacity /= 2.0
     hpxml.heating_systems[0].fraction_heat_load_served /= 2.0
     hpxml.heating_systems[0].primary_system = false
@@ -4151,11 +4197,13 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.cooling_systems[1].primary_system = true
   elsif ['base-bldgtype-multifamily-adjacent-to-multiple.xml'].include? hpxml_file
     hpxml.hvac_distributions[0].ducts[1].duct_location = HPXML::LocationOtherHousingUnit
-    hpxml.hvac_distributions[0].ducts.add(duct_type: HPXML::DuctTypeSupply,
+    hpxml.hvac_distributions[0].ducts.add(id: "Ducts#{hpxml.hvac_distributions[0].ducts.size + 1}",
+                                          duct_type: HPXML::DuctTypeSupply,
                                           duct_insulation_r_value: 4,
                                           duct_location: HPXML::LocationRoofDeck,
                                           duct_surface_area: 150)
-    hpxml.hvac_distributions[0].ducts.add(duct_type: HPXML::DuctTypeReturn,
+    hpxml.hvac_distributions[0].ducts.add(id: "Ducts#{hpxml.hvac_distributions[0].ducts.size + 1}",
+                                          duct_type: HPXML::DuctTypeReturn,
                                           duct_insulation_r_value: 0,
                                           duct_location: HPXML::LocationRoofDeck,
                                           duct_surface_area: 50)
@@ -4179,6 +4227,12 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.hvac_distributions[0].duct_leakage_measurements << hpxml.hvac_distributions[1].duct_leakage_measurements[1].dup
     hpxml.hvac_distributions[0].ducts << hpxml.hvac_distributions[1].ducts[0].dup
     hpxml.hvac_distributions[0].ducts << hpxml.hvac_distributions[1].ducts[1].dup
+    hpxml.hvac_distributions[1].ducts[0].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size + 1}"
+    hpxml.hvac_distributions[1].ducts[1].id = "Ducts#{hpxml.hvac_distributions[0].ducts.size + 2}"
+  end
+  if ['base-hvac-ducts-area-multipliers.xml'].include? hpxml_file
+    hpxml.hvac_distributions[0].ducts[0].duct_surface_area_multiplier = 0.5
+    hpxml.hvac_distributions[0].ducts[1].duct_surface_area_multiplier = 1.5
   end
 
   # ------------------ #
@@ -4197,7 +4251,8 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.hot_water_distributions[0].shared_recirculation_number_of_units_served = 6
     hpxml.hot_water_distributions[0].shared_recirculation_pump_power = 220
     hpxml.hot_water_distributions[0].shared_recirculation_control_type = HPXML::DHWRecirControlTypeTimer
-  elsif ['base-bldgtype-multifamily-shared-laundry-room.xml'].include? hpxml_file
+  elsif ['base-bldgtype-multifamily-shared-laundry-room.xml',
+         'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml'].include? hpxml_file
     hpxml.water_heating_systems.reverse_each do |water_heating_system|
       water_heating_system.delete
     end
@@ -4213,15 +4268,18 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                     energy_factor: 0.59,
                                     recovery_efficiency: 0.76,
                                     temperature: 125.0)
+    if hpxml_file == 'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml'
+      hpxml.water_heating_systems[0].fraction_dhw_load_served /= 2.0
+      hpxml.water_heating_systems[0].tank_volume /= 2.0
+      hpxml.water_heating_systems[0].number_of_units_served /= 2.0
+      hpxml.water_heating_systems << hpxml.water_heating_systems[0].dup
+      hpxml.water_heating_systems[1].id = "WaterHeatingSystem#{hpxml.water_heating_systems.size}"
+    end
   elsif ['base-dhw-tank-gas-uef-fhr.xml'].include? hpxml_file
     hpxml.water_heating_systems[0].first_hour_rating = 56.0
     hpxml.water_heating_systems[0].usage_bin = nil
   elsif ['base-dhw-tankless-electric-outside.xml'].include? hpxml_file
     hpxml.water_heating_systems[0].performance_adjustment = 0.92
-  elsif ['base-misc-defaults.xml'].include? hpxml_file
-    hpxml.water_heating_systems[0].year_installed = 2009
-    hpxml.water_heating_systems[0].heating_capacity = nil
-    hpxml.water_heating_systems[0].energy_factor = nil
   elsif ['base-dhw-multiple.xml'].include? hpxml_file
     hpxml.water_heating_systems[0].fraction_dhw_load_served = 0.2
     hpxml.water_heating_systems.add(id: "WaterHeatingSystem#{hpxml.water_heating_systems.size + 1}",
@@ -4359,6 +4417,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                hours_in_operation: 8,
                                fan_power: 150,
                                used_for_whole_building_ventilation: true,
+                               cfis_addtl_runtime_operating_mode: HPXML::CFISModeAirHandler,
                                distribution_system_idref: 'HVACDistribution1')
   elsif ['base-mechvent-multiple.xml'].include? hpxml_file
     hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
@@ -4367,16 +4426,15 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                used_for_seasonal_cooling_load_reduction: true)
     hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
                                fan_type: HPXML::MechVentTypeSupply,
-                               tested_flow_rate: 27.5,
-                               hours_in_operation: 24,
-                               fan_power: 7.5,
-                               used_for_whole_building_ventilation: true)
-    hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
-                               fan_type: HPXML::MechVentTypeExhaust,
                                tested_flow_rate: 12.5,
                                hours_in_operation: 14,
                                fan_power: 2.5,
                                used_for_whole_building_ventilation: true)
+    hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
+                               fan_type: HPXML::MechVentTypeExhaust,
+                               tested_flow_rate: 30.0,
+                               fan_power: 7.5,
+                               used_for_whole_building_ventilation: true)
     hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
                                fan_type: HPXML::MechVentTypeBalanced,
                                tested_flow_rate: 27.5,
@@ -4413,6 +4471,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                hours_in_operation: 8,
                                fan_power: 37.5,
                                used_for_whole_building_ventilation: true,
+                               cfis_addtl_runtime_operating_mode: HPXML::CFISModeAirHandler,
                                distribution_system_idref: 'HVACDistribution1')
     hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
                                fan_type: HPXML::MechVentTypeCFIS,
@@ -4420,6 +4479,8 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                hours_in_operation: 8,
                                fan_power: 37.5,
                                used_for_whole_building_ventilation: true,
+                               cfis_addtl_runtime_operating_mode: HPXML::CFISModeSupplementalFan,
+                               cfis_supplemental_fan_idref: hpxml.ventilation_fans.select { |f| f.fan_type == HPXML::MechVentTypeExhaust }[0].id,
                                distribution_system_idref: 'HVACDistribution2')
     # Test ventilation system w/ zero airflow and hours
     hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
@@ -4438,6 +4499,19 @@ def apply_hpxml_modification(hpxml_file, hpxml)
                                used_for_whole_building_ventilation: true)
   elsif ['base-mechvent-cfis-airflow-fraction-zero.xml'].include? hpxml_file
     hpxml.ventilation_fans[0].cfis_vent_mode_airflow_fraction = 0.0
+  elsif ['base-mechvent-cfis-supplemental-fan-exhaust.xml',
+         'base-mechvent-cfis-supplemental-fan-supply.xml'].include? hpxml_file
+    hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
+                               tested_flow_rate: 120,
+                               fan_power: 30,
+                               used_for_whole_building_ventilation: true)
+    if hpxml_file == 'base-mechvent-cfis-supplemental-fan-exhaust.xml'
+      hpxml.ventilation_fans[-1].fan_type = HPXML::MechVentTypeExhaust
+    else
+      hpxml.ventilation_fans[-1].fan_type = HPXML::MechVentTypeSupply
+    end
+    hpxml.ventilation_fans[0].cfis_addtl_runtime_operating_mode = HPXML::CFISModeSupplementalFan
+    hpxml.ventilation_fans[0].cfis_supplemental_fan_idref = hpxml.ventilation_fans[1].id
   end
 
   # ---------------- #
@@ -4447,7 +4521,12 @@ def apply_hpxml_modification(hpxml_file, hpxml)
   # Logic that can only be applied based on the file name
   if ['base-misc-defaults.xml'].include? hpxml_file
     hpxml.pv_systems[0].year_modules_manufactured = 2015
-  elsif ['base-misc-generators.xml'].include? hpxml_file
+  elsif ['base-misc-generators.xml',
+         'base-misc-generators-battery.xml',
+         'base-misc-generators-battery-scheduled.xml',
+         'base-pv-generators.xml',
+         'base-pv-generators-battery.xml',
+         'base-pv-generators-battery-scheduled.xml'].include? hpxml_file
     hpxml.generators.add(id: "Generator#{hpxml.generators.size + 1}",
                          fuel_type: HPXML::FuelTypeNaturalGas,
                          annual_consumption_kbtu: 8500,
@@ -4538,15 +4617,21 @@ def apply_hpxml_modification(hpxml_file, hpxml)
     hpxml.hot_tubs[0].heater_weekend_fractions = '0.024, 0.029, 0.024, 0.029, 0.047, 0.067, 0.057, 0.024, 0.024, 0.019, 0.015, 0.014, 0.014, 0.014, 0.024, 0.058, 0.126, 0.122, 0.068, 0.061, 0.051, 0.043, 0.024, 0.024'
     hpxml.hot_tubs[0].heater_monthly_multipliers = '0.921, 0.928, 0.921, 0.915, 0.921, 1.160, 1.158, 1.158, 1.160, 0.921, 0.915, 0.921'
   end
-  if ['base-bldgtype-multifamily-shared-laundry-room.xml'].include? hpxml_file
+  if ['base-bldgtype-multifamily-shared-laundry-room.xml',
+      'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml'].include? hpxml_file
     hpxml.clothes_washers[0].is_shared_appliance = true
     hpxml.clothes_washers[0].location = HPXML::LocationOtherHeatedSpace
-    hpxml.clothes_washers[0].water_heating_system_idref = hpxml.water_heating_systems[0].id
     hpxml.clothes_dryers[0].location = HPXML::LocationOtherHeatedSpace
     hpxml.clothes_dryers[0].is_shared_appliance = true
     hpxml.dishwashers[0].is_shared_appliance = true
     hpxml.dishwashers[0].location = HPXML::LocationOtherHeatedSpace
-    hpxml.dishwashers[0].water_heating_system_idref = hpxml.water_heating_systems[0].id
+    if hpxml_file == 'base-bldgtype-multifamily-shared-laundry-room.xml'
+      hpxml.clothes_washers[0].water_heating_system_idref = hpxml.water_heating_systems[0].id
+      hpxml.dishwashers[0].water_heating_system_idref = hpxml.water_heating_systems[0].id
+    elsif hpxml_file == 'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml'
+      hpxml.clothes_washers[0].hot_water_distribution_idref = hpxml.hot_water_distributions[0].id
+      hpxml.dishwashers[0].hot_water_distribution_idref = hpxml.hot_water_distributions[0].id
+    end
   elsif ['base-misc-defaults.xml'].include? hpxml_file
     hpxml.refrigerators[0].primary_indicator = nil
   end
@@ -4631,7 +4716,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
      hpxml.rim_joists +
      hpxml.walls +
      hpxml.foundation_walls +
-     hpxml.frame_floors +
+     hpxml.floors +
      hpxml.slabs +
      hpxml.windows +
      hpxml.skylights +
@@ -4649,7 +4734,7 @@ def renumber_hpxml_ids(hpxml)
   { hpxml.walls => 'Wall',
     hpxml.foundation_walls => 'FoundationWall',
     hpxml.rim_joists => 'RimJoist',
-    hpxml.frame_floors => 'FrameFloor',
+    hpxml.floors => 'Floor',
     hpxml.roofs => 'Roof',
     hpxml.slabs => 'Slab',
     hpxml.windows => 'Window',
@@ -4666,8 +4751,8 @@ def renumber_hpxml_ids(hpxml)
         if attic_or_fnd.respond_to?(:attached_to_rim_joist_idrefs) && !attic_or_fnd.attached_to_rim_joist_idrefs.nil? && !attic_or_fnd.attached_to_rim_joist_idrefs.delete(surf.id).nil?
           attic_or_fnd.attached_to_rim_joist_idrefs << "#{surf_name}#{i + 1}"
         end
-        if attic_or_fnd.respond_to?(:attached_to_frame_floor_idrefs) && !attic_or_fnd.attached_to_frame_floor_idrefs.nil? && !attic_or_fnd.attached_to_frame_floor_idrefs.delete(surf.id).nil?
-          attic_or_fnd.attached_to_frame_floor_idrefs << "#{surf_name}#{i + 1}"
+        if attic_or_fnd.respond_to?(:attached_to_floor_idrefs) && !attic_or_fnd.attached_to_floor_idrefs.nil? && !attic_or_fnd.attached_to_floor_idrefs.delete(surf.id).nil?
+          attic_or_fnd.attached_to_floor_idrefs << "#{surf_name}#{i + 1}"
         end
         if attic_or_fnd.respond_to?(:attached_to_slab_idrefs) && !attic_or_fnd.attached_to_slab_idrefs.nil? && !attic_or_fnd.attached_to_slab_idrefs.delete(surf.id).nil?
           attic_or_fnd.attached_to_slab_idrefs << "#{surf_name}#{i + 1}"
@@ -4700,291 +4785,37 @@ def renumber_hpxml_ids(hpxml)
   end
 end
 
-def download_epws
+def download_utility_rates
   require_relative 'HPXMLtoOpenStudio/resources/util'
+  require_relative 'ReportUtilityBills/resources/util'
 
-  require 'tempfile'
-  tmpfile = Tempfile.new('epw')
-
-  UrlResolver.fetch('https://data.nrel.gov/system/files/128/tmy3s-cache-csv.zip', tmpfile)
-
-  puts 'Extracting weather files...'
-  require 'zip'
-  weather_dir = File.join(File.dirname(__FILE__), 'weather')
-  Zip.on_exists_proc = true
-  Zip::File.open(tmpfile.path.to_s) do |zip_file|
-    zip_file.each do |f|
-      zip_file.extract(f, File.join(weather_dir, f.name))
-    end
-  end
-
-  num_epws_actual = Dir[File.join(weather_dir, '*.epw')].count
-  puts "#{num_epws_actual} weather files are available in the weather directory."
-  puts 'Completed.'
-  exit!
-end
-
-def get_elements_from_sample_files(hpxml_docs)
-  elements_being_used = []
-  hpxml_docs.each do |xml, hpxml_doc|
-    root = XMLHelper.get_element(hpxml_doc, '/HPXML')
-    root.each_node do |node|
-      next unless node.is_a?(Oga::XML::Element)
-
-      ancestors = []
-      node.each_ancestor do |parent_node|
-        ancestors << ['h:', parent_node.name].join()
-      end
-      parent_element_xpath = ancestors.reverse
-      child_element_xpath = ['h:', node.name].join()
-      element_xpath = [parent_element_xpath, child_element_xpath].join('/')
-
-      next if element_xpath.include? 'extension'
-
-      elements_being_used << element_xpath if not elements_being_used.include? element_xpath
-    end
-  end
-
-  return elements_being_used
-end
-
-def create_schematron_hpxml_validator(hpxml_docs)
-  puts 'Generating HPXMLvalidator.xml...'
-  elements_in_sample_files = get_elements_from_sample_files(hpxml_docs)
-
-  hpxml_base_elements_xsd = File.read(File.join(File.dirname(__FILE__), 'HPXMLtoOpenStudio', 'resources', 'hpxml_schema', 'HPXMLBaseElements.xsd'))
-  hpxml_base_elements_xsd_doc = Oga.parse_xml(hpxml_base_elements_xsd)
-
-  # construct dictionary for enumerations and min/max values of HPXML data types
-  hpxml_data_types_xsd = File.read(File.join(File.dirname(__FILE__), 'HPXMLtoOpenStudio', 'resources', 'hpxml_schema', 'HPXMLDataTypes.xsd'))
-  hpxml_data_types_xsd_doc = Oga.parse_xml(hpxml_data_types_xsd)
-  hpxml_data_types_dict = {}
-  hpxml_data_types_xsd_doc.xpath('//xs:simpleType | //xs:complexType').each do |simple_type_element|
-    enums = []
-    simple_type_element.xpath('xs:restriction/xs:enumeration').each do |enum|
-      enums << enum.get('value')
-    end
-    minInclusive_element = simple_type_element.at_xpath('xs:restriction/xs:minInclusive')
-    min_inclusive = minInclusive_element.get('value') if not minInclusive_element.nil?
-    maxInclusive_element = simple_type_element.at_xpath('xs:restriction/xs:maxInclusive')
-    max_inclusive = maxInclusive_element.get('value') if not maxInclusive_element.nil?
-    minExclusive_element = simple_type_element.at_xpath('xs:restriction/xs:minExclusive')
-    min_exclusive = minExclusive_element.get('value') if not minExclusive_element.nil?
-    maxExclusive_element = simple_type_element.at_xpath('xs:restriction/xs:maxExclusive')
-    max_exclusive = maxExclusive_element.get('value') if not maxExclusive_element.nil?
-
-    simple_type_element_name = simple_type_element.get('name')
-    hpxml_data_types_dict[simple_type_element_name] = {}
-    hpxml_data_types_dict[simple_type_element_name][:enums] = enums
-    hpxml_data_types_dict[simple_type_element_name][:min_inclusive] = min_inclusive
-    hpxml_data_types_dict[simple_type_element_name][:max_inclusive] = max_inclusive
-    hpxml_data_types_dict[simple_type_element_name][:min_exclusive] = min_exclusive
-    hpxml_data_types_dict[simple_type_element_name][:max_exclusive] = max_exclusive
-  end
-
-  # construct HPXMLvalidator.xml
-  hpxml_validator = XMLHelper.create_doc(version = '1.0', encoding = 'UTF-8')
-  root = XMLHelper.add_element(hpxml_validator, 'sch:schema')
-  XMLHelper.add_attribute(root, 'xmlns:sch', 'http://purl.oclc.org/dsdl/schematron')
-  XMLHelper.add_element(root, 'sch:title', 'HPXML Schematron Validator: HPXML.xsd', :string)
-  name_space = XMLHelper.add_element(root, 'sch:ns')
-  XMLHelper.add_attribute(name_space, 'uri', 'http://hpxmlonline.com/2019/10')
-  XMLHelper.add_attribute(name_space, 'prefix', 'h')
-  pattern = XMLHelper.add_element(root, 'sch:pattern')
-
-  # construct complexType and group elements dictionary
-  complex_type_or_group_dict = {}
-  ['//xs:complexType', '//xs:group', '//xs:element'].each do |param|
-    hpxml_base_elements_xsd_doc.xpath(param).each do |param_type|
-      next if param_type.name == 'element' && (not ['XMLTransactionHeaderInformation', 'ProjectStatus', 'SoftwareInfo'].include?(param_type.get('name')))
-      next if param_type.get('name').nil?
-
-      param_type_name = param_type.get('name')
-      complex_type_or_group_dict[param_type_name] = {}
-
-      elements = { 'child' => [], 'base' => [] }
-      param_type.each_node do |element|
-        elements['child'] << element
-        next unless element.is_a? Oga::XML::Element
-
-        next unless element.name == 'extension'
-
-        base_element_name = element.get('base').to_s
-        hpxml_base_elements_xsd_doc.xpath("#{param}[@name='#{base_element_name}']").each do |base_element|
-          base_element.each_node do |element|
-            elements['base'] << element
-          end
-        end
-      end
+  rates_dir = File.join(File.dirname(__FILE__), 'ReportUtilityBills/resources/detailed_rates')
+  FileUtils.mkdir(rates_dir) if !File.exist?(rates_dir)
+  filepath = File.join(rates_dir, 'usurdb.csv')
 
-      elements.each do |element_child_or_base, element_list|
-        element_list.each do |element|
-          next unless element.is_a? Oga::XML::Element
-          next unless (element.name == 'element' || element.name == 'group')
-          next if element.name == 'element' && (element.get('name').nil? && element.get('ref').nil?)
-          next if element.name == 'group' && element.get('ref').nil?
+  if !File.exist?(filepath)
+    require 'tempfile'
+    tmpfile = Tempfile.new('rates')
 
-          ancestors = []
-          element.each_ancestor do |node|
-            next if node.get('name').nil?
-            next if node.get('name') == param_type.get('name') # exclude complexType name from element xpath
+    UrlResolver.fetch('https://openei.org/apps/USURDB/download/usurdb.csv.gz', tmpfile)
 
-            ancestors << node.get('name')
-          end
-          ancestors.shift if element_child_or_base == 'base'
-
-          parent_element_names = ancestors.reverse
-          if element.name == 'element'
-            child_element_name = element.get('name')
-            child_element_name = element.get('ref') if child_element_name.nil? # Backup
-            element_type = element.get('type')
-            element_type = element.get('ref') if element_type.nil? # Backup
-          elsif element.name == 'group'
-            child_element_name = nil # exclude group name from the element's xpath
-            element_type = element.get('ref')
-          end
-          element_xpath = parent_element_names.push(child_element_name)
-          complex_type_or_group_dict[param_type_name][element_xpath] = element_type
-        end
+    puts 'Extracting utility rates...'
+    require 'zlib'
+    Zlib::GzipReader.open(tmpfile.path.to_s) do |input_stream|
+      File.open(filepath, 'w') do |output_stream|
+        IO.copy_stream(input_stream, output_stream)
       end
     end
   end
 
-  element_xpaths = {}
-  top_level_elements_of_interest = elements_in_sample_files.map { |e| e.split('/')[1].gsub('h:', '') }.uniq
-  top_level_elements_of_interest.each do |element|
-    top_level_element = []
-    top_level_element << element
-    top_level_element_type = element
-    get_element_full_xpaths(element_xpaths, complex_type_or_group_dict, top_level_element, top_level_element_type)
-  end
-
-  # Add enumeration and min/max numeric values
-  rules = {}
-  element_xpaths.each do |element_xpath, element_type|
-    next if element_type.nil?
-
-    # Skip element xpaths not being used in sample files
-    element_xpath_with_prefix = element_xpath.compact.map { |e| "h:#{e}" }
-    context_xpath = element_xpath_with_prefix.join('/').chomp('/')
-    next unless elements_in_sample_files.any? { |item| item.include? context_xpath }
-
-    hpxml_data_type_name = [element_type, '_simple'].join() # FUTURE: This may need to be improved later since enumeration and minimum/maximum values cannot be guaranteed to always be placed within simpleType.
-    hpxml_data_type = hpxml_data_types_dict[hpxml_data_type_name]
-    hpxml_data_type = hpxml_data_types_dict[element_type] if hpxml_data_type.nil? # Backup
-    if hpxml_data_type.nil?
-      fail "Could not find data type name for '#{element_type}'."
-    end
-
-    next if hpxml_data_type[:enums].empty? && hpxml_data_type[:min_inclusive].nil? && hpxml_data_type[:max_inclusive].nil? && hpxml_data_type[:min_exclusive].nil? && hpxml_data_type[:max_exclusive].nil?
-
-    element_name = context_xpath.split('/')[-1]
-    context_xpath = context_xpath.split('/')[0..-2].join('/').chomp('/').prepend('/h:HPXML/')
-    rule = rules[context_xpath]
-    if rule.nil?
-      # Need new rule
-      rule = XMLHelper.add_element(pattern, 'sch:rule')
-      XMLHelper.add_attribute(rule, 'context', context_xpath)
-      rules[context_xpath] = rule
-    end
-
-    if not hpxml_data_type[:enums].empty?
-      assertion = XMLHelper.add_element(rule, 'sch:assert', "Expected #{element_name.gsub('h:', '')} to be \"#{hpxml_data_type[:enums].join('" or "')}\"", :string)
-      XMLHelper.add_attribute(assertion, 'role', 'ERROR')
-      XMLHelper.add_attribute(assertion, 'test', "#{element_name}[#{hpxml_data_type[:enums].map { |e| "text()=\"#{e}\"" }.join(' or ')}] or not(#{element_name})")
-    else
-      if hpxml_data_type[:min_inclusive]
-        assertion = XMLHelper.add_element(rule, 'sch:assert', "Expected #{element_name.gsub('h:', '')} to be greater than or equal to #{hpxml_data_type[:min_inclusive]}", :string)
-        XMLHelper.add_attribute(assertion, 'role', 'ERROR')
-        XMLHelper.add_attribute(assertion, 'test', "number(#{element_name}) &gt;= #{hpxml_data_type[:min_inclusive]} or not(#{element_name})")
-      end
-      if hpxml_data_type[:max_inclusive]
-        assertion = XMLHelper.add_element(rule, 'sch:assert', "Expected #{element_name.gsub('h:', '')} to be less than or equal to #{hpxml_data_type[:max_inclusive]}", :string)
-        XMLHelper.add_attribute(assertion, 'role', 'ERROR')
-        XMLHelper.add_attribute(assertion, 'test', "number(#{element_name}) &lt;= #{hpxml_data_type[:max_inclusive]} or not(#{element_name})")
-      end
-      if hpxml_data_type[:min_exclusive]
-        assertion = XMLHelper.add_element(rule, 'sch:assert', "Expected #{element_name.gsub('h:', '')} to be greater than #{hpxml_data_type[:min_exclusive]}", :string)
-        XMLHelper.add_attribute(assertion, 'role', 'ERROR')
-        XMLHelper.add_attribute(assertion, 'test', "number(#{element_name}) &gt; #{hpxml_data_type[:min_exclusive]} or not(#{element_name})")
-      end
-      if hpxml_data_type[:max_exclusive]
-        assertion = XMLHelper.add_element(rule, 'sch:assert', "Expected #{element_name.gsub('h:', '')} to be less than #{hpxml_data_type[:max_exclusive]}", :string)
-        XMLHelper.add_attribute(assertion, 'role', 'ERROR')
-        XMLHelper.add_attribute(assertion, 'test', "number(#{element_name}) &lt; #{hpxml_data_type[:max_exclusive]} or not(#{element_name})")
-      end
-    end
-  end
+  num_rates_actual = process_usurdb(filepath)
 
-  # Add ID/IDref checks
-  # FUTURE: Dynamically obtain these lists
-  id_names = ['SystemIdentifier',
-              'BuildingID']
-  idref_names = ['AttachedToRoof',
-                 'AttachedToFrameFloor',
-                 'AttachedToSlab',
-                 'AttachedToFoundationWall',
-                 'AttachedToWall',
-                 'AttachedToRimJoist',
-                 'DistributionSystem',
-                 'AttachedToHVACDistributionSystem',
-                 'RelatedHVACSystem',
-                 'ConnectedTo']
-  elements_in_sample_files.each do |element_xpath|
-    element_name = element_xpath.split('/')[-1].gsub('h:', '')
-    context_xpath = "/#{element_xpath.split('/')[0..-2].join('/')}"
-    if id_names.include? element_name
-      rule = rules[context_xpath]
-      if rule.nil?
-        # Need new rule
-        rule = XMLHelper.add_element(pattern, 'sch:rule')
-        XMLHelper.add_attribute(rule, 'context', context_xpath)
-        rules[context_xpath] = rule
-      end
-      assertion = XMLHelper.add_element(rule, 'sch:assert', "Expected #{element_name} with id attribute", :string)
-      XMLHelper.add_attribute(assertion, 'role', 'ERROR')
-      XMLHelper.add_attribute(assertion, 'test', "count(h:#{element_name}[@id]) = 1")
-    elsif idref_names.include?(element_name)
-      rule = rules[context_xpath]
-      if rule.nil?
-        # Need new rule
-        rule = XMLHelper.add_element(pattern, 'sch:rule')
-        XMLHelper.add_attribute(rule, 'context', context_xpath)
-        rules[context_xpath] = rule
-      end
-      assertion = XMLHelper.add_element(rule, 'sch:assert', "Expected idref attribute for #{element_name}", :string)
-      XMLHelper.add_attribute(assertion, 'role', 'ERROR')
-      XMLHelper.add_attribute(assertion, 'test', "count(h:#{element_name}[@idref]) = count(h:#{element_name})")
-    end
-  end
-
-  XMLHelper.write_file(hpxml_validator, File.join(File.dirname(__FILE__), 'HPXMLtoOpenStudio', 'resources', 'hpxml_schematron', 'HPXMLvalidator.xml'))
-end
-
-def get_element_full_xpaths(element_xpaths, complex_type_or_group_dict, element_xpath, element_type)
-  if not complex_type_or_group_dict.keys.include? element_type
-    element_xpaths[element_xpath] = element_type
-  else
-    complex_type_or_group = deep_copy_object(complex_type_or_group_dict[element_type])
-    complex_type_or_group.each do |k, v|
-      child_element_xpath = k.unshift(element_xpath).flatten!
-      child_element_type = v
-
-      if not complex_type_or_group_dict.keys.include? child_element_type
-        element_xpaths[child_element_xpath] = child_element_type
-        next
-      end
-
-      get_element_full_xpaths(element_xpaths, complex_type_or_group_dict, child_element_xpath, child_element_type)
-    end
-  end
-end
-
-def deep_copy_object(obj)
-  return Marshal.load(Marshal.dump(obj))
+  puts "#{num_rates_actual} rate files are available in openei_rates.zip."
+  puts 'Completed.'
+  exit!
 end
 
-command_list = [:update_measures, :update_hpxmls, :cache_weather, :create_release_zips, :download_weather]
+command_list = [:update_measures, :update_hpxmls, :cache_weather, :create_release_zips, :download_utility_rates]
 
 def display_usage(command_list)
   puts "Usage: openstudio #{File.basename(__FILE__)} [COMMAND]\nCommands:\n  " + command_list.join("\n  ")
@@ -5012,7 +4843,17 @@ if ARGV[0].to_sym == :update_measures
   # Apply rubocop
   cops = ['Layout',
           'Lint/DeprecatedClassMethods',
+          'Lint/DuplicateElsifCondition',
+          'Lint/DuplicateHashKey',
+          'Lint/DuplicateMethods',
+          'Lint/InterpolationCheck',
+          'Lint/LiteralAsCondition',
           'Lint/RedundantStringCoercion',
+          'Lint/SelfAssignment',
+          'Lint/UnderscorePrefixedVariableName',
+          'Lint/UnusedBlockArgument',
+          'Lint/UnusedMethodArgument',
+          'Lint/UselessAssignment',
           'Style/AndOr',
           'Style/FrozenStringLiteralComment',
           'Style/HashSyntax',
@@ -5034,9 +4875,8 @@ if ARGV[0].to_sym == :update_measures
   # Update measures XMLs
   puts 'Updating measure.xmls...'
   require 'oga'
-  require_relative 'HPXMLtoOpenStudio/resources/xmlhelper'
   Dir['**/measure.xml'].each do |measure_xml|
-    for n_attempt in 1..5 # For some reason CLI randomly generates errors, so try multiple times; FIXME: Fix CLI so this doesn't happen
+    for n_attempt in 1..5 # For some reason CLI randomly generates errors, so try multiple times
       measure_dir = File.dirname(measure_xml)
       command = "#{OpenStudio.getOpenStudioCLI} measure -u '#{measure_dir}'"
       system(command, [:out, :err] => File::NULL)
@@ -5054,7 +4894,21 @@ if ARGV[0].to_sym == :update_measures
           fail "#{measure_xml}: #{err_val}" # Error generated all 5 times, fail
         else
           # Remove error from measure XML, try again
-          new_lines = File.readlines(measure_xml).select { |l| !l.include?('<error>') }
+          orig_lines = File.readlines(measure_xml)
+          new_lines = []
+          inside_error = false
+          orig_lines.each do |l|
+            if l.include? '<error>'
+              inside_error = true
+            end
+            if l.include? '</error>'
+              inside_error = false
+              next
+            end
+            next if inside_error
+
+            new_lines << l
+          end
           File.open(measure_xml, 'w') do |file|
             file.puts new_lines
           end
@@ -5072,17 +4926,10 @@ if ARGV[0].to_sym == :update_hpxmls
   ENV['HOMEDRIVE'] = 'C:\\' if !ENV['HOMEDRIVE'].nil? && ENV['HOMEDRIVE'].start_with?('U:')
 
   # Create sample/test HPXMLs
-  hpxml_docs = create_hpxmls()
-
-  # Create Schematron file that reflects HPXML schema
-  if not hpxml_docs.nil?
-    create_schematron_hpxml_validator(hpxml_docs)
-  end
+  create_hpxmls()
 end
 
 if ARGV[0].to_sym == :cache_weather
-  require_relative 'HPXMLtoOpenStudio/resources/weather'
-
   OpenStudio::Logger.instance.standardOutLogger.setLogLevel(OpenStudio::Fatal)
   runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
   puts 'Creating cache *.csv for weather files...'
@@ -5101,20 +4948,11 @@ if ARGV[0].to_sym == :cache_weather
   end
 end
 
-if ARGV[0].to_sym == :download_weather
-  download_epws
+if ARGV[0].to_sym == :download_utility_rates
+  download_utility_rates
 end
 
 if ARGV[0].to_sym == :create_release_zips
-  require_relative 'HPXMLtoOpenStudio/resources/version'
-
-  release_map = { File.join(File.dirname(__FILE__), "OpenStudio-HPXML-v#{Version::OS_HPXML_Version}-minimal.zip") => false,
-                  File.join(File.dirname(__FILE__), "OpenStudio-HPXML-v#{Version::OS_HPXML_Version}-full.zip") => true }
-
-  release_map.keys.each do |zip_path|
-    File.delete(zip_path) if File.exist? zip_path
-  end
-
   if ENV['CI']
     # CI doesn't have git, so default to everything
     git_files = Dir['**/*.*']
@@ -5137,8 +4975,6 @@ if ARGV[0].to_sym == :create_release_zips
            'BuildResidentialScheduleFile/resources/**/*.*',
            'HPXMLtoOpenStudio/measure.*',
            'HPXMLtoOpenStudio/resources/**/*.*',
-           'ReportHPXMLOutput/measure.*',
-           'ReportHPXMLOutput/resources/**/*.*',
            'ReportSimulationOutput/measure.*',
            'ReportSimulationOutput/resources/**/*.*',
            'ReportUtilityBills/measure.*',
@@ -5172,50 +5008,28 @@ if ARGV[0].to_sym == :create_release_zips
     if Dir.exist? fonts_dir
       FileUtils.rm_r(fonts_dir)
     end
-
-    # Check if we need to download weather files for the full release zip
-    num_epws_expected = 1011
-    num_epws_local = 0
-    files.each do |f|
-      Dir[f].each do |file|
-        next unless file.end_with? '.epw'
-
-        num_epws_local += 1
-      end
-    end
-
-    # Make sure we have the full set of weather files
-    if num_epws_local < num_epws_expected
-      puts 'Fetching all weather files...'
-      command = "#{OpenStudio.getOpenStudioCLI} #{__FILE__} download_weather"
-      log = `#{command}`
-    end
   end
 
   # Create zip files
   require 'zip'
-  release_map.each do |zip_path, include_all_epws|
-    puts "Creating #{zip_path}..."
-    Zip::File.open(zip_path, create: true) do |zipfile|
-      files.each do |f|
-        Dir[f].each do |file|
-          if file.start_with? 'documentation'
-            # always include
-          elsif include_all_epws
-            if (not git_files.include? file) && (not file.start_with? 'weather')
-              next
-            end
-          else
-            if not git_files.include? file
-              next
-            end
+  zip_path = File.join(File.dirname(__FILE__), "OpenStudio-HPXML-v#{Version::OS_HPXML_Version}.zip")
+  File.delete(zip_path) if File.exist? zip_path
+  puts "Creating #{zip_path}..."
+  Zip::File.open(zip_path, create: true) do |zipfile|
+    files.each do |f|
+      Dir[f].each do |file|
+        if file.start_with? 'documentation'
+          # always include
+        else
+          if not git_files.include? file
+            next
           end
-          zipfile.add(File.join('OpenStudio-HPXML', file), file)
         end
+        zipfile.add(File.join('OpenStudio-HPXML', file), file)
       end
     end
-    puts "Wrote file at #{zip_path}."
   end
+  puts "Wrote file at #{zip_path}."
 
   # Cleanup
   if not ENV['CI']