urbanopt-cli 0.5.2 → 0.6.0

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb

@@ -3,7 +3,6 @@
 require_relative '../resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_lighting.rb

@@ -3,7 +3,6 @@
 require_relative '../resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_location.rb

@@ -3,7 +3,6 @@
 require_relative '../resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_miscloads.rb

@@ -3,7 +3,6 @@
 require_relative '../resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_pv.rb

@@ -3,7 +3,6 @@
 require_relative '../resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_simcontrols.rb

@@ -3,7 +3,6 @@
 require_relative '../resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb

@@ -3,12 +3,11 @@
 require_relative '../resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
 
 class HPXMLtoOpenStudioValidationTest < MiniTest::Test
-  def before_setup
+  def setup
     @root_path = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..'))
 
     # load the Schematron xml

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_water_heater.rb

@@ -3,7 +3,6 @@
 require_relative '../resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/util.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+def get_ems_values(ems_objects, name)
+  values = {}
+  ems_objects.each do |ems_object|
+    next unless ems_object.name.to_s.include? name.gsub(' ', '_')
+
+    ems_object.lines.each do |line|
+      next unless line.downcase.start_with? 'set'
+
+      lhs, rhs = line.split('=')
+      lhs = lhs.gsub('Set', '').gsub('set', '').strip
+      rhs = rhs.gsub(',', '').gsub(';', '').strip
+      values[lhs] = [] if values[lhs].nil?
+      # eg. "Q = Q + 1.5"
+      if rhs.include? '+'
+        rhs_els = rhs.split('+')
+        rhs = rhs_els.map { |s| s.to_f }.sum(0.0)
+      else
+        rhs = rhs.to_f
+      end
+      values[lhs] << rhs
+    end
+  end
+  return values
+end

data/example_files/resources/hpxml-measures/README.md

@@ -3,7 +3,6 @@
 [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/NREL/OpenStudio-HPXML?include_prereleases)](https://github.com/NREL/OpenStudio-HPXML/releases)
 [![ci](https://github.com/NREL/OpenStudio-HPXML/workflows/ci/badge.svg)](https://github.com/NREL/OpenStudio-HPXML/actions)
 [![Documentation Status](https://readthedocs.org/projects/openstudio-hpxml/badge/?version=latest)](https://openstudio-hpxml.readthedocs.io/en/latest/?badge=latest)
-[![codecov](https://codecov.io/gh/NREL/OpenStudio-HPXML/branch/master/graph/badge.svg)](https://codecov.io/gh/NREL/OpenStudio-HPXML)
 
 OpenStudio-HPXML allows running residential EnergyPlus simulations using an [HPXML file](https://hpxml.nrel.gov/) for the building description.
 A Schematron document (`HPXMLtoOpenStudio/resources/EPvalidator.xml`) for the EnergyPlus use case is used to validate that the appropriate HPXML inputs are provided to run EnergyPlus.

data/example_files/resources/hpxml-measures/Rakefile

@@ -5,11 +5,10 @@
 
 require 'rake'
 require 'rake/testtask'
-require 'ci/reporter/rake/minitest'
 
 desc 'Run all tests'
 Rake::TestTask.new('test_all') do |t|
-  t.test_files = Dir['*/tests/*.rb']
+  t.test_files = Dir['*/tests/*.rb'] - Dir['workflow/tests/compare.rb']
   t.warning = false
   t.verbose = true
 end

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

@@ -154,7 +154,13 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     # Get a few things from the model
     get_object_maps()
 
-    loads_program = @model.getModelObjectByName(Constants.ObjectNameComponentLoadsProgram.gsub(' ', '_')).get.to_EnergyManagementSystemProgram.get
+    total_loads_program = @model.getModelObjectByName(Constants.ObjectNameTotalLoadsProgram.gsub(' ', '_')).get.to_EnergyManagementSystemProgram.get
+    comp_loads_program = @model.getModelObjectByName(Constants.ObjectNameComponentLoadsProgram.gsub(' ', '_'))
+    if comp_loads_program.is_initialized
+      comp_loads_program = comp_loads_program.get.to_EnergyManagementSystemProgram.get
+    else
+      comp_loads_program = nil
+    end
 
     # Annual outputs
 
@@ -202,13 +208,16 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
 
     # Add component load outputs
     @component_loads.each do |key, comp_load|
-      result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{comp_load.ems_variable}_annual_outvar,#{comp_load.ems_variable},Summed,ZoneTimestep,#{loads_program.name},J;").get
+      next if comp_loads_program.nil?
+      result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{comp_load.ems_variable}_annual_outvar,#{comp_load.ems_variable},Summed,ZoneTimestep,#{comp_loads_program.name},J;").get
       result << OpenStudio::IdfObject.load("Output:Variable,*,#{comp_load.ems_variable}_annual_outvar,runperiod;").get
     end
+
+    # Add total load outputs
     @loads.each do |load_type, load|
       next if load.ems_variable.nil?
 
-      result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{load.ems_variable}_annual_outvar,#{load.ems_variable},Summed,ZoneTimestep,#{loads_program.name},J;").get
+      result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{load.ems_variable}_annual_outvar,#{load.ems_variable},Summed,ZoneTimestep,#{total_loads_program.name},J;").get
       result << OpenStudio::IdfObject.load("Output:Variable,*,#{load.ems_variable}_annual_outvar,runperiod;").get
     end
 
@@ -295,7 +304,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
       @loads.each do |load_type, load|
         next if load.ems_variable.nil?
 
-        result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{load.ems_variable}_timeseries_outvar,#{load.ems_variable},Summed,ZoneTimestep,#{loads_program.name},J;").get
+        result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{load.ems_variable}_timeseries_outvar,#{load.ems_variable},Summed,ZoneTimestep,#{total_loads_program.name},J;").get
         result << OpenStudio::IdfObject.load("Output:Variable,*,#{load.ems_variable}_timeseries_outvar,#{timeseries_frequency};").get
       end
       # And add HotWaterDelivered:
@@ -304,7 +313,9 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
 
     if include_timeseries_component_loads
       @component_loads.each do |key, comp_load|
-        result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{comp_load.ems_variable}_timeseries_outvar,#{comp_load.ems_variable},Summed,ZoneTimestep,#{loads_program.name},J;").get
+        next if comp_loads_program.nil?
+
+        result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{comp_load.ems_variable}_timeseries_outvar,#{comp_load.ems_variable},Summed,ZoneTimestep,#{comp_loads_program.name},J;").get
         result << OpenStudio::IdfObject.load("Output:Variable,*,#{comp_load.ems_variable}_timeseries_outvar,#{timeseries_frequency};").get
       end
     end
@@ -373,10 +384,10 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     if not @eri_design.nil?
       # ERI run, store files in a particular location
       output_dir = File.dirname(hpxml_path)
-      design_name = @eri_design.gsub(' ', '')
-      annual_output_path = File.join(output_dir, "#{design_name}.#{output_format}")
-      eri_output_path = File.join(output_dir, "#{design_name}_ERI.csv")
-      timeseries_output_path = File.join(output_dir, "#{design_name}_#{timeseries_frequency.capitalize}.#{output_format}")
+      hpxml_name = File.basename(hpxml_path).gsub('.xml', '')
+      annual_output_path = File.join(output_dir, "#{hpxml_name}.#{output_format}")
+      eri_output_path = File.join(output_dir, "#{hpxml_name}_ERI.csv")
+      timeseries_output_path = File.join(output_dir, "#{hpxml_name}_#{timeseries_frequency.capitalize}.#{output_format}")
     else
       output_dir = File.dirname(@sqlFile.path.to_s)
       annual_output_path = File.join(output_dir, "results_annual.#{output_format}")
@@ -476,6 +487,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     outputs[:hpxml_cfa] = @hpxml.building_construction.conditioned_floor_area
     outputs[:hpxml_nbr] = @hpxml.building_construction.number_of_bedrooms
     outputs[:hpxml_nst] = @hpxml.building_construction.number_of_conditioned_floors_above_grade
+    outputs[:hpxml_residential_facility_type] = @hpxml.building_construction.residential_facility_type
 
     # HPXML Systems
     if not @eri_design.nil?
@@ -947,9 +959,11 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     @peak_loads.each do |load_type, peak_load|
       results_out << ["#{peak_load.name} (#{peak_load.annual_units})", peak_load.annual_output.round(2)]
     end
-    results_out << [line_break]
-    @component_loads.each do |load_type, load|
-      results_out << ["#{load.name} (#{load.annual_units})", load.annual_output.round(2)]
+    if @component_loads.values.map { |load| load.annual_output }.sum > 0 # Skip if component loads not calculated
+      results_out << [line_break]
+      @component_loads.each do |load_type, load|
+        results_out << ["#{load.name} (#{load.annual_units})", load.annual_output.round(2)]
+      end
     end
     results_out << [line_break]
     @hot_water_uses.each do |hot_water_type, hot_water|
@@ -1094,6 +1108,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     results_out << ['hpxml_cfa', outputs[:hpxml_cfa].to_s]
     results_out << ['hpxml_nbr', outputs[:hpxml_nbr].to_s]
     results_out << ['hpxml_nst', outputs[:hpxml_nst].to_s]
+    results_out << ['hpxml_residential_facility_type', '"' + outputs[:hpxml_residential_facility_type] + '"']
 
     CSV.open(csv_path, 'wb') { |csv| results_out.to_a.each { |elem| csv << elem } }
   end
@@ -1597,7 +1612,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
 
     return values if disable_ems_shift
 
-    if (key_values.size == 1) && (key_values[0] == 'EMS')
+    if (key_values.size == 1) && (key_values[0] == 'EMS') && (@timestamps.size > 0)
       if (timeseries_frequency.downcase == 'timestep' || (timeseries_frequency.downcase == 'hourly' && @model.getTimestep.numberOfTimestepsPerHour == 1))
         # Shift all values by 1 timestep due to EMS reporting lag
         return values[1..-1] + [values[-1]]
@@ -2131,6 +2146,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
       @end_uses[[FT::Oil, EUT::Lighting]] = EndUse.new(meters: ["#{Constants.ObjectNameMiscLighting}:InteriorEquipment:#{EPlus::FuelTypeOil}"])
       @end_uses[[FT::Oil, EUT::Fireplace]] = EndUse.new(meters: ["#{Constants.ObjectNameMiscFireplace}:InteriorEquipment:#{EPlus::FuelTypeOil}"])
     end
+    @end_uses[[FT::Oil, EUT::Generator]] = EndUse.new(meters: ["Cogeneration:#{EPlus::FuelTypeOil}"])
     @end_uses[[FT::Propane, EUT::Heating]] = EndUse.new(variables: OutputVars.SpaceHeating(EPlus::FuelTypePropane))
     @end_uses[[FT::Propane, EUT::HotWater]] = EndUse.new(variables: OutputVars.WaterHeating(EPlus::FuelTypePropane))
     @end_uses[[FT::Propane, EUT::ClothesDryer]] = EndUse.new(meters: ["#{Constants.ObjectNameClothesDryer}:InteriorEquipment:#{EPlus::FuelTypePropane}"])
@@ -2152,6 +2168,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
       @end_uses[[FT::WoodCord, EUT::Lighting]] = EndUse.new(meters: ["#{Constants.ObjectNameMiscLighting}:InteriorEquipment:#{EPlus::FuelTypeWoodCord}"])
       @end_uses[[FT::WoodCord, EUT::Fireplace]] = EndUse.new(meters: ["#{Constants.ObjectNameMiscFireplace}:InteriorEquipment:#{EPlus::FuelTypeWoodCord}"])
     end
+    @end_uses[[FT::WoodCord, EUT::Generator]] = EndUse.new(meters: ["Cogeneration:#{EPlus::FuelTypeWoodCord}"])
     @end_uses[[FT::WoodPellets, EUT::Heating]] = EndUse.new(variables: OutputVars.SpaceHeating(EPlus::FuelTypeWoodPellets))
     @end_uses[[FT::WoodPellets, EUT::HotWater]] = EndUse.new(variables: OutputVars.WaterHeating(EPlus::FuelTypeWoodPellets))
     @end_uses[[FT::WoodPellets, EUT::ClothesDryer]] = EndUse.new(meters: ["#{Constants.ObjectNameClothesDryer}:InteriorEquipment:#{EPlus::FuelTypeWoodPellets}"])
@@ -2162,6 +2179,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
       @end_uses[[FT::WoodPellets, EUT::Lighting]] = EndUse.new(meters: ["#{Constants.ObjectNameMiscLighting}:InteriorEquipment:#{EPlus::FuelTypeWoodPellets}"])
       @end_uses[[FT::WoodPellets, EUT::Fireplace]] = EndUse.new(meters: ["#{Constants.ObjectNameMiscFireplace}:InteriorEquipment:#{EPlus::FuelTypeWoodPellets}"])
     end
+    @end_uses[[FT::WoodPellets, EUT::Generator]] = EndUse.new(meters: ["Cogeneration:#{EPlus::FuelTypeWoodPellets}"])
     @end_uses[[FT::Coal, EUT::Heating]] = EndUse.new(variables: OutputVars.SpaceHeating(EPlus::FuelTypeCoal))
     @end_uses[[FT::Coal, EUT::HotWater]] = EndUse.new(variables: OutputVars.WaterHeating(EPlus::FuelTypeCoal))
     @end_uses[[FT::Coal, EUT::ClothesDryer]] = EndUse.new(meters: ["#{Constants.ObjectNameClothesDryer}:InteriorEquipment:#{EPlus::FuelTypeCoal}"])
@@ -2172,6 +2190,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
       @end_uses[[FT::Coal, EUT::Lighting]] = EndUse.new(meters: ["#{Constants.ObjectNameMiscLighting}:InteriorEquipment:#{EPlus::FuelTypeCoal}"])
       @end_uses[[FT::Coal, EUT::Fireplace]] = EndUse.new(meters: ["#{Constants.ObjectNameMiscFireplace}:InteriorEquipment:#{EPlus::FuelTypeCoal}"])
     end
+    @end_uses[[FT::Coal, EUT::Generator]] = EndUse.new(meters: ["Cogeneration:#{EPlus::FuelTypeCoal}"])
 
     @end_uses.each do |key, end_use|
       fuel_type, end_use_type = key

data/example_files/resources/hpxml-measures/SimulationOutputReport/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>simulation_output_report</name>
   <uid>df9d170c-c21a-4130-866d-0d46b06073fd</uid>
-  <version_id>3b09cd0b-92a2-41c6-b70e-c41c938ff1d2</version_id>
-  <version_modified>20210309T001238Z</version_modified>
+  <version_id>75305b3d-ecfd-4831-8d14-9c791b2b2580</version_id>
+  <version_modified>20210420T225414Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>SimulationOutputReport</class_name>
   <display_name>HPXML Simulation Output Report</display_name>
@@ -640,6 +640,13 @@
       <type>Double</type>
       <model_dependent>false</model_dependent>
     </output>
+    <output>
+      <name>End Use: Fuel Oil: Generator MBtu</name>
+      <display_name>End Use: Fuel Oil: Generator MBtu</display_name>
+      <short_name>End Use: Fuel Oil: Generator MBtu</short_name>
+      <type>Double</type>
+      <model_dependent>false</model_dependent>
+    </output>
     <output>
       <name>End Use: Propane: Heating MBtu</name>
       <display_name>End Use: Propane: Heating MBtu</display_name>
@@ -759,6 +766,13 @@
       <type>Double</type>
       <model_dependent>false</model_dependent>
     </output>
+    <output>
+      <name>End Use: Wood Cord: Generator MBtu</name>
+      <display_name>End Use: Wood Cord: Generator MBtu</display_name>
+      <short_name>End Use: Wood Cord: Generator MBtu</short_name>
+      <type>Double</type>
+      <model_dependent>false</model_dependent>
+    </output>
     <output>
       <name>End Use: Wood Pellets: Heating MBtu</name>
       <display_name>End Use: Wood Pellets: Heating MBtu</display_name>
@@ -815,6 +829,13 @@
       <type>Double</type>
       <model_dependent>false</model_dependent>
     </output>
+    <output>
+      <name>End Use: Wood Pellets: Generator MBtu</name>
+      <display_name>End Use: Wood Pellets: Generator MBtu</display_name>
+      <short_name>End Use: Wood Pellets: Generator MBtu</short_name>
+      <type>Double</type>
+      <model_dependent>false</model_dependent>
+    </output>
     <output>
       <name>End Use: Coal: Heating MBtu</name>
       <display_name>End Use: Coal: Heating MBtu</display_name>
@@ -871,6 +892,13 @@
       <type>Double</type>
       <model_dependent>false</model_dependent>
     </output>
+    <output>
+      <name>End Use: Coal: Generator MBtu</name>
+      <display_name>End Use: Coal: Generator MBtu</display_name>
+      <short_name>End Use: Coal: Generator MBtu</short_name>
+      <type>Double</type>
+      <model_dependent>false</model_dependent>
+    </output>
   </outputs>
   <provenances />
   <tags>
@@ -900,12 +928,6 @@
       <usage_type>resource</usage_type>
       <checksum>4E3EAA6F</checksum>
     </file>
-    <file>
-      <filename>output_report_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>4CF3D80C</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -915,7 +937,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>F29271E9</checksum>
+      <checksum>19F36E24</checksum>
+    </file>
+    <file>
+      <filename>output_report_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>A9C2B966</checksum>
     </file>
   </files>
 </measure>

data/example_files/resources/hpxml-measures/SimulationOutputReport/tests/output_report_test.rb

@@ -3,7 +3,6 @@
 require_relative '../../HPXMLtoOpenStudio/resources/minitest_helper'
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
-require 'minitest/autorun'
 require 'fileutils'
 require 'csv'
 require_relative '../measure.rb'
@@ -69,6 +68,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Fuel Oil: Lighting (MBtu)',
     'End Use: Fuel Oil: Fireplace (MBtu)',
     'End Use: Fuel Oil: Mech Vent Preheating (MBtu)',
+    'End Use: Fuel Oil: Generator (MBtu)',
     'End Use: Propane: Heating (MBtu)',
     'End Use: Propane: Hot Water (MBtu)',
     'End Use: Propane: Clothes Dryer (MBtu)',
@@ -86,6 +86,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Wood Cord: Lighting (MBtu)',
     'End Use: Wood Cord: Fireplace (MBtu)',
     'End Use: Wood Cord: Mech Vent Preheating (MBtu)',
+    'End Use: Wood Cord: Generator (MBtu)',
     'End Use: Wood Pellets: Heating (MBtu)',
     'End Use: Wood Pellets: Hot Water (MBtu)',
     'End Use: Wood Pellets: Clothes Dryer (MBtu)',
@@ -94,6 +95,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Wood Pellets: Lighting (MBtu)',
     'End Use: Wood Pellets: Fireplace (MBtu)',
     'End Use: Wood Pellets: Mech Vent Preheating (MBtu)',
+    'End Use: Wood Pellets: Generator (MBtu)',
     'End Use: Coal: Heating (MBtu)',
     'End Use: Coal: Hot Water (MBtu)',
     'End Use: Coal: Clothes Dryer (MBtu)',
@@ -102,6 +104,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Coal: Lighting (MBtu)',
     'End Use: Coal: Fireplace (MBtu)',
     'End Use: Coal: Mech Vent Preheating (MBtu)',
+    'End Use: Coal: Generator (MBtu)',
     'Load: Heating (MBtu)',
     'Load: Cooling (MBtu)',
     'Load: Hot Water: Delivered (MBtu)',
@@ -212,6 +215,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Fuel Oil: Grill',
     'End Use: Fuel Oil: Lighting',
     'End Use: Fuel Oil: Fireplace',
+    'End Use: Fuel Oil: Generator',
     'End Use: Propane: Heating',
     'End Use: Propane: Hot Water',
     'End Use: Propane: Clothes Dryer',
@@ -227,6 +231,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Wood Cord: Grill',
     'End Use: Wood Cord: Lighting',
     'End Use: Wood Cord: Fireplace',
+    'End Use: Wood Cord: Generator',
     'End Use: Wood Pellets: Heating',
     'End Use: Wood Pellets: Hot Water',
     'End Use: Wood Pellets: Clothes Dryer',
@@ -234,6 +239,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Wood Pellets: Grill',
     'End Use: Wood Pellets: Lighting',
     'End Use: Wood Pellets: Fireplace',
+    'End Use: Wood Pellets: Generator',
     'End Use: Coal: Heating',
     'End Use: Coal: Hot Water',
     'End Use: Coal: Clothes Dryer',
@@ -241,6 +247,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Coal: Grill',
     'End Use: Coal: Lighting',
     'End Use: Coal: Fireplace',
+    'End Use: Coal: Generator',
   ]
 
   TimeseriesColsWaterUses = [
@@ -383,6 +390,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'enduseFuelOilClothesDryer',
     'enduseFuelOilRangeOven',
     'enduseFuelOilMechVentPreheating',
+    'enduseFuelOilGenerator',
     'endusePropaneHeating',
     'endusePropaneHotWater',
     'endusePropaneClothesDryer',
@@ -394,22 +402,26 @@ class SimulationOutputReportTest < MiniTest::Test
     'enduseWoodCordClothesDryer',
     'enduseWoodCordRangeOven',
     'enduseWoodCordMechVentPreheating',
+    'enduseWoodCordGenerator',
     'enduseWoodPelletsHeating',
     'enduseWoodPelletsHotWater',
     'enduseWoodPelletsClothesDryer',
     'enduseWoodPelletsRangeOven',
     'enduseWoodPelletsMechVentPreheating',
+    'enduseWoodPelletsGenerator',
     'enduseCoalHeating',
     'enduseCoalHotWater',
     'enduseCoalClothesDryer',
     'enduseCoalRangeOven',
     'enduseCoalMechVentPreheating',
+    'enduseCoalGenerator',
     'loadHeating',
     'loadCooling',
     'loadHotWaterDelivered',
     'hpxml_cfa',
     'hpxml_nbr',
     'hpxml_nst',
+    'hpxml_residential_facility_type',
   ]
 
   def all_timeseries_cols
@@ -426,6 +438,7 @@ class SimulationOutputReportTest < MiniTest::Test
 
   def test_annual_only
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base.xml',
+                  'add_component_loads' => true,
                   'timeseries_frequency' => 'hourly',
                   'include_timeseries_fuel_consumptions' => false,
                   'include_timeseries_end_use_consumptions' => false,
@@ -446,6 +459,7 @@ class SimulationOutputReportTest < MiniTest::Test
 
   def test_annual_only2
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base.xml',
+                  'add_component_loads' => true,
                   'timeseries_frequency' => 'none',
                   'include_timeseries_fuel_consumptions' => true,
                   'include_timeseries_end_use_consumptions' => true,
@@ -554,6 +568,7 @@ class SimulationOutputReportTest < MiniTest::Test
 
   def test_timeseries_hourly_component_loads
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base.xml',
+                  'add_component_loads' => true,
                   'timeseries_frequency' => 'hourly',
                   'include_timeseries_fuel_consumptions' => false,
                   'include_timeseries_end_use_consumptions' => false,
@@ -973,14 +988,14 @@ class SimulationOutputReportTest < MiniTest::Test
     require 'oga'
     old_hpxml_path = File.join(File.dirname(__FILE__), '../../workflow/sample_files/base.xml')
     [Constants.CalcTypeERIReferenceHome, Constants.CalcTypeERIReferenceHome].each do |eri_design|
-      new_hpxml_path = File.join(File.dirname(__FILE__), '../../workflow/sample_files/base-eri.xml')
+      new_hpxml_path = File.join(File.dirname(__FILE__), '../../workflow/tests/test-eri.xml')
       FileUtils.cp(old_hpxml_path, new_hpxml_path)
       hpxml = HPXML.new(hpxml_path: new_hpxml_path)
       hpxml.header.eri_design = eri_design
       XMLHelper.write_file(hpxml.to_oga(), new_hpxml_path)
 
       # Run tests
-      args_hash = { 'hpxml_path' => '../workflow/sample_files/base-eri.xml',
+      args_hash = { 'hpxml_path' => '../workflow/tests/test-eri.xml',
                     'timeseries_frequency' => 'hourly',
                     'include_timeseries_fuel_consumptions' => true,
                     'include_timeseries_end_use_consumptions' => true,
@@ -1032,7 +1047,7 @@ class SimulationOutputReportTest < MiniTest::Test
     workflow.setWorkflowSteps(steps)
     osw_path = File.join(File.dirname(template_osw), 'test.osw')
     workflow.saveAs(osw_path)
-    assert_equal(11, found_args.size)
+    assert_equal(args_hash.size, found_args.size)
 
     # Run OSW
     success = system("#{OpenStudio.getOpenStudioCLI} run -w #{osw_path}")
@@ -1042,9 +1057,11 @@ class SimulationOutputReportTest < MiniTest::Test
     File.delete(osw_path)
 
     if not eri_design.nil?
-      annual_csv = File.join(File.dirname(template_osw), File.dirname(args_hash['hpxml_path']), "#{eri_design.gsub(' ', '')}.csv")
-      timeseries_csv = File.join(File.dirname(template_osw), File.dirname(args_hash['hpxml_path']), "#{eri_design.gsub(' ', '')}_Hourly.csv")
-      eri_csv = File.join(File.dirname(template_osw), File.dirname(args_hash['hpxml_path']), "#{eri_design.gsub(' ', '')}_ERI.csv")
+      output_dir = File.dirname(File.join(File.dirname(__FILE__), '..', args_hash['hpxml_path']))
+      hpxml_name = File.basename(args_hash['hpxml_path']).gsub('.xml', '')
+      annual_csv = File.join(output_dir, "#{hpxml_name}.csv")
+      timeseries_csv = File.join(output_dir, "#{hpxml_name}_Hourly.csv")
+      eri_csv = File.join(output_dir, "#{hpxml_name}_ERI.csv")
     else
       annual_csv = File.join(File.dirname(template_osw), 'run', 'results_annual.csv')
       timeseries_csv = File.join(File.dirname(template_osw), 'run', 'results_timeseries.csv')