urbanopt-cli 0.4.1 → 0.6.1

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

@@ -47,6 +47,7 @@ class EUT
   Lighting = 'Lighting'
   Fireplace = 'Fireplace'
   PV = 'PV'
+  Generator = 'Generator'
 end
 
 class HWT
@@ -84,7 +85,6 @@ class CLT
   NaturalVentilation = 'Natural Ventilation'
   MechanicalVentilation = 'Mechanical Ventilation'
   WholeHouseFan = 'Whole House Fan'
-  ClothesDryerExhaust = 'Clothes Dryer Exhaust'
   Ducts = 'Ducts'
   InternalGains = 'Internal Gains'
 end
@@ -101,7 +101,6 @@ class AFT
   MechanicalVentilation = 'Mechanical Ventilation'
   NaturalVentilation = 'Natural Ventilation'
   WholeHouseFan = 'Whole House Fan'
-  ClothesDryerExhaust = 'Clothes Dryer Exhaust'
 end
 
 class WT

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

@@ -2,103 +2,109 @@
 
 require_relative '../../HPXMLtoOpenStudio/resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
-require 'minitest/autorun'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'fileutils'
 require 'csv'
 require_relative '../measure.rb'
 
 class SimulationOutputReportTest < MiniTest::Test
   AnnualRows = [
-    'Electricity: Total (MBtu)',
-    'Electricity: Net (MBtu)',
-    'Natural Gas: Total (MBtu)',
-    'Fuel Oil: Total (MBtu)',
-    'Propane: Total (MBtu)',
-    'Wood Cord: Total (MBtu)',
-    'Wood Pellets: Total (MBtu)',
-    'Coal: Total (MBtu)',
-    'Electricity: Heating (MBtu)',
-    'Electricity: Heating Fans/Pumps (MBtu)',
-    'Electricity: Cooling (MBtu)',
-    'Electricity: Cooling Fans/Pumps (MBtu)',
-    'Electricity: Hot Water (MBtu)',
-    'Electricity: Hot Water Recirc Pump (MBtu)',
-    'Electricity: Hot Water Solar Thermal Pump (MBtu)',
-    'Electricity: Lighting Interior (MBtu)',
-    'Electricity: Lighting Garage (MBtu)',
-    'Electricity: Lighting Exterior (MBtu)',
-    'Electricity: Mech Vent (MBtu)',
-    'Electricity: Mech Vent Preheating (MBtu)',
-    'Electricity: Mech Vent Precooling (MBtu)',
-    'Electricity: Whole House Fan (MBtu)',
-    'Electricity: Refrigerator (MBtu)',
-    'Electricity: Freezer (MBtu)',
-    'Electricity: Dehumidifier (MBtu)',
-    'Electricity: Dishwasher (MBtu)',
-    'Electricity: Clothes Washer (MBtu)',
-    'Electricity: Clothes Dryer (MBtu)',
-    'Electricity: Range/Oven (MBtu)',
-    'Electricity: Ceiling Fan (MBtu)',
-    'Electricity: Television (MBtu)',
-    'Electricity: Plug Loads (MBtu)',
-    'Electricity: Electric Vehicle Charging (MBtu)',
-    'Electricity: Well Pump (MBtu)',
-    'Electricity: Pool Heater (MBtu)',
-    'Electricity: Pool Pump (MBtu)',
-    'Electricity: Hot Tub Heater (MBtu)',
-    'Electricity: Hot Tub Pump (MBtu)',
-    'Electricity: PV (MBtu)',
-    'Natural Gas: Heating (MBtu)',
-    'Natural Gas: Hot Water (MBtu)',
-    'Natural Gas: Clothes Dryer (MBtu)',
-    'Natural Gas: Range/Oven (MBtu)',
-    'Natural Gas: Pool Heater (MBtu)',
-    'Natural Gas: Hot Tub Heater (MBtu)',
-    'Natural Gas: Grill (MBtu)',
-    'Natural Gas: Lighting (MBtu)',
-    'Natural Gas: Fireplace (MBtu)',
-    'Natural Gas: Mech Vent Preheating (MBtu)',
-    'Fuel Oil: Heating (MBtu)',
-    'Fuel Oil: Hot Water (MBtu)',
-    'Fuel Oil: Clothes Dryer (MBtu)',
-    'Fuel Oil: Range/Oven (MBtu)',
-    'Fuel Oil: Grill (MBtu)',
-    'Fuel Oil: Lighting (MBtu)',
-    'Fuel Oil: Fireplace (MBtu)',
-    'Fuel Oil: Mech Vent Preheating (MBtu)',
-    'Propane: Heating (MBtu)',
-    'Propane: Hot Water (MBtu)',
-    'Propane: Clothes Dryer (MBtu)',
-    'Propane: Range/Oven (MBtu)',
-    'Propane: Grill (MBtu)',
-    'Propane: Lighting (MBtu)',
-    'Propane: Fireplace (MBtu)',
-    'Propane: Mech Vent Preheating (MBtu)',
-    'Wood Cord: Heating (MBtu)',
-    'Wood Cord: Hot Water (MBtu)',
-    'Wood Cord: Clothes Dryer (MBtu)',
-    'Wood Cord: Range/Oven (MBtu)',
-    'Wood Cord: Grill (MBtu)',
-    'Wood Cord: Lighting (MBtu)',
-    'Wood Cord: Fireplace (MBtu)',
-    'Wood Cord: Mech Vent Preheating (MBtu)',
-    'Wood Pellets: Heating (MBtu)',
-    'Wood Pellets: Hot Water (MBtu)',
-    'Wood Pellets: Clothes Dryer (MBtu)',
-    'Wood Pellets: Range/Oven (MBtu)',
-    'Wood Pellets: Grill (MBtu)',
-    'Wood Pellets: Lighting (MBtu)',
-    'Wood Pellets: Fireplace (MBtu)',
-    'Wood Pellets: Mech Vent Preheating (MBtu)',
-    'Coal: Heating (MBtu)',
-    'Coal: Hot Water (MBtu)',
-    'Coal: Clothes Dryer (MBtu)',
-    'Coal: Range/Oven (MBtu)',
-    'Coal: Grill (MBtu)',
-    'Coal: Lighting (MBtu)',
-    'Coal: Fireplace (MBtu)',
-    'Coal: Mech Vent Preheating (MBtu)',
+    'Fuel Use: Electricity: Total (MBtu)',
+    'Fuel Use: Electricity: Net (MBtu)',
+    'Fuel Use: Natural Gas: Total (MBtu)',
+    'Fuel Use: Fuel Oil: Total (MBtu)',
+    'Fuel Use: Propane: Total (MBtu)',
+    'Fuel Use: Wood Cord: Total (MBtu)',
+    'Fuel Use: Wood Pellets: Total (MBtu)',
+    'Fuel Use: Coal: Total (MBtu)',
+    'End Use: Electricity: Heating (MBtu)',
+    'End Use: Electricity: Heating Fans/Pumps (MBtu)',
+    'End Use: Electricity: Cooling (MBtu)',
+    'End Use: Electricity: Cooling Fans/Pumps (MBtu)',
+    'End Use: Electricity: Hot Water (MBtu)',
+    'End Use: Electricity: Hot Water Recirc Pump (MBtu)',
+    'End Use: Electricity: Hot Water Solar Thermal Pump (MBtu)',
+    'End Use: Electricity: Lighting Interior (MBtu)',
+    'End Use: Electricity: Lighting Garage (MBtu)',
+    'End Use: Electricity: Lighting Exterior (MBtu)',
+    'End Use: Electricity: Mech Vent (MBtu)',
+    'End Use: Electricity: Mech Vent Preheating (MBtu)',
+    'End Use: Electricity: Mech Vent Precooling (MBtu)',
+    'End Use: Electricity: Whole House Fan (MBtu)',
+    'End Use: Electricity: Refrigerator (MBtu)',
+    'End Use: Electricity: Freezer (MBtu)',
+    'End Use: Electricity: Dehumidifier (MBtu)',
+    'End Use: Electricity: Dishwasher (MBtu)',
+    'End Use: Electricity: Clothes Washer (MBtu)',
+    'End Use: Electricity: Clothes Dryer (MBtu)',
+    'End Use: Electricity: Range/Oven (MBtu)',
+    'End Use: Electricity: Ceiling Fan (MBtu)',
+    'End Use: Electricity: Television (MBtu)',
+    'End Use: Electricity: Plug Loads (MBtu)',
+    'End Use: Electricity: Electric Vehicle Charging (MBtu)',
+    'End Use: Electricity: Well Pump (MBtu)',
+    'End Use: Electricity: Pool Heater (MBtu)',
+    'End Use: Electricity: Pool Pump (MBtu)',
+    'End Use: Electricity: Hot Tub Heater (MBtu)',
+    'End Use: Electricity: Hot Tub Pump (MBtu)',
+    'End Use: Electricity: PV (MBtu)',
+    'End Use: Electricity: Generator (MBtu)',
+    'End Use: Natural Gas: Heating (MBtu)',
+    'End Use: Natural Gas: Hot Water (MBtu)',
+    'End Use: Natural Gas: Clothes Dryer (MBtu)',
+    'End Use: Natural Gas: Range/Oven (MBtu)',
+    'End Use: Natural Gas: Pool Heater (MBtu)',
+    'End Use: Natural Gas: Hot Tub Heater (MBtu)',
+    'End Use: Natural Gas: Grill (MBtu)',
+    'End Use: Natural Gas: Lighting (MBtu)',
+    'End Use: Natural Gas: Fireplace (MBtu)',
+    'End Use: Natural Gas: Mech Vent Preheating (MBtu)',
+    'End Use: Natural Gas: Generator (MBtu)',
+    'End Use: Fuel Oil: Heating (MBtu)',
+    'End Use: Fuel Oil: Hot Water (MBtu)',
+    'End Use: Fuel Oil: Clothes Dryer (MBtu)',
+    'End Use: Fuel Oil: Range/Oven (MBtu)',
+    'End Use: Fuel Oil: Grill (MBtu)',
+    '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)',
+    'End Use: Propane: Range/Oven (MBtu)',
+    'End Use: Propane: Grill (MBtu)',
+    'End Use: Propane: Lighting (MBtu)',
+    'End Use: Propane: Fireplace (MBtu)',
+    'End Use: Propane: Mech Vent Preheating (MBtu)',
+    'End Use: Propane: Generator (MBtu)',
+    'End Use: Wood Cord: Heating (MBtu)',
+    'End Use: Wood Cord: Hot Water (MBtu)',
+    'End Use: Wood Cord: Clothes Dryer (MBtu)',
+    'End Use: Wood Cord: Range/Oven (MBtu)',
+    'End Use: Wood Cord: Grill (MBtu)',
+    '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)',
+    'End Use: Wood Pellets: Range/Oven (MBtu)',
+    'End Use: Wood Pellets: Grill (MBtu)',
+    '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)',
+    'End Use: Coal: Range/Oven (MBtu)',
+    'End Use: Coal: Grill (MBtu)',
+    '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)',
@@ -126,7 +132,6 @@ class SimulationOutputReportTest < MiniTest::Test
     'Component Load: Heating: Natural Ventilation (MBtu)',
     'Component Load: Heating: Mechanical Ventilation (MBtu)',
     'Component Load: Heating: Whole House Fan (MBtu)',
-    'Component Load: Heating: Clothes Dryer Exhaust (MBtu)',
     'Component Load: Heating: Ducts (MBtu)',
     'Component Load: Heating: Internal Gains (MBtu)',
     'Component Load: Cooling: Roofs (MBtu)',
@@ -144,7 +149,6 @@ class SimulationOutputReportTest < MiniTest::Test
     'Component Load: Cooling: Natural Ventilation (MBtu)',
     'Component Load: Cooling: Mechanical Ventilation (MBtu)',
     'Component Load: Cooling: Whole House Fan (MBtu)',
-    'Component Load: Cooling: Clothes Dryer Exhaust (MBtu)',
     'Component Load: Cooling: Ducts (MBtu)',
     'Component Load: Cooling: Internal Gains (MBtu)',
     'Hot Water: Clothes Washer (gal)',
@@ -154,89 +158,96 @@ class SimulationOutputReportTest < MiniTest::Test
   ]
 
   TimeseriesColsFuels = [
-    'Electricity: Total',
-    'Natural Gas: Total',
-    'Fuel Oil: Total',
-    'Propane: Total',
-    'Wood Cord: Total',
-    'Wood Pellets: Total',
-    'Coal: Total',
+    'Fuel Use: Electricity: Total',
+    'Fuel Use: Natural Gas: Total',
+    'Fuel Use: Fuel Oil: Total',
+    'Fuel Use: Propane: Total',
+    'Fuel Use: Wood Cord: Total',
+    'Fuel Use: Wood Pellets: Total',
+    'Fuel Use: Coal: Total',
   ]
 
   TimeseriesColsEndUses = [
-    'Electricity: Heating',
-    'Electricity: Heating Fans/Pumps',
-    'Electricity: Cooling',
-    'Electricity: Cooling Fans/Pumps',
-    'Electricity: Hot Water',
-    'Electricity: Hot Water Recirc Pump',
-    'Electricity: Hot Water Solar Thermal Pump',
-    'Electricity: Lighting Interior',
-    'Electricity: Lighting Garage',
-    'Electricity: Lighting Exterior',
-    'Electricity: Mech Vent',
-    'Electricity: Whole House Fan',
-    'Electricity: Refrigerator',
-    'Electricity: Freezer',
-    'Electricity: Dehumidifier',
-    'Electricity: Dishwasher',
-    'Electricity: Clothes Washer',
-    'Electricity: Clothes Dryer',
-    'Electricity: Range/Oven',
-    'Electricity: Ceiling Fan',
-    'Electricity: Television',
-    'Electricity: Plug Loads',
-    'Electricity: Electric Vehicle Charging',
-    'Electricity: Well Pump',
-    'Electricity: Pool Heater',
-    'Electricity: Pool Pump',
-    'Electricity: Hot Tub Heater',
-    'Electricity: Hot Tub Pump',
-    'Electricity: PV',
-    'Natural Gas: Heating',
-    'Natural Gas: Hot Water',
-    'Natural Gas: Clothes Dryer',
-    'Natural Gas: Range/Oven',
-    'Natural Gas: Pool Heater',
-    'Natural Gas: Hot Tub Heater',
-    'Natural Gas: Grill',
-    'Natural Gas: Lighting',
-    'Natural Gas: Fireplace',
-    'Fuel Oil: Heating',
-    'Fuel Oil: Hot Water',
-    'Fuel Oil: Clothes Dryer',
-    'Fuel Oil: Range/Oven',
-    'Fuel Oil: Grill',
-    'Fuel Oil: Lighting',
-    'Fuel Oil: Fireplace',
-    'Propane: Heating',
-    'Propane: Hot Water',
-    'Propane: Clothes Dryer',
-    'Propane: Range/Oven',
-    'Propane: Grill',
-    'Propane: Lighting',
-    'Propane: Fireplace',
-    'Wood Cord: Heating',
-    'Wood Cord: Hot Water',
-    'Wood Cord: Clothes Dryer',
-    'Wood Cord: Range/Oven',
-    'Wood Cord: Grill',
-    'Wood Cord: Lighting',
-    'Wood Cord: Fireplace',
-    'Wood Pellets: Heating',
-    'Wood Pellets: Hot Water',
-    'Wood Pellets: Clothes Dryer',
-    'Wood Pellets: Range/Oven',
-    'Wood Pellets: Grill',
-    'Wood Pellets: Lighting',
-    'Wood Pellets: Fireplace',
-    'Coal: Heating',
-    'Coal: Hot Water',
-    'Coal: Clothes Dryer',
-    'Coal: Range/Oven',
-    'Coal: Grill',
-    'Coal: Lighting',
-    'Coal: Fireplace',
+    'End Use: Electricity: Heating',
+    'End Use: Electricity: Heating Fans/Pumps',
+    'End Use: Electricity: Cooling',
+    'End Use: Electricity: Cooling Fans/Pumps',
+    'End Use: Electricity: Hot Water',
+    'End Use: Electricity: Hot Water Recirc Pump',
+    'End Use: Electricity: Hot Water Solar Thermal Pump',
+    'End Use: Electricity: Lighting Interior',
+    'End Use: Electricity: Lighting Garage',
+    'End Use: Electricity: Lighting Exterior',
+    'End Use: Electricity: Mech Vent',
+    'End Use: Electricity: Whole House Fan',
+    'End Use: Electricity: Refrigerator',
+    'End Use: Electricity: Freezer',
+    'End Use: Electricity: Dehumidifier',
+    'End Use: Electricity: Dishwasher',
+    'End Use: Electricity: Clothes Washer',
+    'End Use: Electricity: Clothes Dryer',
+    'End Use: Electricity: Range/Oven',
+    'End Use: Electricity: Ceiling Fan',
+    'End Use: Electricity: Television',
+    'End Use: Electricity: Plug Loads',
+    'End Use: Electricity: Electric Vehicle Charging',
+    'End Use: Electricity: Well Pump',
+    'End Use: Electricity: Pool Heater',
+    'End Use: Electricity: Pool Pump',
+    'End Use: Electricity: Hot Tub Heater',
+    'End Use: Electricity: Hot Tub Pump',
+    'End Use: Electricity: PV',
+    'End Use: Electricity: Generator',
+    'End Use: Natural Gas: Heating',
+    'End Use: Natural Gas: Hot Water',
+    'End Use: Natural Gas: Clothes Dryer',
+    'End Use: Natural Gas: Range/Oven',
+    'End Use: Natural Gas: Pool Heater',
+    'End Use: Natural Gas: Hot Tub Heater',
+    'End Use: Natural Gas: Grill',
+    'End Use: Natural Gas: Lighting',
+    'End Use: Natural Gas: Fireplace',
+    'End Use: Natural Gas: Generator',
+    'End Use: Fuel Oil: Heating',
+    'End Use: Fuel Oil: Hot Water',
+    'End Use: Fuel Oil: Clothes Dryer',
+    'End Use: Fuel Oil: Range/Oven',
+    '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',
+    'End Use: Propane: Range/Oven',
+    'End Use: Propane: Grill',
+    'End Use: Propane: Lighting',
+    'End Use: Propane: Fireplace',
+    'End Use: Propane: Generator',
+    'End Use: Wood Cord: Heating',
+    'End Use: Wood Cord: Hot Water',
+    'End Use: Wood Cord: Clothes Dryer',
+    'End Use: Wood Cord: Range/Oven',
+    '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',
+    'End Use: Wood Pellets: Range/Oven',
+    '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',
+    'End Use: Coal: Range/Oven',
+    'End Use: Coal: Grill',
+    'End Use: Coal: Lighting',
+    'End Use: Coal: Fireplace',
+    'End Use: Coal: Generator',
   ]
 
   TimeseriesColsWaterUses = [
@@ -249,6 +260,7 @@ class SimulationOutputReportTest < MiniTest::Test
   TimeseriesColsTotalLoads = [
     'Load: Heating',
     'Load: Cooling',
+    'Load: Hot Water: Delivered',
   ]
 
   TimeseriesColsComponentLoads = [
@@ -267,7 +279,6 @@ class SimulationOutputReportTest < MiniTest::Test
     'Component Load: Heating: Natural Ventilation',
     'Component Load: Heating: Mechanical Ventilation',
     'Component Load: Heating: Whole House Fan',
-    'Component Load: Heating: Clothes Dryer Exhaust',
     'Component Load: Heating: Ducts',
     'Component Load: Heating: Internal Gains',
     'Component Load: Cooling: Roofs',
@@ -285,11 +296,15 @@ class SimulationOutputReportTest < MiniTest::Test
     'Component Load: Cooling: Natural Ventilation',
     'Component Load: Cooling: Mechanical Ventilation',
     'Component Load: Cooling: Whole House Fan',
-    'Component Load: Cooling: Clothes Dryer Exhaust',
     'Component Load: Cooling: Ducts',
     'Component Load: Cooling: Internal Gains',
   ]
 
+  TimeseriesColsUnmetLoads = [
+    'Unmet Load: Heating',
+    'Unmet Load: Cooling',
+  ]
+
   TimeseriesColsZoneTemps = [
     'Temperature: Attic - Unvented',
     'Temperature: Living Space',
@@ -307,7 +322,6 @@ class SimulationOutputReportTest < MiniTest::Test
     'Airflow: Mechanical Ventilation',
     'Airflow: Natural Ventilation',
     'Airflow: Whole House Fan',
-    'Airflow: Clothes Dryer Exhaust'
   ]
 
   TimeseriesColsWeather = [
@@ -364,42 +378,50 @@ class SimulationOutputReportTest < MiniTest::Test
     'enduseElectricityTelevision',
     'enduseElectricityPlugLoads',
     'enduseElectricityPV',
+    'enduseElectricityGenerator',
     'enduseNaturalGasHeating',
     'enduseNaturalGasHotWater',
     'enduseNaturalGasClothesDryer',
     'enduseNaturalGasRangeOven',
     'enduseNaturalGasMechVentPreheating',
+    'enduseNaturalGasGenerator',
     'enduseFuelOilHeating',
     'enduseFuelOilHotWater',
     'enduseFuelOilClothesDryer',
     'enduseFuelOilRangeOven',
     'enduseFuelOilMechVentPreheating',
+    'enduseFuelOilGenerator',
     'endusePropaneHeating',
     'endusePropaneHotWater',
     'endusePropaneClothesDryer',
     'endusePropaneRangeOven',
     'endusePropaneMechVentPreheating',
+    'endusePropaneGenerator',
     'enduseWoodCordHeating',
     'enduseWoodCordHotWater',
     '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
@@ -408,6 +430,7 @@ class SimulationOutputReportTest < MiniTest::Test
             TimeseriesColsWaterUses +
             TimeseriesColsTotalLoads +
             TimeseriesColsComponentLoads +
+            TimeseriesColsUnmetLoads +
             TimeseriesColsZoneTemps +
             TimeseriesColsAirflows +
             TimeseriesColsWeather)
@@ -415,12 +438,14 @@ 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,
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => false }
@@ -434,12 +459,14 @@ 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,
                   'include_timeseries_hot_water_uses' => true,
                   'include_timeseries_total_loads' => true,
                   'include_timeseries_component_loads' => true,
+                  'include_timeseries_unmet_loads' => true,
                   'include_timeseries_zone_temperatures' => true,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => true }
@@ -459,6 +486,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => false }
@@ -469,7 +497,7 @@ class SimulationOutputReportTest < MiniTest::Test
     actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
     assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(8760, File.readlines(timeseries_csv).size - 2)
-    _check_for_nonzero_timeseries_value(timeseries_csv, ['Electricity: Total'])
+    _check_for_nonzero_timeseries_value(timeseries_csv, ['Fuel Use: Electricity: Total'])
   end
 
   def test_timeseries_hourly_enduses
@@ -480,6 +508,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => false }
@@ -490,7 +519,7 @@ class SimulationOutputReportTest < MiniTest::Test
     actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
     assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(8760, File.readlines(timeseries_csv).size - 2)
-    _check_for_nonzero_timeseries_value(timeseries_csv, ['Electricity: Plug Loads'])
+    _check_for_nonzero_timeseries_value(timeseries_csv, ['End Use: Electricity: Plug Loads'])
   end
 
   def test_timeseries_hourly_hotwateruses
@@ -501,6 +530,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => true,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => false }
@@ -514,7 +544,7 @@ class SimulationOutputReportTest < MiniTest::Test
     _check_for_nonzero_timeseries_value(timeseries_csv, TimeseriesColsWaterUses)
   end
 
-  def test_timeseries_hourly_loads
+  def test_timeseries_hourly_total_loads
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base.xml',
                   'timeseries_frequency' => 'hourly',
                   'include_timeseries_fuel_consumptions' => false,
@@ -522,6 +552,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => true,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => false }
@@ -535,14 +566,16 @@ class SimulationOutputReportTest < MiniTest::Test
     _check_for_nonzero_timeseries_value(timeseries_csv, TimeseriesColsTotalLoads)
   end
 
-  def test_timeseries_hourly_componentloads
+  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,
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => true,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => false }
@@ -556,6 +589,28 @@ class SimulationOutputReportTest < MiniTest::Test
     _check_for_nonzero_timeseries_value(timeseries_csv, ['Component Load: Heating: Internal Gains', 'Component Load: Cooling: Internal Gains'])
   end
 
+  def test_timeseries_hourly_unmet_loads
+    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-hvac-undersized.xml',
+                  'timeseries_frequency' => 'hourly',
+                  'include_timeseries_fuel_consumptions' => false,
+                  'include_timeseries_end_use_consumptions' => false,
+                  'include_timeseries_hot_water_uses' => false,
+                  'include_timeseries_total_loads' => false,
+                  'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => true,
+                  'include_timeseries_zone_temperatures' => false,
+                  'include_timeseries_airflows' => false,
+                  'include_timeseries_weather' => false }
+    annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
+    assert(File.exist?(annual_csv))
+    assert(File.exist?(timeseries_csv))
+    expected_timeseries_cols = ['Time'] + TimeseriesColsUnmetLoads
+    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
+    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
+    assert_equal(8760, File.readlines(timeseries_csv).size - 2)
+    _check_for_nonzero_timeseries_value(timeseries_csv, TimeseriesColsUnmetLoads)
+  end
+
   def test_timeseries_hourly_zone_temperatures
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base.xml',
                   'timeseries_frequency' => 'hourly',
@@ -564,6 +619,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => true,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => false }
@@ -578,27 +634,29 @@ class SimulationOutputReportTest < MiniTest::Test
   end
 
   def test_timeseries_hourly_zone_temperatures_mf_space
-    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-enclosure-attached-multifamily.xml',
+    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-bldgtype-multifamily-adjacent-to-multiple.xml',
                   'timeseries_frequency' => 'hourly',
                   'include_timeseries_fuel_consumptions' => false,
                   'include_timeseries_end_use_consumptions' => false,
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => true,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => false }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsZoneTemps + TimeseriesColsTempsOtherSide
     actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
+    TimeseriesColsTempsOtherSide.each do |expected_col|
+      assert(actual_timeseries_cols.include? expected_col)
+    end
     assert_equal(8760, File.readlines(timeseries_csv).size - 2)
     _check_for_nonzero_timeseries_value(timeseries_csv, TimeseriesColsTempsOtherSide)
   end
 
-  def test_timeseries_hourly_airflows
+  def test_timeseries_hourly_airflows_with_exhaust_mechvent
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base-mechvent-exhaust.xml',
                   'timeseries_frequency' => 'hourly',
                   'include_timeseries_fuel_consumptions' => false,
@@ -606,6 +664,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => false }
@@ -627,6 +686,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => false }
@@ -648,6 +708,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => false }
@@ -658,7 +719,7 @@ class SimulationOutputReportTest < MiniTest::Test
     actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
     assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(8760, File.readlines(timeseries_csv).size - 2)
-    _check_for_nonzero_timeseries_value(timeseries_csv, ['Airflow: Clothes Dryer Exhaust'])
+    _check_for_nonzero_timeseries_value(timeseries_csv, ['Airflow: Mechanical Ventilation'])
   end
 
   def test_timeseries_hourly_airflows_with_balanced_mechvent
@@ -669,6 +730,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => false }
@@ -690,6 +752,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => false }
@@ -711,6 +774,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => false,
                   'include_timeseries_total_loads' => false,
                   'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
                   'include_timeseries_zone_temperatures' => false,
                   'include_timeseries_airflows' => false,
                   'include_timeseries_weather' => true }
@@ -732,6 +796,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => true,
                   'include_timeseries_total_loads' => true,
                   'include_timeseries_component_loads' => true,
+                  'include_timeseries_unmet_loads' => true,
                   'include_timeseries_zone_temperatures' => true,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => true }
@@ -742,7 +807,7 @@ class SimulationOutputReportTest < MiniTest::Test
     actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
     assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(8760, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
+    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['End Use: Electricity: Refrigerator'])
   end
 
   def test_timeseries_daily_ALL
@@ -753,6 +818,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => true,
                   'include_timeseries_total_loads' => true,
                   'include_timeseries_component_loads' => true,
+                  'include_timeseries_unmet_loads' => true,
                   'include_timeseries_zone_temperatures' => true,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => true }
@@ -763,7 +829,7 @@ class SimulationOutputReportTest < MiniTest::Test
     actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
     assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(365, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
+    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['End Use: Electricity: Refrigerator'])
   end
 
   def test_timeseries_monthly_ALL
@@ -774,6 +840,7 @@ class SimulationOutputReportTest < MiniTest::Test
                   'include_timeseries_hot_water_uses' => true,
                   'include_timeseries_total_loads' => true,
                   'include_timeseries_component_loads' => true,
+                  'include_timeseries_unmet_loads' => true,
                   'include_timeseries_zone_temperatures' => true,
                   'include_timeseries_airflows' => true,
                   'include_timeseries_weather' => true }
@@ -784,196 +851,133 @@ class SimulationOutputReportTest < MiniTest::Test
     actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
     assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(12, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
+    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['End Use: Electricity: Refrigerator'])
   end
 
-  def test_timeseries_timestep_ALL_60min
+  def test_timeseries_timestep
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base.xml',
                   'timeseries_frequency' => 'timestep',
                   'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
+                  'include_timeseries_end_use_consumptions' => false,
+                  'include_timeseries_hot_water_uses' => false,
+                  'include_timeseries_total_loads' => false,
+                  'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
+                  'include_timeseries_zone_temperatures' => false,
+                  'include_timeseries_airflows' => false,
+                  'include_timeseries_weather' => false }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(8760, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
   end
 
-  def test_timeseries_timestep_ALL_10min
+  def test_timeseries_timestep_10min
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base-simcontrol-timestep-10-mins.xml',
                   'timeseries_frequency' => 'timestep',
                   'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
+                  'include_timeseries_end_use_consumptions' => false,
+                  'include_timeseries_hot_water_uses' => false,
+                  'include_timeseries_total_loads' => false,
+                  'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
+                  'include_timeseries_zone_temperatures' => false,
+                  'include_timeseries_airflows' => false,
+                  'include_timeseries_weather' => false }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(52560, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
   end
 
-  def test_timeseries_hourly_ALL_runperiod_Jan
+  def test_timeseries_hourly_runperiod_Jan
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base-simcontrol-runperiod-1-month.xml',
                   'timeseries_frequency' => 'hourly',
                   'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
+                  'include_timeseries_end_use_consumptions' => false,
+                  'include_timeseries_hot_water_uses' => false,
+                  'include_timeseries_total_loads' => false,
+                  'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
+                  'include_timeseries_zone_temperatures' => false,
+                  'include_timeseries_airflows' => false,
+                  'include_timeseries_weather' => false }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(31 * 24, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
   end
 
-  def test_timeseries_daily_ALL_runperiod_Jan
+  def test_timeseries_daily_runperiod_Jan
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base-simcontrol-runperiod-1-month.xml',
                   'timeseries_frequency' => 'daily',
                   'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
+                  'include_timeseries_end_use_consumptions' => false,
+                  'include_timeseries_hot_water_uses' => false,
+                  'include_timeseries_total_loads' => false,
+                  'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
+                  'include_timeseries_zone_temperatures' => false,
+                  'include_timeseries_airflows' => false,
+                  'include_timeseries_weather' => false }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(31, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
   end
 
-  def test_timeseries_monthly_ALL_runperiod_Jan
+  def test_timeseries_monthly_runperiod_Jan
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base-simcontrol-runperiod-1-month.xml',
                   'timeseries_frequency' => 'monthly',
                   'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
+                  'include_timeseries_end_use_consumptions' => false,
+                  'include_timeseries_hot_water_uses' => false,
+                  'include_timeseries_total_loads' => false,
+                  'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
+                  'include_timeseries_zone_temperatures' => false,
+                  'include_timeseries_airflows' => false,
+                  'include_timeseries_weather' => false }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(1, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
   end
 
-  def test_timeseries_timestep_ALL_60min_runperiod_Jan
+  def test_timeseries_timestep_runperiod_Jan
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base-simcontrol-runperiod-1-month.xml',
                   'timeseries_frequency' => 'timestep',
                   'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
+                  'include_timeseries_end_use_consumptions' => false,
+                  'include_timeseries_hot_water_uses' => false,
+                  'include_timeseries_total_loads' => false,
+                  'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
+                  'include_timeseries_zone_temperatures' => false,
+                  'include_timeseries_airflows' => false,
+                  'include_timeseries_weather' => false }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(31 * 24, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
   end
 
-  def test_timeseries_hourly_ALL_AMY_2012
+  def test_timeseries_hourly_AMY_2012
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base-location-AMY-2012.xml',
                   'timeseries_frequency' => 'hourly',
                   'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
-    annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
-    assert(File.exist?(annual_csv))
-    assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
-    assert_equal(8784, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
-  end
-
-  def test_timeseries_daily_ALL_AMY_2012
-    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-location-AMY-2012.xml',
-                  'timeseries_frequency' => 'daily',
-                  'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
-    annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
-    assert(File.exist?(annual_csv))
-    assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
-    assert_equal(366, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
-  end
-
-  def test_timeseries_timestep_ALL_60min_AMY_2012
-    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-location-AMY-2012.xml',
-                  'timeseries_frequency' => 'timestep',
-                  'include_timeseries_fuel_consumptions' => true,
-                  'include_timeseries_end_use_consumptions' => true,
-                  'include_timeseries_hot_water_uses' => true,
-                  'include_timeseries_total_loads' => true,
-                  'include_timeseries_component_loads' => true,
-                  'include_timeseries_zone_temperatures' => true,
-                  'include_timeseries_airflows' => true,
-                  'include_timeseries_weather' => true }
+                  'include_timeseries_end_use_consumptions' => false,
+                  'include_timeseries_hot_water_uses' => false,
+                  'include_timeseries_total_loads' => false,
+                  'include_timeseries_component_loads' => false,
+                  'include_timeseries_unmet_loads' => false,
+                  'include_timeseries_zone_temperatures' => false,
+                  'include_timeseries_airflows' => false,
+                  'include_timeseries_weather' => false }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + all_timeseries_cols
-    actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    assert_equal(expected_timeseries_cols.sort, actual_timeseries_cols.sort)
     assert_equal(8784, File.readlines(timeseries_csv).size - 2)
-    _check_for_zero_baseload_timeseries_value(timeseries_csv, ['Electricity: Refrigerator'])
   end
 
   def test_eri_designs
@@ -984,20 +988,21 @@ 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,
                     'include_timeseries_hot_water_uses' => true,
                     'include_timeseries_total_loads' => true,
                     'include_timeseries_component_loads' => true,
+                    'include_timeseries_unmet_loads' => true,
                     'include_timeseries_zone_temperatures' => true,
                     'include_timeseries_airflows' => true,
                     'include_timeseries_weather' => true }
@@ -1042,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(10, found_args.size)
+    assert_equal(args_hash.size, found_args.size)
 
     # Run OSW
     success = system("#{OpenStudio.getOpenStudioCLI} run -w #{osw_path}")
@@ -1052,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')