urbanopt-cli 0.4.0 → 0.4.1

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/weather.rb

@@ -310,11 +310,14 @@ class WeatherProcess
     @data.MonthlyAvgDailyHighDrybulbs = []
     @data.MonthlyAvgDailyLowDrybulbs = []
 
+    year_description = @model.getYearDescription
+    days_m = Constants.NumDaysInMonths(year_description.isLeapYear)
+
     first_day = 0
     for month in 1..12
-      ndays = Constants.MonthNumDays[month - 1] # Number of days in current month
+      ndays = days_m[month - 1] # Number of days in current month
       if month > 1
-        first_day += Constants.MonthNumDays[month - 2] # Number of days in previous month
+        first_day += days_m[month - 2] # Number of days in previous month
       end
       avg_high = daily_high_dbs[first_day, ndays].sum(0.0) / ndays.to_f
       avg_low = daily_low_dbs[first_day, ndays].sum(0.0) / ndays.to_f

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

@@ -348,6 +348,20 @@ class HPXMLtoOpenStudioAirflowTest < MiniTest::Test
     assert_equal(1, get_oed_for_ventilation(model, "#{Constants.ObjectNameMechanicalVentilationHouseFan} latent load").size)
   end
 
+  def test_clothes_dryer_exhaust
+    args_hash = {}
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base.xml'))
+    model, hpxml = _test_measure(args_hash)
+
+    # Get HPXML values
+    clothes_dryer = hpxml.clothes_dryers[0]
+    clothes_dryer_cfm = clothes_dryer.vented_flow_rate
+
+    # Check infiltration/ventilation program
+    program_values = get_ems_values(model.getEnergyManagementSystemPrograms, "#{Constants.ObjectNameInfiltration} program")
+    assert_in_epsilon(clothes_dryer_cfm, UnitConversions.convert(program_values['Qdryer'].sum, 'm^3/s', 'cfm'), 0.01)
+  end
+
   def test_multiple_mechvent
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-mechvent-multiple.xml'))

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

@@ -38,6 +38,7 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     hpxml.header.sim_begin_day_of_month = 2
     hpxml.header.sim_end_month = 11
     hpxml.header.sim_end_day_of_month = 11
+    hpxml.header.sim_calendar_year = 2008
     hpxml.header.dst_enabled = false
     hpxml.header.dst_begin_month = 3
     hpxml.header.dst_begin_day_of_month = 3
@@ -47,7 +48,7 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     hpxml.header.allow_increased_fixed_capacities = true
     XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
     hpxml_default = _test_measure()
-    _test_default_header_values(hpxml_default, 30, 2, 2, 11, 11, false, 3, 3, 10, 10, false, true)
+    _test_default_header_values(hpxml_default, 30, 2, 2, 11, 11, 2008, false, 3, 3, 10, 10, false, true)
 
     # Test defaults - DST not in weather file
     hpxml.header.timestep = nil
@@ -55,6 +56,7 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     hpxml.header.sim_begin_day_of_month = nil
     hpxml.header.sim_end_month = nil
     hpxml.header.sim_end_day_of_month = nil
+    hpxml.header.sim_calendar_year = nil
     hpxml.header.dst_enabled = nil
     hpxml.header.dst_begin_month = nil
     hpxml.header.dst_begin_day_of_month = nil
@@ -64,15 +66,16 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     hpxml.header.allow_increased_fixed_capacities = nil
     XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
     hpxml_default = _test_measure()
-    _test_default_header_values(hpxml_default, 60, 1, 1, 12, 31, true, 3, 12, 11, 5, true, false)
+    _test_default_header_values(hpxml_default, 60, 1, 1, 12, 31, 2007, true, 3, 12, 11, 5, true, false)
 
     # Test defaults - DST in weather file
-    hpxml = _create_hpxml('base-location-epw-filepath-AMY-2012.xml')
+    hpxml = _create_hpxml('base-location-AMY-2012.xml')
     hpxml.header.timestep = nil
     hpxml.header.sim_begin_month = nil
     hpxml.header.sim_begin_day_of_month = nil
     hpxml.header.sim_end_month = nil
     hpxml.header.sim_end_day_of_month = nil
+    hpxml.header.sim_calendar_year = nil
     hpxml.header.dst_enabled = nil
     hpxml.header.dst_begin_month = nil
     hpxml.header.dst_begin_day_of_month = nil
@@ -82,7 +85,7 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     hpxml.header.allow_increased_fixed_capacities = nil
     XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
     hpxml_default = _test_measure()
-    _test_default_header_values(hpxml_default, 60, 1, 1, 12, 31, true, 3, 11, 11, 4, true, false)
+    _test_default_header_values(hpxml_default, 60, 1, 1, 12, 31, 2012, true, 3, 11, 11, 4, true, false)
   end
 
   def test_site
@@ -724,6 +727,31 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     _test_default_bath_fan_values(hpxml_default, 2, 50, 1, 15, 7)
   end
 
+  def test_clothes_dryer_exhaust
+    # Test inputs not overridden by defaults
+    hpxml_name = 'base.xml'
+    hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name))
+    clothes_dryer = hpxml.clothes_dryers[0]
+    clothes_dryer.is_vented = true
+    clothes_dryer.vented_flow_rate = 200
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    hpxml_default = _test_measure()
+    _test_default_clothes_dryer_exhaust_values(hpxml_default, true, 200)
+
+    clothes_dryer.is_vented = false
+    clothes_dryer.vented_flow_rate = nil
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    hpxml_default = _test_measure()
+    _test_default_clothes_dryer_exhaust_values(hpxml_default, false, nil)
+
+    # Test defaults
+    clothes_dryer.is_vented = nil
+    clothes_dryer.vented_flow_rate = nil
+    XMLHelper.write_file(hpxml.to_oga, @tmp_hpxml_path)
+    hpxml_default = _test_measure()
+    _test_default_clothes_dryer_exhaust_values(hpxml_default, true, 100)
+  end
+
   def test_ceiling_fans
     # Test inputs not overridden by defaults
     hpxml = _create_hpxml('base-lighting-ceiling-fans.xml')
@@ -1386,7 +1414,7 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     return hpxml_default
   end
 
-  def _test_default_header_values(hpxml, tstep, sim_begin_month, sim_begin_day, sim_end_month, sim_end_day,
+  def _test_default_header_values(hpxml, tstep, sim_begin_month, sim_begin_day, sim_end_month, sim_end_day, sim_calendar_year,
                                   dst_enabled, dst_begin_month, dst_begin_day_of_month, dst_end_month, dst_end_day_of_month,
                                   use_max_load_for_heat_pumps, allow_increased_fixed_capacities)
     assert_equal(tstep, hpxml.header.timestep)
@@ -1394,6 +1422,7 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     assert_equal(sim_begin_day, hpxml.header.sim_begin_day_of_month)
     assert_equal(sim_end_month, hpxml.header.sim_end_month)
     assert_equal(sim_end_day, hpxml.header.sim_end_day_of_month)
+    assert_equal(sim_calendar_year, hpxml.header.sim_calendar_year)
     assert_equal(dst_enabled, hpxml.header.dst_enabled)
     assert_equal(dst_begin_month, hpxml.header.dst_begin_month)
     assert_equal(dst_begin_day_of_month, hpxml.header.dst_begin_day_of_month)
@@ -1773,6 +1802,16 @@ class HPXMLtoOpenStudioDefaultsTest < MiniTest::Test
     assert_equal(start_hour, bath_fan.start_hour)
   end
 
+  def _test_default_clothes_dryer_exhaust_values(hpxml, is_vented, vented_flow_rate)
+    clothes_dryer = hpxml.clothes_dryers[0]
+    assert_equal(is_vented, clothes_dryer.is_vented)
+    if vented_flow_rate.nil?
+      assert_nil(clothes_dryer.vented_flow_rate)
+    else
+      assert_equal(vented_flow_rate, clothes_dryer.vented_flow_rate)
+    end
+  end
+
   def _test_default_ceiling_fan_values(hpxml, quantity, efficiency)
     assert_equal(quantity, hpxml.ceiling_fans[0].quantity)
     assert_in_epsilon(efficiency, hpxml.ceiling_fans[0].efficiency, 0.01)

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

@@ -525,8 +525,8 @@ class HPXMLtoOpenStudioHotWaterApplianceTest < MiniTest::Test
     assert_in_epsilon(dw_lat_frac, get_ee_fractions(model, Constants.ObjectNameDishwasher)[1], 0.001)
 
     cd_ee_kwh_yr = 445.1052
-    cd_sens_frac = 0.135
-    cd_lat_frac = 0.015
+    cd_sens_frac = 0.9
+    cd_lat_frac = 0.1
     assert_in_epsilon(cd_ee_kwh_yr, get_ee_kwh_per_year(model, Constants.ObjectNameClothesDryer), 0.001)
     assert_in_epsilon(cd_sens_frac, get_ee_fractions(model, Constants.ObjectNameClothesDryer)[0], 0.001)
     assert_in_epsilon(cd_lat_frac, get_ee_fractions(model, Constants.ObjectNameClothesDryer)[1], 0.001)

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

@@ -230,7 +230,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
       @airflows.each do |airflow_type, airflow|
         ems_program = @model.getModelObjectByName(airflow.ems_program.gsub(' ', '_')).get.to_EnergyManagementSystemProgram.get
         airflow.ems_variables.each do |ems_variable|
-          result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{ems_variable}_timeseries_outvar,#{ems_variable},Summed,ZoneTimestep,#{ems_program.name},m^3/s;").get
+          result << OpenStudio::IdfObject.load("EnergyManagementSystem:OutputVariable,#{ems_variable}_timeseries_outvar,#{ems_variable},Averaged,ZoneTimestep,#{ems_program.name},m^3/s;").get
           result << OpenStudio::IdfObject.load("Output:Variable,*,#{ems_variable}_timeseries_outvar,#{timeseries_frequency};").get
         end
       end
@@ -358,6 +358,13 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
                           include_timeseries_zone_temperatures,
                           include_timeseries_airflows,
                           include_timeseries_weather)
+
+    @sqlFile.close()
+
+    # Ensure sql file is immediately freed; otherwise we can get
+    # errors on Windows when trying to delete this file.
+    GC.start()
+
     if not check_for_errors(runner, outputs)
       return false
     end
@@ -376,8 +383,6 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
                                     include_timeseries_airflows,
                                     include_timeseries_weather)
 
-    @sqlFile.close()
-
     return true
   end
 
@@ -785,7 +790,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
 
     if include_timeseries_airflows
       @airflows.each do |airflow_type, airflow|
-        airflow.timeseries_output = get_report_variable_data_timeseries(['EMS'], airflow.ems_variables.map { |var| "#{var}_timeseries_outvar" }, UnitConversions.convert(1.0, 'm^3/s', 'cfm'), 0, timeseries_frequency)
+        airflow.timeseries_output = get_report_variable_data_timeseries(['EMS'], airflow.ems_variables.map { |var| "#{var}_timeseries_outvar" }, UnitConversions.convert(1.0, 'm^3/s', 'cfm'), 0, timeseries_frequency, true)
       end
     end
 
@@ -1471,7 +1476,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     return values
   end
 
-  def get_report_variable_data_timeseries(key_values_list, variable_names_list, unit_conv, unit_adder, timeseries_frequency)
+  def get_report_variable_data_timeseries(key_values_list, variable_names_list, unit_conv, unit_adder, timeseries_frequency, disable_ems_shift = false)
     keys = "'" + key_values_list.join("','") + "'"
     vars = "'" + variable_names_list.join("','") + "'"
     query = "SELECT SUM(VariableValue*#{unit_conv}+#{unit_adder}) FROM ReportVariableData WHERE ReportVariableDataDictionaryIndex IN (SELECT ReportVariableDataDictionaryIndex FROM ReportVariableDataDictionary WHERE KeyValue IN (#{keys}) AND VariableName IN (#{vars}) AND ReportingFrequency='#{reporting_frequency_map[timeseries_frequency]}') GROUP BY TimeIndex ORDER BY TimeIndex"
@@ -1481,6 +1486,8 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     values = values.get
     values += [0.0] * @timestamps.size if values.size == 0
 
+    return values if disable_ems_shift
+
     if (key_values_list.size == 1) && (key_values_list[0] == 'EMS')
       if (timeseries_frequency.downcase == 'timestep' || (timeseries_frequency.downcase == 'hourly' && @model.getTimestep.numberOfTimestepsPerHour == 1))
         # Shift all values by 1 timestep due to EMS reporting lag
@@ -2130,6 +2137,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     @component_loads[[LT::Heating, CLT::NaturalVentilation]] = ComponentLoad.new(ems_variable: 'loads_htg_natvent')
     @component_loads[[LT::Heating, CLT::MechanicalVentilation]] = ComponentLoad.new(ems_variable: 'loads_htg_mechvent')
     @component_loads[[LT::Heating, CLT::WholeHouseFan]] = ComponentLoad.new(ems_variable: 'loads_htg_whf')
+    @component_loads[[LT::Heating, CLT::ClothesDryerExhaust]] = ComponentLoad.new(ems_variable: 'loads_htg_cd')
     @component_loads[[LT::Heating, CLT::Ducts]] = ComponentLoad.new(ems_variable: 'loads_htg_ducts')
     @component_loads[[LT::Heating, CLT::InternalGains]] = ComponentLoad.new(ems_variable: 'loads_htg_intgains')
     @component_loads[[LT::Cooling, CLT::Roofs]] = ComponentLoad.new(ems_variable: 'loads_clg_roofs')
@@ -2147,6 +2155,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     @component_loads[[LT::Cooling, CLT::NaturalVentilation]] = ComponentLoad.new(ems_variable: 'loads_clg_natvent')
     @component_loads[[LT::Cooling, CLT::MechanicalVentilation]] = ComponentLoad.new(ems_variable: 'loads_clg_mechvent')
     @component_loads[[LT::Cooling, CLT::WholeHouseFan]] = ComponentLoad.new(ems_variable: 'loads_clg_whf')
+    @component_loads[[LT::Cooling, CLT::ClothesDryerExhaust]] = ComponentLoad.new(ems_variable: 'loads_clg_cd')
     @component_loads[[LT::Cooling, CLT::Ducts]] = ComponentLoad.new(ems_variable: 'loads_clg_ducts')
     @component_loads[[LT::Cooling, CLT::InternalGains]] = ComponentLoad.new(ems_variable: 'loads_clg_intgains')
 
@@ -2197,6 +2206,7 @@ class SimulationOutputReport < OpenStudio::Measure::ReportingMeasure
     @airflows[AFT::MechanicalVentilation] = Airflow.new(ems_program: Constants.ObjectNameInfiltration + ' program', ems_variables: [Constants.ObjectNameMechanicalVentilationAirflow])
     @airflows[AFT::NaturalVentilation] = Airflow.new(ems_program: Constants.ObjectNameNaturalVentilation + ' program', ems_variables: [(Constants.ObjectNameNaturalVentilation + ' flow act').gsub(' ', '_')])
     @airflows[AFT::WholeHouseFan] = Airflow.new(ems_program: Constants.ObjectNameNaturalVentilation + ' program', ems_variables: [(Constants.ObjectNameWholeHouseFan + ' flow act').gsub(' ', '_')])
+    @airflows[AFT::ClothesDryerExhaust] = Airflow.new(ems_program: Constants.ObjectNameInfiltration + ' program', ems_variables: [(Constants.ObjectNameClothesDryerExhaust + ' flow act').gsub(' ', '_')])
 
     @airflows.each do |airflow_type, airflow|
       airflow.name = "Airflow: #{airflow_type}"

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>b8fd29ba-55b4-4c62-851a-eb445b5f08d3</version_id>
-  <version_modified>20200917T015507Z</version_modified>
+  <version_id>6a0d3505-355c-41e7-b6e8-0810cf256af3</version_id>
+  <version_modified>20201001T175006Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>SimulationOutputReport</class_name>
   <display_name>HPXML Simulation Output Report</display_name>
@@ -1042,7 +1042,13 @@
       <filename>constants.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>BA4D8683</checksum>
+      <checksum>73FDADAA</checksum>
+    </file>
+    <file>
+      <filename>output_report_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>DCBA4974</checksum>
     </file>
     <file>
       <version>
@@ -1053,13 +1059,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>B0F905A8</checksum>
-    </file>
-    <file>
-      <filename>output_report_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>56A48FA6</checksum>
+      <checksum>E4BE9F1C</checksum>
     </file>
   </files>
 </measure>

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

@@ -84,6 +84,7 @@ class CLT
   NaturalVentilation = 'Natural Ventilation'
   MechanicalVentilation = 'Mechanical Ventilation'
   WholeHouseFan = 'Whole House Fan'
+  ClothesDryerExhaust = 'Clothes Dryer Exhaust'
   Ducts = 'Ducts'
   InternalGains = 'Internal Gains'
 end
@@ -100,6 +101,7 @@ 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

@@ -126,6 +126,7 @@ 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)',
@@ -143,6 +144,7 @@ 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)',
@@ -265,6 +267,7 @@ 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',
@@ -282,6 +285,7 @@ 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',
   ]
@@ -303,6 +307,7 @@ class SimulationOutputReportTest < MiniTest::Test
     'Airflow: Mechanical Ventilation',
     'Airflow: Natural Ventilation',
     'Airflow: Whole House Fan',
+    'Airflow: Clothes Dryer Exhaust'
   ]
 
   TimeseriesColsWeather = [
@@ -635,6 +640,27 @@ class SimulationOutputReportTest < MiniTest::Test
     _check_for_nonzero_timeseries_value(timeseries_csv, ['Airflow: Whole House Fan'])
   end
 
+  def test_timeseries_hourly_airflows_with_clothes_dryer_exhaust
+    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-appliances-gas.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_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
+    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'])
+  end
+
   def test_timeseries_hourly_airflows_with_balanced_mechvent
     args_hash = { 'hpxml_path' => '../workflow/sample_files/base-mechvent-balanced.xml',
                   'timeseries_frequency' => 'hourly',
@@ -888,7 +914,7 @@ class SimulationOutputReportTest < MiniTest::Test
   end
 
   def test_timeseries_hourly_ALL_AMY_2012
-    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-location-epw-filepath-AMY-2012.xml',
+    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,
@@ -909,7 +935,7 @@ class SimulationOutputReportTest < MiniTest::Test
   end
 
   def test_timeseries_daily_ALL_AMY_2012
-    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-location-epw-filepath-AMY-2012.xml',
+    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,
@@ -930,7 +956,7 @@ class SimulationOutputReportTest < MiniTest::Test
   end
 
   def test_timeseries_timestep_ALL_60min_AMY_2012
-    args_hash = { 'hpxml_path' => '../workflow/sample_files/base-location-epw-filepath-AMY-2012.xml',
+    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,

data/example_files/resources/hpxml-measures/docs/source/build_residential_hpxml.rst

@@ -14,15 +14,25 @@ The following arguments are used to populate fields of the HPXML file:
   - HPXML File
   - Weather Directory
 
+- Software Program
+
+  - Name
+  - Version
+
 - Simulation Control
 
   - Timestep
   - Begin Month/Day
   - End Month/Day
+  - Daylight Saving Begin Month/Day
+  - Daylight Saving End Month/Day
 
-- Schedules
+Schedules
 
-  - Output Path (*under construction*)
+  - Type (Average, Stochastic, User-Specified)
+  - Path
+  - Vacancy Begin Month/Day
+  - Vacancy End Month/Day
 
 - Weather
 
@@ -30,7 +40,7 @@ The following arguments are used to populate fields of the HPXML file:
 
 - Geometry
 
-  - Unit Type (single-family detached, single-family attached, 2-4 unit building, 5+ unit building)
+  - Unit Type (manufactured home, single-family detached, single-family attached, apartment unit)
   - Building Orientation (Number of Units, Horizontal/Vertical Level)
 
 - Enclosure
@@ -44,9 +54,10 @@ The following arguments are used to populate fields of the HPXML file:
   
 - HVAC
 
-  - Heating Systems (Electric Resistance, Furnaces, Wall Furnaces, Stoves, Boilers, Portable Heaters)
+  - Heating Systems (Electric Resistance, Furnaces, Wall/Floor Furnaces, Stoves, Boilers, Portable Heaters, Fireplaces)
   - Cooling Systems (Central Air Conditioners, Room Air Conditioners, Evaporative Coolers)
   - Heat Pumps (Air Source, Mini Split, Ground Source, Dual-Fuel)
+  - Dehumidifier
   - Setpoints
   - Ducts
   
@@ -66,10 +77,13 @@ The following arguments are used to populate fields of the HPXML file:
   - Whole House Fan
 
 - Photovoltaics
-- Appliances (Clothes Washer/Dryer, Dishwasher, Refrigerator, Cooking Range/Oven)
-- Lighting
+- Appliances (Clothes Washer/Dryer, Dishwasher, Refrigerator, Extra Refrigerator, Freezer, Cooking Range/Oven)
+- Lighting (Interior, Exterior, Garage, Holiday)
 - Ceiling Fans
-- Plug Loads
+- Plug Loads (Other, TV, Well Pump, Vehicle)
+- Fuel Loads (Grill, Lighting, Fireplace)
+- Pool (Pump, Heater)
+- Hot Tub (Pump, Heater)
 
 Software Tools
 --------------