urbanopt-cli 0.10.0 → 0.11.1

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

@@ -1,3 +1,8 @@
+# *********************************************************************************
+# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://github.com/urbanopt/urbanopt-cli/blob/develop/LICENSE.md
+# *********************************************************************************
+
 # frozen_string_literal: true
 
 require_relative '../resources/minitest_helper'
@@ -7,7 +12,7 @@ require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
 
-class HPXMLtoOpenStudioLightingTest < MiniTest::Test
+class HPXMLtoOpenStudioLightingTest < Minitest::Test
   def sample_files_dir
     return File.join(File.dirname(__FILE__), '..', '..', 'workflow', 'sample_files')
   end
@@ -33,28 +38,28 @@ class HPXMLtoOpenStudioLightingTest < MiniTest::Test
   def test_lighting
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check interior lighting
-    assert_in_delta(1322, get_kwh_per_year(model, Constants.ObjectNameInteriorLighting), 1.0)
+    assert_in_delta(1322, get_kwh_per_year(model, Constants.ObjectNameLightingInterior), 1.0)
 
     # Check exterior lighting
-    assert_in_delta(98, get_kwh_per_year(model, Constants.ObjectNameExteriorLighting), 1.0)
+    assert_in_delta(98, get_kwh_per_year(model, Constants.ObjectNameLightingExterior), 1.0)
   end
 
   def test_lighting_garage
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-enclosure-2stories-garage.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check interior lighting
-    assert_in_delta(1544, get_kwh_per_year(model, Constants.ObjectNameInteriorLighting), 1.0)
+    assert_in_delta(1544, get_kwh_per_year(model, Constants.ObjectNameLightingInterior), 1.0)
 
     # Check garage lighting
-    assert_in_delta(42, get_kwh_per_year(model, Constants.ObjectNameGarageLighting), 1.0)
+    assert_in_delta(42, get_kwh_per_year(model, Constants.ObjectNameLightingGarage), 1.0)
 
     # Check exterior lighting
-    assert_in_delta(109, get_kwh_per_year(model, Constants.ObjectNameExteriorLighting), 1.0)
+    assert_in_delta(109, get_kwh_per_year(model, Constants.ObjectNameLightingExterior), 1.0)
   end
 
   def test_exterior_holiday_lighting
@@ -63,13 +68,13 @@ class HPXMLtoOpenStudioLightingTest < MiniTest::Test
      'base-lighting-holiday.xml'].each do |hpxml_name|
       args_hash = {}
       args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, hpxml_name))
-      model, hpxml = _test_measure(args_hash)
+      model, _hpxml, hpxml_bldg = _test_measure(args_hash)
 
       if hpxml_name == 'base-lighting-holiday.xml'
         # Check exterior holiday lighting
         assert_in_delta(58.3, get_kwh_per_year(model, Constants.ObjectNameLightingExteriorHoliday), 1.0)
       else
-        assert_equal(false, hpxml.lighting.holiday_exists)
+        assert_equal(false, hpxml_bldg.lighting.holiday_exists)
       end
     end
   end
@@ -77,30 +82,32 @@ class HPXMLtoOpenStudioLightingTest < MiniTest::Test
   def test_lighting_kwh_per_year
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-lighting-kwh-per-year.xml'))
-    model, hpxml = _test_measure(args_hash)
+    model, _hpxml, hpxml_bldg = _test_measure(args_hash)
 
     # Check interior lighting
-    int_kwh_yr = hpxml.lighting_groups.find { |lg| lg.location == HPXML::LocationInterior }.kwh_per_year
-    assert_in_delta(int_kwh_yr, get_kwh_per_year(model, Constants.ObjectNameInteriorLighting), 1.0)
+    int_kwh_yr = hpxml_bldg.lighting_groups.find { |lg| lg.location == HPXML::LocationInterior }.kwh_per_year
+    int_kwh_yr *= hpxml_bldg.lighting.interior_usage_multiplier unless hpxml_bldg.lighting.interior_usage_multiplier.nil?
+    assert_in_delta(int_kwh_yr, get_kwh_per_year(model, Constants.ObjectNameLightingInterior), 1.0)
 
     # Check exterior lighting
-    ext_kwh_yr = hpxml.lighting_groups.find { |lg| lg.location == HPXML::LocationExterior }.kwh_per_year
-    assert_in_delta(ext_kwh_yr, get_kwh_per_year(model, Constants.ObjectNameExteriorLighting), 1.0)
+    ext_kwh_yr = hpxml_bldg.lighting_groups.find { |lg| lg.location == HPXML::LocationExterior }.kwh_per_year
+    ext_kwh_yr *= hpxml_bldg.lighting.exterior_usage_multiplier unless hpxml_bldg.lighting.exterior_usage_multiplier.nil?
+    assert_in_delta(ext_kwh_yr, get_kwh_per_year(model, Constants.ObjectNameLightingExterior), 1.0)
   end
 
   def test_lighting_none
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-lighting-none.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check interior lighting
-    assert_equal(0.0, get_kwh_per_year(model, Constants.ObjectNameInteriorLighting))
+    assert_equal(0.0, get_kwh_per_year(model, Constants.ObjectNameLightingInterior))
 
     # Check garage lighting
-    assert_equal(0.0, get_kwh_per_year(model, Constants.ObjectNameGarageLighting))
+    assert_equal(0.0, get_kwh_per_year(model, Constants.ObjectNameLightingGarage))
 
     # Check exterior lighting
-    assert_equal(0.0, get_kwh_per_year(model, Constants.ObjectNameExteriorLighting))
+    assert_equal(0.0, get_kwh_per_year(model, Constants.ObjectNameLightingExterior))
   end
 
   def _test_measure(args_hash)
@@ -138,6 +145,6 @@ class HPXMLtoOpenStudioLightingTest < MiniTest::Test
 
     File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
 
-    return model, hpxml
+    return model, hpxml, hpxml.buildings[0]
   end
 end

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

@@ -1,3 +1,8 @@
+# *********************************************************************************
+# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://github.com/urbanopt/urbanopt-cli/blob/develop/LICENSE.md
+# *********************************************************************************
+
 # frozen_string_literal: true
 
 require_relative '../resources/minitest_helper'
@@ -7,7 +12,7 @@ require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
 
-class HPXMLtoOpenStudioLocationTest < MiniTest::Test
+class HPXMLtoOpenStudioLocationTest < Minitest::Test
   def sample_files_dir
     return File.join(File.dirname(__FILE__), '..', '..', 'workflow', 'sample_files')
   end
@@ -26,7 +31,7 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
   def test_dst_default
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     assert_equal(1, model.getObjectsByType('OS:RunPeriodControl:DaylightSavingTime'.to_IddObjectType).size)
     begin_month, begin_day, end_month, end_day = get_daylight_saving_month_and_days(model)
@@ -39,7 +44,7 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
   def test_dst_custom
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-simcontrol-daylight-saving-custom.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     assert_equal(1, model.getObjectsByType('OS:RunPeriodControl:DaylightSavingTime'.to_IddObjectType).size)
     begin_month, begin_day, end_month, end_day = get_daylight_saving_month_and_days(model)
@@ -52,11 +57,56 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
   def test_dst_disabled
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-simcontrol-daylight-saving-disabled.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     assert_equal(0, model.getObjectsByType('OS:RunPeriodControl:DaylightSavingTime'.to_IddObjectType).size)
   end
 
+  def test_deep_ground_temperatures
+    weather_dir = File.join(File.dirname(__FILE__), '..', '..', 'weather')
+
+    # denver
+    runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
+    weather = WeatherProcess.new(epw_path: File.join(weather_dir, 'USA_CO_Denver.Intl.AP.725650_TMY3.epw'), runner: runner)
+
+    assert_equal(UnitConversions.convert(12.5, 'deltac', 'deltaf'), weather.data.DeepGroundSurfTempAmp1)
+    assert_equal(UnitConversions.convert(-1.3, 'deltac', 'deltaf'), weather.data.DeepGroundSurfTempAmp2)
+    assert_equal(20, weather.data.DeepGroundPhaseShiftTempAmp1)
+    assert_equal(31, weather.data.DeepGroundPhaseShiftTempAmp2)
+    assert_equal(0, runner.result.stepWarnings.size)
+
+    # honolulu
+    runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
+    weather = WeatherProcess.new(epw_path: File.join(weather_dir, 'USA_HI_Honolulu.Intl.AP.911820_TMY3.epw'), runner: runner)
+
+    assert_equal(UnitConversions.convert(2.6, 'deltac', 'deltaf'), weather.data.DeepGroundSurfTempAmp1)
+    assert_equal(UnitConversions.convert(0.1, 'deltac', 'deltaf'), weather.data.DeepGroundSurfTempAmp2)
+    assert_equal(37, weather.data.DeepGroundPhaseShiftTempAmp1)
+    assert_equal(-13, weather.data.DeepGroundPhaseShiftTempAmp2)
+    assert_equal(0, runner.result.stepWarnings.size)
+
+    # cape town
+    runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
+    weather = WeatherProcess.new(epw_path: File.join(weather_dir, 'ZAF_Cape.Town.688160_IWEC.epw'), runner: runner)
+
+    assert_equal(UnitConversions.convert(-5.2, 'deltac', 'deltaf'), weather.data.DeepGroundSurfTempAmp1)
+    assert_equal(UnitConversions.convert(0.1, 'deltac', 'deltaf'), weather.data.DeepGroundSurfTempAmp2)
+    assert_equal(17, weather.data.DeepGroundPhaseShiftTempAmp1)
+    assert_equal(15, weather.data.DeepGroundPhaseShiftTempAmp2)
+    assert_equal(0, runner.result.stepWarnings.size)
+
+    # boulder
+    runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
+    weather = WeatherProcess.new(epw_path: File.join(weather_dir, 'US_CO_Boulder_AMY_2012.epw'), runner: runner)
+
+    assert_equal(UnitConversions.convert(12.3, 'deltac', 'deltaf'), weather.data.DeepGroundSurfTempAmp1)
+    assert_equal(UnitConversions.convert(1.1, 'deltac', 'deltaf'), weather.data.DeepGroundSurfTempAmp2)
+    assert_equal(19, weather.data.DeepGroundPhaseShiftTempAmp1)
+    assert_equal(-34, weather.data.DeepGroundPhaseShiftTempAmp2)
+    assert_equal(1, runner.result.stepWarnings.size)
+    assert_equal(1, runner.result.stepWarnings.select { |w| w == 'No design condition info found; calculating design conditions from EPW weather data.' }.size)
+  end
+
   def _test_measure(args_hash)
     # create an instance of the measure
     measure = HPXMLtoOpenStudio.new
@@ -92,6 +142,6 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
 
     File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
 
-    return model, hpxml
+    return model, hpxml, hpxml.buildings[0]
   end
 end

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

@@ -1,3 +1,8 @@
+# *********************************************************************************
+# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://github.com/urbanopt/urbanopt-cli/blob/develop/LICENSE.md
+# *********************************************************************************
+
 # frozen_string_literal: true
 
 require_relative '../resources/minitest_helper'
@@ -7,7 +12,7 @@ require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
 
-class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
+class HPXMLtoOpenStudioMiscLoadsTest < Minitest::Test
   def sample_files_dir
     return File.join(File.dirname(__FILE__), '..', '..', 'workflow', 'sample_files')
   end
@@ -39,7 +44,7 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
   def test_misc_loads
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check misc plug loads
     kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPlugLoads)
@@ -56,8 +61,8 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
                Constants.ObjectNameMiscWellPump,
                Constants.ObjectNameMiscPoolPump,
                Constants.ObjectNameMiscPoolHeater,
-               Constants.ObjectNameMiscHotTubPump,
-               Constants.ObjectNameMiscHotTubHeater,
+               Constants.ObjectNameMiscPermanentSpaPump,
+               Constants.ObjectNameMiscPermanentSpaHeater,
                Constants.ObjectNameMiscGrill,
                Constants.ObjectNameMiscLighting,
                Constants.ObjectNameMiscFireplace]
@@ -71,7 +76,7 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
   def test_large_uncommon_loads
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-misc-loads-large-uncommon.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check misc plug loads
     kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPlugLoads)
@@ -103,13 +108,13 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
     assert_equal(0, kwh_yr)
     assert_in_epsilon(500, therm_yr, 0.1)
 
-    # Check hot tub pump
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubPump)
+    # Check permanent spa pump
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaPump)
     assert_in_epsilon(1000, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
-    # Check hot tub heater
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubHeater)
+    # Check permanent spa heater
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaHeater)
     assert_in_epsilon(1300, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
@@ -132,7 +137,7 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
   def test_large_uncommon_loads2
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-misc-loads-large-uncommon2.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check misc plug loads
     kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPlugLoads)
@@ -164,13 +169,13 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
     assert_equal(0, kwh_yr)
     assert_equal(0, therm_yr)
 
-    # Check hot tub pump
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubPump)
+    # Check permanent spa pump
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaPump)
     assert_in_epsilon(1000, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
-    # Check hot tub heater
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubHeater)
+    # Check permanent spa heater
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaHeater)
     assert_in_epsilon(260, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
@@ -193,7 +198,7 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
   def test_operational_defaults
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-residents-5.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check misc plug loads
     kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPlugLoads)
@@ -225,13 +230,13 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
     assert_equal(0, kwh_yr)
     assert_in_epsilon(0, therm_yr, 0.1)
 
-    # Check hot tub pump
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubPump)
+    # Check permanent spa pump
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaPump)
     assert_in_epsilon(0, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
-    # Check hot tub heater
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubHeater)
+    # Check permanent spa heater
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaHeater)
     assert_in_epsilon(0, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
@@ -254,7 +259,7 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
   def test_operational_large_uncommon_loads
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-residents-1-misc-loads-large-uncommon.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check misc plug loads
     kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPlugLoads)
@@ -286,13 +291,13 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
     assert_equal(0, kwh_yr)
     assert_in_epsilon(186, therm_yr, 0.1)
 
-    # Check hot tub pump
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubPump)
+    # Check permanent spa pump
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaPump)
     assert_in_epsilon(877, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
-    # Check hot tub heater
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubHeater)
+    # Check permanent spa heater
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaHeater)
     assert_in_epsilon(889, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
@@ -315,7 +320,7 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
   def test_operational_large_uncommon_loads2
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-residents-1-misc-loads-large-uncommon2.xml'))
-    model, _hpxml = _test_measure(args_hash)
+    model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
 
     # Check misc plug loads
     kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPlugLoads)
@@ -347,13 +352,13 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
     assert_equal(0, kwh_yr)
     assert_equal(0, therm_yr)
 
-    # Check hot tub pump
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubPump)
+    # Check permanent spa pump
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaPump)
     assert_in_epsilon(877, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
-    # Check hot tub heater
-    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscHotTubHeater)
+    # Check permanent spa heater
+    kwh_yr, therm_yr = get_kwh_therm_per_year(model, Constants.ObjectNameMiscPermanentSpaHeater)
     assert_in_epsilon(178, kwh_yr, 0.1)
     assert_equal(0, therm_yr)
 
@@ -408,6 +413,6 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
 
     File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
 
-    return model, hpxml
+    return model, hpxml, hpxml.buildings[0]
   end
 end

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

@@ -1,3 +1,8 @@
+# *********************************************************************************
+# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://github.com/urbanopt/urbanopt-cli/blob/develop/LICENSE.md
+# *********************************************************************************
+
 # frozen_string_literal: true
 
 require_relative '../resources/minitest_helper'
@@ -7,7 +12,7 @@ require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
 
-class HPXMLtoOpenStudioPVTest < MiniTest::Test
+class HPXMLtoOpenStudioPVTest < Minitest::Test
   def sample_files_dir
     return File.join(File.dirname(__FILE__), '..', '..', 'workflow', 'sample_files')
   end
@@ -29,9 +34,9 @@ class HPXMLtoOpenStudioPVTest < MiniTest::Test
   def test_pv
     args_hash = {}
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-pv.xml'))
-    model, hpxml = _test_measure(args_hash)
+    model, _hpxml, hpxml_bldg = _test_measure(args_hash)
 
-    hpxml.pv_systems.each do |pv_system|
+    hpxml_bldg.pv_systems.each do |pv_system|
       generator, inverter = get_generator_inverter(model, pv_system.id)
 
       # Check PV
@@ -49,14 +54,14 @@ class HPXMLtoOpenStudioPVTest < MiniTest::Test
 
   def test_pv_shared
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-pv.xml'))
-    model, hpxml = _test_measure(args_hash)
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-pv.xml'))
+    model, _hpxml, hpxml_bldg = _test_measure(args_hash)
 
-    hpxml.pv_systems.each do |pv_system|
+    hpxml_bldg.pv_systems.each do |pv_system|
       generator, inverter = get_generator_inverter(model, pv_system.id)
 
       # Check PV
-      max_power = pv_system.max_power_output * hpxml.building_construction.number_of_bedrooms.to_f / pv_system.number_of_bedrooms_served.to_f
+      max_power = pv_system.max_power_output * hpxml_bldg.building_construction.number_of_bedrooms.to_f / pv_system.number_of_bedrooms_served.to_f
       assert_equal(pv_system.array_tilt, generator.tiltAngle)
       assert_equal(pv_system.array_azimuth, generator.azimuthAngle)
       assert_equal(max_power, generator.dcSystemCapacity)
@@ -104,6 +109,6 @@ class HPXMLtoOpenStudioPVTest < MiniTest::Test
 
     File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
 
-    return model, hpxml
+    return model, hpxml, hpxml.buildings[0]
   end
 end