urbanopt-cli 0.6.2 → 0.7.1

data/example_files/resources/hpxml-measures/{SimulationOutputReport → ReportSimulationOutput}/tests/output_report_test.rb

@@ -7,7 +7,7 @@ require 'fileutils'
 require 'csv'
 require_relative '../measure.rb'
 
-class SimulationOutputReportTest < MiniTest::Test
+class ReportSimulationOutputTest < MiniTest::Test
   AnnualRows = [
     'Fuel Use: Electricity: Total (MBtu)',
     'Fuel Use: Electricity: Net (MBtu)',
@@ -105,18 +105,18 @@ class SimulationOutputReportTest < MiniTest::Test
     'End Use: Coal: Fireplace (MBtu)',
     'End Use: Coal: Mech Vent Preheating (MBtu)',
     'End Use: Coal: Generator (MBtu)',
-    'Load: Heating (MBtu)',
-    'Load: Cooling (MBtu)',
+    'Load: Heating: Delivered (MBtu)',
+    'Load: Cooling: Delivered (MBtu)',
     'Load: Hot Water: Delivered (MBtu)',
     'Load: Hot Water: Tank Losses (MBtu)',
     'Load: Hot Water: Desuperheater (MBtu)',
     'Load: Hot Water: Solar Thermal (MBtu)',
-    'Unmet Load: Heating (MBtu)',
-    'Unmet Load: Cooling (MBtu)',
+    'Unmet Hours: Heating (hr)',
+    'Unmet Hours: Cooling (hr)',
     'Peak Electricity: Winter Total (W)',
     'Peak Electricity: Summer Total (W)',
-    'Peak Load: Heating (kBtu)',
-    'Peak Load: Cooling (kBtu)',
+    'Peak Load: Heating: Delivered (kBtu)',
+    'Peak Load: Cooling: Delivered (kBtu)',
     'Component Load: Heating: Roofs (MBtu)',
     'Component Load: Heating: Ceilings (MBtu)',
     'Component Load: Heating: Walls (MBtu)',
@@ -157,174 +157,81 @@ class SimulationOutputReportTest < MiniTest::Test
     'Hot Water: Distribution Waste (gal)',
   ]
 
-  TimeseriesColsFuels = [
+  BaseHPXMLTimeseriesColsFuels = [
     '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 = [
-    'End Use: Electricity: Heating',
-    'End Use: Electricity: Heating Fans/Pumps',
+  BaseHPXMLTimeseriesColsEndUses = [
+    'End Use: Electricity: Clothes Dryer',
+    'End Use: Electricity: Clothes Washer',
     'End Use: Electricity: Cooling',
     'End Use: Electricity: Cooling Fans/Pumps',
+    'End Use: Electricity: Dishwasher',
+    'End Use: Electricity: Heating 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: Lighting Interior',
+    'End Use: Electricity: Plug Loads',
     'End Use: Electricity: Range/Oven',
-    'End Use: Electricity: Ceiling Fan',
+    'End Use: Electricity: Refrigerator',
     '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 = [
+  BaseHPXMLTimeseriesColsWaterUses = [
     'Hot Water: Clothes Washer',
     'Hot Water: Dishwasher',
-    'Hot Water: Fixtures',
     'Hot Water: Distribution Waste',
+    'Hot Water: Fixtures',
   ]
 
-  TimeseriesColsTotalLoads = [
-    'Load: Heating',
-    'Load: Cooling',
+  BaseHPXMLTimeseriesColsTotalLoads = [
+    'Load: Heating: Delivered',
+    'Load: Cooling: Delivered',
     'Load: Hot Water: Delivered',
   ]
 
-  TimeseriesColsComponentLoads = [
-    'Component Load: Heating: Roofs',
-    'Component Load: Heating: Ceilings',
-    'Component Load: Heating: Walls',
-    'Component Load: Heating: Rim Joists',
-    'Component Load: Heating: Foundation Walls',
-    'Component Load: Heating: Doors',
-    'Component Load: Heating: Windows',
-    'Component Load: Heating: Skylights',
-    'Component Load: Heating: Floors',
-    'Component Load: Heating: Slabs',
-    'Component Load: Heating: Internal Mass',
-    'Component Load: Heating: Infiltration',
-    'Component Load: Heating: Natural Ventilation',
-    'Component Load: Heating: Mechanical Ventilation',
-    'Component Load: Heating: Whole House Fan',
-    'Component Load: Heating: Ducts',
-    'Component Load: Heating: Internal Gains',
-    'Component Load: Cooling: Roofs',
+  BaseHPXMLTimeseriesColsComponentLoads = [
     'Component Load: Cooling: Ceilings',
-    'Component Load: Cooling: Walls',
-    'Component Load: Cooling: Rim Joists',
-    'Component Load: Cooling: Foundation Walls',
     'Component Load: Cooling: Doors',
-    'Component Load: Cooling: Windows',
-    'Component Load: Cooling: Skylights',
-    'Component Load: Cooling: Floors',
-    'Component Load: Cooling: Slabs',
-    'Component Load: Cooling: Internal Mass',
-    'Component Load: Cooling: Infiltration',
-    'Component Load: Cooling: Natural Ventilation',
-    'Component Load: Cooling: Mechanical Ventilation',
-    'Component Load: Cooling: Whole House Fan',
     'Component Load: Cooling: Ducts',
+    'Component Load: Cooling: Foundation Walls',
+    'Component Load: Cooling: Infiltration',
     'Component Load: Cooling: Internal Gains',
+    'Component Load: Cooling: Internal Mass',
+    'Component Load: Cooling: Mechanical Ventilation',
+    'Component Load: Cooling: Natural Ventilation',
+    'Component Load: Cooling: Rim Joists',
+    'Component Load: Cooling: Slabs',
+    'Component Load: Cooling: Walls',
+    'Component Load: Cooling: Windows',
+    'Component Load: Heating: Ceilings',
+    'Component Load: Heating: Doors',
+    'Component Load: Heating: Ducts',
+    'Component Load: Heating: Foundation Walls',
+    'Component Load: Heating: Infiltration',
+    'Component Load: Heating: Internal Gains',
+    'Component Load: Heating: Internal Mass',
+    'Component Load: Heating: Mechanical Ventilation',
+    'Component Load: Heating: Rim Joists',
+    'Component Load: Heating: Slabs',
+    'Component Load: Heating: Walls',
+    'Component Load: Heating: Windows',
   ]
 
-  TimeseriesColsUnmetLoads = [
-    'Unmet Load: Heating',
-    'Unmet Load: Cooling',
-  ]
-
-  TimeseriesColsZoneTemps = [
+  BaseHPXMLTimeseriesColsZoneTemps = [
     'Temperature: Attic - Unvented',
     'Temperature: Living Space',
   ]
 
-  TimeseriesColsTempsOtherSide = [
-    'Temperature: Other Multifamily Buffer Space',
-    'Temperature: Other Non-freezing Space',
-    'Temperature: Other Housing Unit',
-    'Temperature: Other Heated Space'
-  ]
-
-  TimeseriesColsAirflows = [
+  BaseHPXMLTimeseriesColsAirflows = [
     'Airflow: Infiltration',
     'Airflow: Mechanical Ventilation',
     'Airflow: Natural Ventilation',
-    'Airflow: Whole House Fan',
   ]
 
-  TimeseriesColsWeather = [
+  BaseHPXMLTimeseriesColsWeather = [
     'Weather: Drybulb Temperature',
     'Weather: Wetbulb Temperature',
     'Weather: Relative Humidity',
@@ -415,8 +322,8 @@ class SimulationOutputReportTest < MiniTest::Test
     'enduseCoalRangeOven',
     'enduseCoalMechVentPreheating',
     'enduseCoalGenerator',
-    'loadHeating',
-    'loadCooling',
+    'loadHeatingDelivered',
+    'loadCoolingDelivered',
     'loadHotWaterDelivered',
     'hpxml_cfa',
     'hpxml_nbr',
@@ -425,15 +332,13 @@ class SimulationOutputReportTest < MiniTest::Test
   ]
 
   def all_timeseries_cols
-    return (TimeseriesColsFuels +
-            TimeseriesColsEndUses +
-            TimeseriesColsWaterUses +
-            TimeseriesColsTotalLoads +
-            TimeseriesColsComponentLoads +
-            TimeseriesColsUnmetLoads +
-            TimeseriesColsZoneTemps +
-            TimeseriesColsAirflows +
-            TimeseriesColsWeather)
+    return (BaseHPXMLTimeseriesColsFuels +
+            BaseHPXMLTimeseriesColsEndUses +
+            BaseHPXMLTimeseriesColsWaterUses +
+            BaseHPXMLTimeseriesColsTotalLoads +
+            BaseHPXMLTimeseriesColsZoneTemps +
+            BaseHPXMLTimeseriesColsAirflows +
+            BaseHPXMLTimeseriesColsWeather)
   end
 
   def test_annual_only
@@ -445,7 +350,6 @@ 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 }
@@ -466,7 +370,6 @@ 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 }
@@ -486,14 +389,13 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsFuels
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsFuels
     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)
@@ -508,14 +410,13 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsEndUses
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsEndUses
     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)
@@ -530,18 +431,17 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsWaterUses
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsWaterUses
     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, TimeseriesColsWaterUses)
+    _check_for_nonzero_timeseries_value(timeseries_csv, BaseHPXMLTimeseriesColsWaterUses)
   end
 
   def test_timeseries_hourly_total_loads
@@ -552,18 +452,17 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsTotalLoads
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsTotalLoads
     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, TimeseriesColsTotalLoads)
+    _check_for_nonzero_timeseries_value(timeseries_csv, BaseHPXMLTimeseriesColsTotalLoads)
   end
 
   def test_timeseries_hourly_component_loads
@@ -575,42 +474,19 @@ class SimulationOutputReportTest < MiniTest::Test
                   '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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsComponentLoads
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsComponentLoads
     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, ['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',
@@ -619,18 +495,17 @@ 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 }
     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
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsZoneTemps
     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, TimeseriesColsZoneTemps)
+    _check_for_nonzero_timeseries_value(timeseries_csv, BaseHPXMLTimeseriesColsZoneTemps)
   end
 
   def test_timeseries_hourly_zone_temperatures_mf_space
@@ -641,7 +516,6 @@ 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 }
@@ -649,11 +523,17 @@ class SimulationOutputReportTest < MiniTest::Test
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
     actual_timeseries_cols = File.readlines(timeseries_csv)[0].strip.split(',')
-    TimeseriesColsTempsOtherSide.each do |expected_col|
+    cols_temps_other_side = [
+      'Temperature: Other Multifamily Buffer Space',
+      'Temperature: Other Non-freezing Space',
+      'Temperature: Other Housing Unit',
+      'Temperature: Other Heated Space'
+    ]
+    cols_temps_other_side.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)
+    _check_for_nonzero_timeseries_value(timeseries_csv, cols_temps_other_side)
   end
 
   def test_timeseries_hourly_airflows_with_exhaust_mechvent
@@ -664,18 +544,17 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsAirflows
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsAirflows
     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, TimeseriesColsAirflows.select { |t| t != 'Airflow: Whole House Fan' })
+    _check_for_nonzero_timeseries_value(timeseries_csv, BaseHPXMLTimeseriesColsAirflows.select { |t| t != 'Airflow: Whole House Fan' })
   end
 
   def test_timeseries_hourly_airflows_with_whf
@@ -686,18 +565,19 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsAirflows
+    add_cols = ['Airflow: Whole House Fan']
+    remove_cols = ['Airflow: Natural Ventilation']
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsAirflows + add_cols - remove_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_nonzero_timeseries_value(timeseries_csv, ['Airflow: Whole House Fan'])
+    _check_for_nonzero_timeseries_value(timeseries_csv, add_cols)
   end
 
   def test_timeseries_hourly_airflows_with_clothes_dryer_exhaust
@@ -708,14 +588,13 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsAirflows
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsAirflows
     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)
@@ -730,14 +609,13 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsAirflows
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsAirflows
     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)
@@ -752,14 +630,13 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsAirflows
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsAirflows
     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)
@@ -774,18 +651,17 @@ 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 }
     annual_csv, timeseries_csv, eri_csv = _test_measure(args_hash)
     assert(File.exist?(annual_csv))
     assert(File.exist?(timeseries_csv))
-    expected_timeseries_cols = ['Time'] + TimeseriesColsWeather
+    expected_timeseries_cols = ['Time'] + BaseHPXMLTimeseriesColsWeather
     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, TimeseriesColsWeather)
+    _check_for_nonzero_timeseries_value(timeseries_csv, BaseHPXMLTimeseriesColsWeather)
   end
 
   def test_timeseries_hourly_ALL
@@ -796,7 +672,6 @@ 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 }
@@ -818,7 +693,6 @@ 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 }
@@ -840,7 +714,6 @@ 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 }
@@ -862,7 +735,6 @@ 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 }
@@ -880,7 +752,6 @@ 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 }
@@ -898,7 +769,6 @@ 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 }
@@ -916,7 +786,6 @@ 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 }
@@ -934,7 +803,6 @@ 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 }
@@ -952,7 +820,6 @@ 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 }
@@ -970,7 +837,6 @@ 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 }
@@ -1002,7 +868,6 @@ 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 }