urbanopt-cli 0.4.1 → 0.5.0

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>6a0d3505-355c-41e7-b6e8-0810cf256af3</version_id>
-  <version_modified>20201001T175006Z</version_modified>
+  <version_id>7680ed1f-ed1e-4fde-8308-6c565f4a83ef</version_id>
+  <version_modified>20201209T161002Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>SimulationOutputReport</class_name>
   <display_name>HPXML Simulation Output Report</display_name>
@@ -565,6 +565,15 @@
       <units></units>
       <model_dependent>false</model_dependent>
     </output>
+    <output>
+      <name>Electricity: Generator MBtu</name>
+      <display_name>Electricity: Generator MBtu</display_name>
+      <short_name>Electricity: Generator MBtu</short_name>
+      <description></description>
+      <type>Double</type>
+      <units></units>
+      <model_dependent>false</model_dependent>
+    </output>
     <output>
       <name>Natural Gas: Heating MBtu</name>
       <display_name>Natural Gas: Heating MBtu</display_name>
@@ -655,6 +664,15 @@
       <units></units>
       <model_dependent>false</model_dependent>
     </output>
+    <output>
+      <name>Natural Gas: Generator MBtu</name>
+      <display_name>Natural Gas: Generator MBtu</display_name>
+      <short_name>Natural Gas: Generator MBtu</short_name>
+      <description></description>
+      <type>Double</type>
+      <units></units>
+      <model_dependent>false</model_dependent>
+    </output>
     <output>
       <name>Fuel Oil: Heating MBtu</name>
       <display_name>Fuel Oil: Heating MBtu</display_name>
@@ -799,6 +817,15 @@
       <units></units>
       <model_dependent>false</model_dependent>
     </output>
+    <output>
+      <name>Propane: Generator MBtu</name>
+      <display_name>Propane: Generator MBtu</display_name>
+      <short_name>Propane: Generator MBtu</short_name>
+      <description></description>
+      <type>Double</type>
+      <units></units>
+      <model_dependent>false</model_dependent>
+    </output>
     <output>
       <name>Wood Cord: Heating MBtu</name>
       <display_name>Wood Cord: Heating MBtu</display_name>
@@ -1042,13 +1069,13 @@
       <filename>constants.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>73FDADAA</checksum>
+      <checksum>4E3EAA6F</checksum>
     </file>
     <file>
       <filename>output_report_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>DCBA4974</checksum>
+      <checksum>D21E96E6</checksum>
     </file>
     <file>
       <version>
@@ -1059,7 +1086,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>E4BE9F1C</checksum>
+      <checksum>14FA021B</checksum>
     </file>
   </files>
 </measure>

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,7 +2,7 @@
 
 require_relative '../../HPXMLtoOpenStudio/resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'minitest/autorun'
 require 'fileutils'
 require 'csv'
@@ -49,6 +49,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'Electricity: Hot Tub Heater (MBtu)',
     'Electricity: Hot Tub Pump (MBtu)',
     'Electricity: PV (MBtu)',
+    'Electricity: Generator (MBtu)',
     'Natural Gas: Heating (MBtu)',
     'Natural Gas: Hot Water (MBtu)',
     'Natural Gas: Clothes Dryer (MBtu)',
@@ -59,6 +60,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'Natural Gas: Lighting (MBtu)',
     'Natural Gas: Fireplace (MBtu)',
     'Natural Gas: Mech Vent Preheating (MBtu)',
+    'Natural Gas: Generator (MBtu)',
     'Fuel Oil: Heating (MBtu)',
     'Fuel Oil: Hot Water (MBtu)',
     'Fuel Oil: Clothes Dryer (MBtu)',
@@ -75,6 +77,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'Propane: Lighting (MBtu)',
     'Propane: Fireplace (MBtu)',
     'Propane: Mech Vent Preheating (MBtu)',
+    'Propane: Generator (MBtu)',
     'Wood Cord: Heating (MBtu)',
     'Wood Cord: Hot Water (MBtu)',
     'Wood Cord: Clothes Dryer (MBtu)',
@@ -126,7 +129,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 +146,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)',
@@ -193,6 +194,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'Electricity: Hot Tub Heater',
     'Electricity: Hot Tub Pump',
     'Electricity: PV',
+    'Electricity: Generator',
     'Natural Gas: Heating',
     'Natural Gas: Hot Water',
     'Natural Gas: Clothes Dryer',
@@ -202,6 +204,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'Natural Gas: Grill',
     'Natural Gas: Lighting',
     'Natural Gas: Fireplace',
+    'Natural Gas: Generator',
     'Fuel Oil: Heating',
     'Fuel Oil: Hot Water',
     'Fuel Oil: Clothes Dryer',
@@ -216,6 +219,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'Propane: Grill',
     'Propane: Lighting',
     'Propane: Fireplace',
+    'Propane: Generator',
     'Wood Cord: Heating',
     'Wood Cord: Hot Water',
     'Wood Cord: Clothes Dryer',
@@ -249,6 +253,7 @@ class SimulationOutputReportTest < MiniTest::Test
   TimeseriesColsTotalLoads = [
     'Load: Heating',
     'Load: Cooling',
+    'Load: Hot Water: Delivered',
   ]
 
   TimeseriesColsComponentLoads = [
@@ -267,7 +272,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,7 +289,6 @@ 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',
   ]
@@ -307,7 +310,6 @@ class SimulationOutputReportTest < MiniTest::Test
     'Airflow: Mechanical Ventilation',
     'Airflow: Natural Ventilation',
     'Airflow: Whole House Fan',
-    'Airflow: Clothes Dryer Exhaust'
   ]
 
   TimeseriesColsWeather = [
@@ -364,11 +366,13 @@ class SimulationOutputReportTest < MiniTest::Test
     'enduseElectricityTelevision',
     'enduseElectricityPlugLoads',
     'enduseElectricityPV',
+    'enduseElectricityGenerator',
     'enduseNaturalGasHeating',
     'enduseNaturalGasHotWater',
     'enduseNaturalGasClothesDryer',
     'enduseNaturalGasRangeOven',
     'enduseNaturalGasMechVentPreheating',
+    'enduseNaturalGasGenerator',
     'enduseFuelOilHeating',
     'enduseFuelOilHotWater',
     'enduseFuelOilClothesDryer',
@@ -379,6 +383,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'endusePropaneClothesDryer',
     'endusePropaneRangeOven',
     'endusePropaneMechVentPreheating',
+    'endusePropaneGenerator',
     'enduseWoodCordHeating',
     'enduseWoodCordHotWater',
     'enduseWoodCordClothesDryer',
@@ -578,7 +583,7 @@ 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,
@@ -591,14 +596,15 @@ class SimulationOutputReportTest < MiniTest::Test
     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,
@@ -658,7 +664,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
@@ -787,193 +793,123 @@ class SimulationOutputReportTest < MiniTest::Test
     _check_for_zero_baseload_timeseries_value(timeseries_csv, ['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_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_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_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_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_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_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_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