urbanopt-cli 0.4.1 → 0.5.0

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

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require_relative '../resources/minitest_helper'
+require 'openstudio'
+require 'openstudio/measure/ShowRunnerOutput'
+require 'minitest/autorun'
+require 'fileutils'
+require_relative '../measure.rb'
+require_relative '../resources/util.rb'
+
+class HPXMLtoOpenStudioGeneratorTest < MiniTest::Test
+  def sample_files_dir
+    return File.join(File.dirname(__FILE__), '..', '..', 'workflow', 'sample_files')
+  end
+
+  def get_generator(model, name)
+    generator = nil
+    model.getGeneratorMicroTurbines.each do |g|
+      next unless g.name.to_s.start_with? "#{name} "
+
+      return g
+    end
+  end
+
+  def test_generator
+    args_hash = {}
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-misc-generators.xml'))
+    model, hpxml = _test_measure(args_hash)
+
+    hpxml.generators.each do |hpxml_generator|
+      generator = get_generator(model, hpxml_generator.id)
+
+      # Check object
+      assert_equal(EPlus.fuel_type(hpxml_generator.fuel_type), generator.fuelType)
+      assert_in_epsilon(57.1, generator.referenceElectricalPowerOutput, 0.01)
+      assert_in_epsilon(57.1, generator.minimumFullLoadElectricalPowerOutput, 0.01)
+      assert_in_epsilon(57.1, generator.maximumFullLoadElectricalPowerOutput, 0.01)
+      assert_in_epsilon(0.2, generator.referenceElectricalEfficiencyUsingLowerHeatingValue, 0.01)
+      assert_equal(generator.fuelHigherHeatingValue, generator.fuelLowerHeatingValue)
+      assert_equal(0, generator.standbyPower)
+      assert_equal(0, generator.ancillaryPower)
+    end
+  end
+
+  def test_generator_shared
+    args_hash = {}
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-generator.xml'))
+    model, hpxml = _test_measure(args_hash)
+
+    hpxml.generators.each do |hpxml_generator|
+      generator = get_generator(model, hpxml_generator.id)
+
+      # Check object
+      assert_equal(EPlus.fuel_type(hpxml_generator.fuel_type), generator.fuelType)
+      assert_in_epsilon(95.1, generator.referenceElectricalPowerOutput, 0.01)
+      assert_in_epsilon(95.1, generator.minimumFullLoadElectricalPowerOutput, 0.01)
+      assert_in_epsilon(95.1, generator.maximumFullLoadElectricalPowerOutput, 0.01)
+      assert_in_epsilon(0.2, generator.referenceElectricalEfficiencyUsingLowerHeatingValue, 0.01)
+      assert_equal(generator.fuelHigherHeatingValue, generator.fuelLowerHeatingValue)
+      assert_equal(0, generator.standbyPower)
+      assert_equal(0, generator.ancillaryPower)
+    end
+  end
+
+  def _test_measure(args_hash)
+    # create an instance of the measure
+    measure = HPXMLtoOpenStudio.new
+
+    runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
+    model = OpenStudio::Model::Model.new
+
+    # get arguments
+    arguments = measure.arguments(model)
+    argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
+
+    # populate argument with specified hash value if specified
+    arguments.each do |arg|
+      temp_arg_var = arg.clone
+      if args_hash.has_key?(arg.name)
+        assert(temp_arg_var.setValue(args_hash[arg.name]))
+      end
+      argument_map[arg.name] = temp_arg_var
+    end
+
+    # run the measure
+    measure.run(model, runner, argument_map)
+    result = runner.result
+
+    # show the output
+    show_output(result) unless result.value.valueName == 'Success'
+
+    # assert that it ran correctly
+    assert_equal('Success', result.value.valueName)
+
+    hpxml = HPXML.new(hpxml_path: args_hash['hpxml_path'])
+
+    return model, hpxml
+  end
+end

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

@@ -2,7 +2,7 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
@@ -238,12 +238,12 @@ class HPXMLtoOpenStudioHotWaterApplianceTest < MiniTest::Test
 
   def test_dhw_shared_water_heater_recirc
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-shared-water-heater-recirc.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-water-heater-recirc.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # water use equipment peak flows
     fixture_gpd = 44.60
-    dist_gpd = 10.2343
+    dist_gpd = 12.354
     cw_gpd = 3.7116
     dw_gpd = 2.7342
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants.ObjectNameClothesWasher), 0.001)
@@ -306,12 +306,12 @@ class HPXMLtoOpenStudioHotWaterApplianceTest < MiniTest::Test
 
   def test_dhw_shared_laundry
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-shared-laundry-room.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-laundry-room.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # water use equipment peak flows
     fixture_gpd = 44.60
-    dist_gpd = 10.2343
+    dist_gpd = 12.354
     cw_gpd = 3.7116
     dw_gpd = 2.7342
     assert_in_epsilon(cw_gpd, get_wu_gpd(model, Constants.ObjectNameClothesWasher), 0.001)
@@ -450,17 +450,6 @@ class HPXMLtoOpenStudioHotWaterApplianceTest < MiniTest::Test
     assert_in_epsilon(pump_kwh_yr, get_ee_kwh_per_year(model, Constants.ObjectNameHotWaterRecircPump), 0.001)
   end
 
-  def test_dhw_recirc_shared
-    args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-dhw-shared-water-heater-recirc.xml'))
-    model, hpxml = _test_measure(args_hash)
-
-    # Get HPXML values
-    hot_water_distribution = hpxml.hot_water_distributions[0]
-    pump_kwh_yr = 8760.0 / 1000.0 * hot_water_distribution.shared_recirculation_pump_power / hot_water_distribution.shared_recirculation_number_of_units_served
-    assert_in_epsilon(pump_kwh_yr, get_ee_kwh_per_year(model, Constants.ObjectNameHotWaterRecircPump), 0.001)
-  end
-
   def test_appliances_none
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-appliances-none.xml'))

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

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-# TODO: Add fan/pump checks
-
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
@@ -44,7 +42,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     # Check cooling coil
     assert_equal(1, model.getCoilCoolingDXMultiSpeeds.size)
     clg_coil = model.getCoilCoolingDXMultiSpeeds[0]
-    cops = [5.0, 4.63] # Expected values
+    cops = [4.77, 4.42] # Expected values
     cops.each_with_index do |cop, i|
       assert_in_epsilon(cop, clg_coil.stages[i].grossRatedCoolingCOP, 0.01)
     end
@@ -104,7 +102,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     htg_coil = model.getCoilHeatingGass[0]
     assert_in_epsilon(afue, htg_coil.gasBurnerEfficiency, 0.01)
     assert_in_epsilon(capacity, htg_coil.nominalCapacity.get, 0.01)
-    assert_equal(EPlus.input_fuel_map(fuel), htg_coil.fuelType)
+    assert_equal(EPlus.fuel_type(fuel), htg_coil.fuelType)
   end
 
   def test_furnace_electric
@@ -140,7 +138,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     boiler = model.getBoilerHotWaters[0]
     assert_in_epsilon(afue, boiler.nominalThermalEfficiency, 0.01)
     assert_in_epsilon(capacity, boiler.nominalCapacity.get, 0.01)
-    assert_equal(EPlus.input_fuel_map(fuel), boiler.fuelType)
+    assert_equal(EPlus.fuel_type(fuel), boiler.fuelType)
   end
 
   def test_boiler_coal
@@ -159,7 +157,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     boiler = model.getBoilerHotWaters[0]
     assert_in_epsilon(afue, boiler.nominalThermalEfficiency, 0.01)
     assert_in_epsilon(capacity, boiler.nominalCapacity.get, 0.01)
-    assert_equal(EPlus.input_fuel_map(fuel), boiler.fuelType)
+    assert_equal(EPlus.fuel_type(fuel), boiler.fuelType)
   end
 
   def test_boiler_electric
@@ -178,7 +176,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     boiler = model.getBoilerHotWaters[0]
     assert_in_epsilon(afue, boiler.nominalThermalEfficiency, 0.01)
     assert_in_epsilon(capacity, boiler.nominalCapacity.get, 0.01)
-    assert_equal(EPlus.input_fuel_map(fuel), boiler.fuelType)
+    assert_equal(EPlus.fuel_type(fuel), boiler.fuelType)
   end
 
   def test_electric_resistance
@@ -214,7 +212,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     htg_coil = model.getCoilHeatingGass[0]
     assert_in_epsilon(efficiency, htg_coil.gasBurnerEfficiency, 0.01)
     assert_in_epsilon(capacity, htg_coil.nominalCapacity.get, 0.01)
-    assert_equal(EPlus.input_fuel_map(fuel), htg_coil.fuelType)
+    assert_equal(EPlus.fuel_type(fuel), htg_coil.fuelType)
   end
 
   def test_central_air_to_air_heat_pump_1_speed
@@ -337,7 +335,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     # Check cooling coil
     assert_equal(1, model.getCoilCoolingDXMultiSpeeds.size)
     clg_coil = model.getCoilCoolingDXMultiSpeeds[0]
-    cops = [5.76, 4.99, 4.19, 3.10] # Expected values
+    cops = [6.22, 5.38, 4.52, 3.33] # Expected values
     cops.each_with_index do |cop, i|
       assert_in_epsilon(cop, clg_coil.stages[i].grossRatedCoolingCOP, 0.01)
     end
@@ -346,7 +344,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     # Check heating coil
     assert_equal(1, model.getCoilHeatingDXMultiSpeeds.size)
     htg_coil = model.getCoilHeatingDXMultiSpeeds[0]
-    cops = [5.54, 4.44, 4.06, 3.68] # Expected values
+    cops = [5.80, 4.62, 4.23, 3.85] # Expected values
     cops.each_with_index do |cop, i|
       assert_in_epsilon(cop, htg_coil.stages[i].grossRatedHeatingCOP, 0.01)
     end
@@ -393,7 +391,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
 
   def test_shared_chiller_baseboard
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-hvac-shared-chiller-only-baseboard.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-chiller-only-baseboard.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # Get HPXML values
@@ -410,7 +408,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
 
   def test_shared_chiller_fan_coil
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-hvac-shared-chiller-only-fan-coil.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-chiller-only-fan-coil.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # Get HPXML values
@@ -420,14 +418,14 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     # Check cooling coil
     assert_equal(1, model.getCoilCoolingDXSingleSpeeds.size)
     clg_coil = model.getCoilCoolingDXSingleSpeeds[0]
-    cop = 3.67 # Expected value
+    cop = 3.71 # Expected value
     assert_in_epsilon(cop, clg_coil.ratedCOP.get, 0.01)
     refute_in_epsilon(capacity, clg_coil.ratedTotalCoolingCapacity.get, 0.01) # Uses autosized capacity
   end
 
   def test_shared_chiller_water_loop_heat_pump
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-hvac-shared-chiller-only-water-loop-heat-pump.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-chiller-only-water-loop-heat-pump.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # Get HPXML values
@@ -437,14 +435,14 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     # Check cooling coil
     assert_equal(1, model.getCoilCoolingDXSingleSpeeds.size)
     clg_coil = model.getCoilCoolingDXSingleSpeeds[0]
-    cop = 1.34 # Expected value
+    cop = 1.35 # Expected value
     assert_in_epsilon(cop, clg_coil.ratedCOP.get, 0.01)
     refute_in_epsilon(capacity, clg_coil.ratedTotalCoolingCapacity.get, 0.01) # Uses autosized capacity
   end
 
   def test_shared_cooling_tower_water_loop_heat_pump
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-hvac-shared-cooling-tower-only-water-loop-heat-pump.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-cooling-tower-only-water-loop-heat-pump.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # Get HPXML values
@@ -454,14 +452,14 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     # Check cooling coil
     assert_equal(1, model.getCoilCoolingDXSingleSpeeds.size)
     clg_coil = model.getCoilCoolingDXSingleSpeeds[0]
-    cop = 3.94 # Expected value
+    cop = 3.98 # Expected value
     assert_in_epsilon(cop, clg_coil.ratedCOP.get, 0.01)
     refute_in_epsilon(capacity, clg_coil.ratedTotalCoolingCapacity.get, 0.01) # Uses autosized capacity
   end
 
   def test_shared_boiler_baseboard
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-hvac-shared-boiler-only-baseboard.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-boiler-only-baseboard.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # Get HPXML values
@@ -475,12 +473,12 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     boiler = model.getBoilerHotWaters[0]
     assert_in_epsilon(afue, boiler.nominalThermalEfficiency, 0.01)
     refute_in_epsilon(capacity, boiler.nominalCapacity.get, 0.01) # Uses autosized capacity
-    assert_equal(EPlus.input_fuel_map(fuel), boiler.fuelType)
+    assert_equal(EPlus.fuel_type(fuel), boiler.fuelType)
   end
 
   def test_shared_boiler_fan_coil
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-hvac-shared-boiler-only-fan-coil.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # Get HPXML values
@@ -494,12 +492,12 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     boiler = model.getBoilerHotWaters[0]
     assert_in_epsilon(afue, boiler.nominalThermalEfficiency, 0.01)
     refute_in_epsilon(capacity, boiler.nominalCapacity.get, 0.01) # Uses autosized capacity
-    assert_equal(EPlus.input_fuel_map(fuel), boiler.fuelType)
+    assert_equal(EPlus.fuel_type(fuel), boiler.fuelType)
   end
 
   def test_shared_boiler_water_loop_heat_pump
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-hvac-shared-boiler-only-water-loop-heat-pump.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-boiler-only-water-loop-heat-pump.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # Get HPXML values
@@ -514,7 +512,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
     boiler = model.getBoilerHotWaters[0]
     assert_in_epsilon(afue, boiler.nominalThermalEfficiency, 0.01)
     refute_in_epsilon(capacity, boiler.nominalCapacity.get, 0.01) # Uses autosized capacity
-    assert_equal(EPlus.input_fuel_map(fuel), boiler.fuelType)
+    assert_equal(EPlus.fuel_type(fuel), boiler.fuelType)
 
     # Check cooling coil
     assert_equal(0, model.getCoilCoolingDXSingleSpeeds.size)
@@ -534,7 +532,7 @@ class HPXMLtoOpenStudioHVACTest < MiniTest::Test
 
   def test_shared_ground_loop_ground_to_air_heat_pump
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-hvac-shared-ground-loop-ground-to-air-heat-pump.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-ground-loop-ground-to-air-heat-pump.xml'))
     model, hpxml = _test_measure(args_hash)
 
     # Get HPXML values

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require_relative '../resources/minitest_helper'
+require 'openstudio'
+require 'openstudio/measure/ShowRunnerOutput'
+require 'minitest/autorun'
+require 'fileutils'
+require_relative '../measure.rb'
+require_relative '../resources/util.rb'
+
+class HPXMLtoOpenStudioHVACSizingTest < MiniTest::Test
+  def sample_files_dir
+    return File.join(File.dirname(__FILE__), '..', '..', 'workflow', 'sample_files')
+  end
+
+  def test_slab_f_factor
+    def get_unins_slab()
+      slab = HPXML::Slab.new(nil)
+      slab.thickness = 4.0 # in
+      slab.perimeter_insulation_depth = 0
+      slab.perimeter_insulation_r_value = 0
+      slab.under_slab_insulation_width = 0
+      slab.under_slab_insulation_spans_entire_slab = false
+      slab.under_slab_insulation_r_value = 0
+      return slab
+    end
+
+    # Uninsulated slab
+    slab = get_unins_slab()
+    f_factor = HVACSizing.calc_slab_f_value(slab)
+    assert_in_epsilon(1.41, f_factor, 0.01)
+
+    # R-10, 4ft under slab insulation
+    slab = get_unins_slab()
+    slab.under_slab_insulation_width = 4
+    slab.under_slab_insulation_r_value = 10
+    f_factor = HVACSizing.calc_slab_f_value(slab)
+    assert_in_epsilon(1.27, f_factor, 0.01)
+
+    # R-20, 4ft perimeter insulation
+    slab = get_unins_slab()
+    slab.perimeter_insulation_depth = 4
+    slab.perimeter_insulation_r_value = 20
+    f_factor = HVACSizing.calc_slab_f_value(slab)
+    assert_in_epsilon(0.39, f_factor, 0.01)
+
+    # R-40, whole slab insulation
+    slab = get_unins_slab()
+    slab.under_slab_insulation_spans_entire_slab = true
+    slab.under_slab_insulation_r_value = 40
+    f_factor = HVACSizing.calc_slab_f_value(slab)
+    assert_in_epsilon(1.04, f_factor, 0.01)
+  end
+end

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

@@ -2,7 +2,7 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'

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

@@ -2,7 +2,7 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'minitest/autorun'
 require 'fileutils'
 require_relative '../measure.rb'
@@ -18,10 +18,10 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
     start_date = run_period_control_daylight_saving_time.startDate
     end_date = run_period_control_daylight_saving_time.endDate
     begin_month = start_date.monthOfYear.value
-    begin_day_of_month = start_date.dayOfMonth
+    begin_day = start_date.dayOfMonth
     end_month = end_date.monthOfYear.value
-    end_day_of_month = end_date.dayOfMonth
-    return begin_month, begin_day_of_month, end_month, end_day_of_month
+    end_day = end_date.dayOfMonth
+    return begin_month, begin_day, end_month, end_day
   end
 
   def test_dst_default
@@ -30,11 +30,11 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
     model, hpxml = _test_measure(args_hash)
 
     assert_equal(1, model.getObjectsByType('OS:RunPeriodControl:DaylightSavingTime'.to_IddObjectType).size)
-    begin_month, begin_day_of_month, end_month, end_day_of_month = get_daylight_saving_month_and_days(model)
+    begin_month, begin_day, end_month, end_day = get_daylight_saving_month_and_days(model)
     assert_equal(3, begin_month)
-    assert_equal(12, begin_day_of_month)
+    assert_equal(12, begin_day)
     assert_equal(11, end_month)
-    assert_equal(5, end_day_of_month)
+    assert_equal(5, end_day)
   end
 
   def test_dst_custom
@@ -43,11 +43,11 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
     model, hpxml = _test_measure(args_hash)
 
     assert_equal(1, model.getObjectsByType('OS:RunPeriodControl:DaylightSavingTime'.to_IddObjectType).size)
-    begin_month, begin_day_of_month, end_month, end_day_of_month = get_daylight_saving_month_and_days(model)
+    begin_month, begin_day, end_month, end_day = get_daylight_saving_month_and_days(model)
     assert_equal(3, begin_month)
-    assert_equal(10, begin_day_of_month)
+    assert_equal(10, begin_day)
     assert_equal(11, end_month)
-    assert_equal(6, end_day_of_month)
+    assert_equal(6, end_day)
   end
 
   def test_dst_disabled