urbanopt-cli 0.5.2 → 0.6.0

data/example_files/reopt/base_assumptions.json

@@ -21,7 +21,8 @@
         "add_blended_rates_to_urdb_rate": false,
         "net_metering_limit_kw": 0,
         "interconnection_limit_kw": 100000000.0,
-       "urdb_label": "5e162e2a5457a3d50873e3af"
+        "blended_monthly_demand_charges_us_dollars_per_kw": [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10], 
+        "blended_monthly_rates_us_dollars_per_kwh": [0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13] 
       },
       "Wind": {
         "min_kw": 0,
@@ -50,7 +51,6 @@
         "pv_name": "Roof - South Face",
         "location":"roof",
         "existing_kw": 0,
-        "existing_kw": 0,
         "min_kw": 0,
         "max_kw": 1000000000.0,
         "installed_cost_us_dollars_per_kw": 1600,

data/example_files/reopt/multiPV_assumptions.json

@@ -21,7 +21,8 @@
         "add_blended_rates_to_urdb_rate": false,
         "net_metering_limit_kw": 0,
         "interconnection_limit_kw": 100000000.0,
-       "urdb_label": "5e162e2a5457a3d50873e3af"
+        "blended_monthly_demand_charges_us_dollars_per_kw": [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10], 
+        "blended_monthly_rates_us_dollars_per_kwh": [0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13] 
       },
       "Wind": {
         "min_kw": 0,
@@ -50,7 +51,7 @@
         "pv_name": "Roof - South Face",
         "location":"roof",
         "existing_kw": 0,
-        "min_kw": 1.6,
+        "min_kw": 0,
         "max_kw": 1000000000.0,
         "installed_cost_us_dollars_per_kw": 1600,
         "om_cost_us_dollars_per_kw": 16,
@@ -85,7 +86,7 @@
       {
         "pv_name": "Groundmount",
         "location":"ground",
-        "existing_kw": 5,
+        "existing_kw": 0,
         "min_kw": 0,
         "max_kw": 1000000000.0,
         "installed_cost_us_dollars_per_kw": 2200,

data/example_files/resources/hpxml-measures/.github/pull_request_template.md

@@ -11,4 +11,4 @@ Not all may apply:
 - [ ] Documentation has been updated
 - [ ] Changelog has been updated
 - [ ] `openstudio tasks.rb update_measures` has been run
-- [ ] No unexpected regression test changes on CI
+- [ ] No unexpected regression test changes on CI (checked comparison artifacts)

data/example_files/resources/hpxml-measures/.github/workflows/config.yml

@@ -1,10 +1,17 @@
 name: ci
-on: [push]
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    types: [ synchronize, opened, ready_for_review ]
+  workflow_dispatch:
+
 jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.1.0
+      image: docker://nrel/openstudio:develop
     steps:
       - uses: actions/checkout@v2
 
@@ -20,4 +27,90 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           path: workflow/tests/results
-          name: results          
+          name: results
+
+  compare-results:
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.base.sha }}
+
+      - name: Store base results
+        uses: actions/upload-artifact@v2
+        with:
+          path: workflow/tests/base_results
+          name: base_results
+
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Download base results
+        uses: actions/download-artifact@v2
+        with:
+          path: |
+            base_results
+          name: base_results
+
+      - name: Download feature results
+        uses: actions/download-artifact@v2
+        with:
+          path: |
+            results
+          name: results
+
+      - name: Compare results
+        run: |
+          cp -r base_results/results*.csv workflow/tests/base_results
+          mkdir workflow/tests/results
+          cp -r results/results* workflow/tests/results
+          ruby workflow/tests/compare.rb
+
+      - name: Store comparisons
+        uses: actions/upload-artifact@v2
+        with:
+          path: workflow/tests/comparisons
+          name: comparisons
+
+  update-results:
+    if: github.event.pull_request.draft != true
+    runs-on: ubuntu-latest
+    needs: compare-results
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Setup git branch
+        shell: bash
+        run: |
+          branch_name="${{ github.head_ref }}"
+          branch_sha="${{ github.event.pull_request.head.sha }}"
+          echo "Checking out branch: $branch_name, $branch_sha"
+          git checkout -b $branch_name || git checkout $branch_name
+
+      - name: Download feature results
+        uses: actions/download-artifact@v2
+        with:
+          path: |
+            results
+          name: results
+
+      - name: Commit latest results
+        shell: bash        
+        run: |
+          git status
+          cp -r results/results* workflow/tests/base_results
+          git add workflow/tests/base_results
+          git status
+          if [[ $(git diff --cached --exit-code) ]]; then
+            git config --global user.email "github-action@users.noreply.github.com"
+            git config --global user.name "GitHub Action"
+            git commit -m "Latest results."
+            branch_name="${{ github.head_ref }}"
+            echo "Pushing to branch: $branch_name"
+            git push -u origin $branch_name
+          fi

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

@@ -244,7 +244,7 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
 
     arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('geometry_corridor_position', corridor_position_choices, true)
     arg.setDisplayName('Geometry: Corridor Position')
-    arg.setDescription("The position of the corridor. Only applies to #{HPXML::ResidentialTypeSFA} and #{HPXML::ResidentialTypeApartment} units.")
+    arg.setDescription("The position of the corridor. Only applies to #{HPXML::ResidentialTypeSFA} and #{HPXML::ResidentialTypeApartment} units. Exterior corridors are shaded, but not enclosed. Interior corridors are enclosed and conditioned.")
     arg.setDefaultValue('Double-Loaded Interior')
     args << arg
 
@@ -951,6 +951,8 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     heating_system_type_choices << HPXML::HVACTypePortableHeater
     heating_system_type_choices << HPXML::HVACTypeFireplace
     heating_system_type_choices << HPXML::HVACTypeFixedHeater
+    heating_system_type_choices << "Shared #{HPXML::HVACTypeBoiler} w/ Baseboard"
+    heating_system_type_choices << "Shared #{HPXML::HVACTypeBoiler} w/ Ductless Fan Coil"
 
     heating_system_fuel_choices = OpenStudio::StringVector.new
     heating_system_fuel_choices << HPXML::FuelTypeElectricity
@@ -1378,7 +1380,7 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
 
     arg = OpenStudio::Measure::OSArgument::makeStringArgument('ducts_number_of_return_registers', true)
     arg.setDisplayName('Ducts: Number of Return Registers')
-    arg.setDescription('The number of return registers of the ducts.')
+    arg.setDescription("The number of return registers of the ducts. Ignored for ducted #{HPXML::HVACTypeEvaporativeCooler}.")
     arg.setUnits('#')
     arg.setDefaultValue(Constants.Auto)
     args << arg
@@ -1493,7 +1495,15 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     arg.setUnits('Frac')
     args << arg
 
-    arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('mech_vent_fan_type_2', mech_vent_fan_type_choices, true)
+    mech_vent_fan_type_2_choices = OpenStudio::StringVector.new
+    mech_vent_fan_type_2_choices << 'none'
+    mech_vent_fan_type_2_choices << HPXML::MechVentTypeExhaust
+    mech_vent_fan_type_2_choices << HPXML::MechVentTypeSupply
+    mech_vent_fan_type_2_choices << HPXML::MechVentTypeERV
+    mech_vent_fan_type_2_choices << HPXML::MechVentTypeHRV
+    mech_vent_fan_type_2_choices << HPXML::MechVentTypeBalanced
+
+    arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('mech_vent_fan_type_2', mech_vent_fan_type_2_choices, true)
     arg.setDisplayName('Mechanical Ventilation 2: Fan Type')
     arg.setDescription("The type of the second mechanical ventilation. Use 'none' if there is no second mechanical ventilation system.")
     arg.setDefaultValue('none')
@@ -3031,6 +3041,10 @@ class BuildResidentialHPXML < OpenStudio::Measure::ModelMeasure
     error = (args[:geometry_num_bedrooms] <= 0)
     errors << "geometry_num_bedrooms=#{args[:geometry_num_bedrooms]}" if error
 
+    # single-family detached with shared system
+    error = [HPXML::ResidentialTypeSFD].include?(args[:geometry_unit_type]) && args[:heating_system_type].include?('Shared')
+    errors << "geometry_unit_type=#{args[:geometry_unit_type]} and heating_system_type=#{args[:heating_system_type]}" if error
+
     return warnings, errors
   end
 
@@ -3922,9 +3936,9 @@ class HPXMLFile
       heating_system_fuel = args[:heating_system_fuel]
     end
 
-    if [HPXML::HVACTypeFurnace, HPXML::HVACTypeWallFurnace, HPXML::HVACTypeFloorFurnace, HPXML::HVACTypeBoiler].include? heating_system_type
+    if [HPXML::HVACTypeFurnace, HPXML::HVACTypeWallFurnace, HPXML::HVACTypeFloorFurnace].include?(heating_system_type) || heating_system_type.include?(HPXML::HVACTypeBoiler)
       heating_efficiency_afue = args[:heating_system_heating_efficiency]
-    elsif [HPXML::HVACTypeElectricResistance, HPXML::HVACTypeStove, HPXML::HVACTypePortableHeater, HPXML::HVACTypeFireplace, HPXML::HVACTypeFixedHeater].include? heating_system_type
+    elsif [HPXML::HVACTypeElectricResistance, HPXML::HVACTypeStove, HPXML::HVACTypePortableHeater, HPXML::HVACTypeFireplace, HPXML::HVACTypeFixedHeater].include?(heating_system_type)
       heating_efficiency_percent = args[:heating_system_heating_efficiency]
     end
 
@@ -3939,6 +3953,16 @@ class HPXMLFile
       fraction_heat_load_served = 1.0 - args[:heating_system_fraction_heat_load_served_2]
     end
 
+    if heating_system_type.include?('Shared')
+      is_shared_system = true
+      number_of_units_served = args[:geometry_building_num_units].get
+      heating_capacity = nil
+    end
+
+    if heating_system_type.include?(HPXML::HVACTypeBoiler)
+      heating_system_type = HPXML::HVACTypeBoiler
+    end
+
     hpxml.heating_systems.add(id: 'HeatingSystem',
                               heating_system_type: heating_system_type,
                               heating_system_fuel: heating_system_fuel,
@@ -3946,7 +3970,9 @@ class HPXMLFile
                               fraction_heat_load_served: fraction_heat_load_served,
                               heating_efficiency_afue: heating_efficiency_afue,
                               heating_efficiency_percent: heating_efficiency_percent,
-                              airflow_defect_ratio: airflow_defect_ratio)
+                              airflow_defect_ratio: airflow_defect_ratio,
+                              is_shared_system: is_shared_system,
+                              number_of_units_served: number_of_units_served)
   end
 
   def self.set_cooling_systems(hpxml, runner, args)
@@ -4100,40 +4126,45 @@ class HPXMLFile
   end
 
   def self.set_secondary_heating_systems(hpxml, runner, args)
-    heating_system_type_2 = args[:heating_system_type_2]
+    heating_system_type = args[:heating_system_type_2]
 
-    return if heating_system_type_2 == 'none'
+    return if heating_system_type == 'none'
 
     if args[:heating_system_heating_capacity_2] != Constants.Auto
-      heating_capacity_2 = args[:heating_system_heating_capacity_2]
+      heating_capacity = args[:heating_system_heating_capacity_2]
     end
 
     if args[:heating_system_fuel_2] == HPXML::HVACTypeElectricResistance
-      heating_system_fuel_2 = HPXML::FuelTypeElectricity
+      heating_system_fuel = HPXML::FuelTypeElectricity
     else
-      heating_system_fuel_2 = args[:heating_system_fuel_2]
+      heating_system_fuel = args[:heating_system_fuel_2]
     end
 
-    if [HPXML::HVACTypeFurnace, HPXML::HVACTypeWallFurnace, HPXML::HVACTypeFloorFurnace, HPXML::HVACTypeBoiler].include? heating_system_type_2
-      heating_efficiency_afue_2 = args[:heating_system_heating_efficiency_2]
-    elsif [HPXML::HVACTypeElectricResistance, HPXML::HVACTypeStove, HPXML::HVACTypePortableHeater, HPXML::HVACTypeFireplace].include? heating_system_type_2
-      heating_efficiency_percent_2 = args[:heating_system_heating_efficiency_2]
+    if [HPXML::HVACTypeFurnace, HPXML::HVACTypeWallFurnace, HPXML::HVACTypeFloorFurnace].include?(heating_system_type) || heating_system_type.include?(HPXML::HVACTypeBoiler)
+      heating_efficiency_afue = args[:heating_system_heating_efficiency_2]
+    elsif [HPXML::HVACTypeElectricResistance, HPXML::HVACTypeStove, HPXML::HVACTypePortableHeater, HPXML::HVACTypeFireplace].include?(heating_system_type)
+      heating_efficiency_percent = args[:heating_system_heating_efficiency_2]
+    end
+
+    if heating_system_type.include?(HPXML::HVACTypeBoiler)
+      heating_system_type = HPXML::HVACTypeBoiler
     end
 
     hpxml.heating_systems.add(id: 'SecondHeatingSystem',
-                              heating_system_type: heating_system_type_2,
-                              heating_system_fuel: heating_system_fuel_2,
-                              heating_capacity: heating_capacity_2,
+                              heating_system_type: heating_system_type,
+                              heating_system_fuel: heating_system_fuel,
+                              heating_capacity: heating_capacity,
                               fraction_heat_load_served: args[:heating_system_fraction_heat_load_served_2],
-                              heating_efficiency_afue: heating_efficiency_afue_2,
-                              heating_efficiency_percent: heating_efficiency_percent_2)
+                              heating_efficiency_afue: heating_efficiency_afue,
+                              heating_efficiency_percent: heating_efficiency_percent)
   end
 
   def self.set_hvac_distribution(hpxml, runner, args)
     # HydronicDistribution?
     hydr_idx = 0
     hpxml.heating_systems.each do |heating_system|
-      next unless [HPXML::HVACTypeBoiler].include? heating_system.heating_system_type
+      next unless [heating_system.heating_system_type].include?(HPXML::HVACTypeBoiler)
+      next if args[:heating_system_type].include?('Fan Coil')
 
       hydr_idx += 1
       hpxml.hvac_distributions.add(id: "HydronicDistribution#{hydr_idx}",
@@ -4145,12 +4176,12 @@ class HPXMLFile
     # AirDistribution?
     air_distribution_systems = []
     hpxml.heating_systems.each do |heating_system|
-      if [HPXML::HVACTypeFurnace].include? heating_system.heating_system_type
+      if [HPXML::HVACTypeFurnace].include?(heating_system.heating_system_type)
         air_distribution_systems << heating_system
       end
     end
     hpxml.cooling_systems.each do |cooling_system|
-      if [HPXML::HVACTypeCentralAirConditioner].include? cooling_system.cooling_system_type
+      if [HPXML::HVACTypeCentralAirConditioner].include?(cooling_system.cooling_system_type)
         air_distribution_systems << cooling_system
       elsif [HPXML::HVACTypeEvaporativeCooler, HPXML::HVACTypeMiniSplitAirConditioner].include?(cooling_system.cooling_system_type) && args[:cooling_system_is_ducted]
         air_distribution_systems << cooling_system
@@ -4165,33 +4196,64 @@ class HPXMLFile
         end
       end
     end
-    return unless air_distribution_systems.size > 0
+
+    # FanCoil?
+    fan_coil_distribution_systems = []
+    hpxml.heating_systems.each do |heating_system|
+      if args[:heating_system_type].include?('Fan Coil')
+        fan_coil_distribution_systems << heating_system
+      end
+    end
+
+    return if air_distribution_systems.size == 0 && fan_coil_distribution_systems.size == 0
 
     if args[:ducts_number_of_return_registers] != Constants.Auto
       number_of_return_registers = args[:ducts_number_of_return_registers]
     end
 
-    hpxml.hvac_distributions.add(id: 'AirDistribution',
-                                 distribution_system_type: HPXML::HVACDistributionTypeAir,
-                                 conditioned_floor_area_served: args[:geometry_cfa],
-                                 number_of_return_registers: number_of_return_registers)
+    if [HPXML::HVACTypeEvaporativeCooler].include?(args[:cooling_system_type]) && hpxml.heating_systems.size == 0 && hpxml.heat_pumps.size == 0
+      number_of_return_registers = nil
+      if args[:cooling_system_is_ducted]
+        number_of_return_registers = 0
+      end
+    end
 
-    air_distribution_systems.each do |hvac_system|
-      hvac_system.distribution_system_idref = hpxml.hvac_distributions[-1].id
+    if air_distribution_systems.size > 0
+      hpxml.hvac_distributions.add(id: 'AirDistribution',
+                                   distribution_system_type: HPXML::HVACDistributionTypeAir,
+                                   conditioned_floor_area_served: args[:geometry_cfa],
+                                   air_type: HPXML::AirTypeRegularVelocity,
+                                   number_of_return_registers: number_of_return_registers)
+      air_distribution_systems.each do |hvac_system|
+        hvac_system.distribution_system_idref = hpxml.hvac_distributions[-1].id
+      end
+      set_duct_leakages(args, hpxml.hvac_distributions[-1])
+      set_ducts(args, hpxml.hvac_distributions[-1])
     end
 
-    # Duct Leakage
-    hpxml.hvac_distributions[-1].duct_leakage_measurements.add(duct_type: HPXML::DuctTypeSupply,
-                                                               duct_leakage_units: args[:ducts_supply_leakage_units],
-                                                               duct_leakage_value: args[:ducts_supply_leakage_value],
-                                                               duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
+    if fan_coil_distribution_systems.size > 0
+      hpxml.hvac_distributions.add(id: 'FanCoilDistribution',
+                                   distribution_system_type: HPXML::HVACDistributionTypeAir,
+                                   air_type: HPXML::AirTypeFanCoil)
+      fan_coil_distribution_systems.each do |hvac_system|
+        hvac_system.distribution_system_idref = hpxml.hvac_distributions[-1].id
+      end
+    end
+  end
 
-    hpxml.hvac_distributions[-1].duct_leakage_measurements.add(duct_type: HPXML::DuctTypeReturn,
-                                                               duct_leakage_units: args[:ducts_return_leakage_units],
-                                                               duct_leakage_value: args[:ducts_return_leakage_value],
-                                                               duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
+  def self.set_duct_leakages(args, hvac_distribution)
+    hvac_distribution.duct_leakage_measurements.add(duct_type: HPXML::DuctTypeSupply,
+                                                    duct_leakage_units: args[:ducts_supply_leakage_units],
+                                                    duct_leakage_value: args[:ducts_supply_leakage_value],
+                                                    duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
 
-    # Ducts
+    hvac_distribution.duct_leakage_measurements.add(duct_type: HPXML::DuctTypeReturn,
+                                                    duct_leakage_units: args[:ducts_return_leakage_units],
+                                                    duct_leakage_value: args[:ducts_return_leakage_value],
+                                                    duct_leakage_total_or_to_outside: HPXML::DuctLeakageToOutside)
+  end
+
+  def self.set_ducts(args, hvac_distribution)
     if args[:ducts_supply_location] != Constants.Auto
       ducts_supply_location = args[:ducts_supply_location]
     end
@@ -4208,16 +4270,16 @@ class HPXMLFile
       ducts_return_surface_area = args[:ducts_return_surface_area]
     end
 
-    hpxml.hvac_distributions[-1].ducts.add(duct_type: HPXML::DuctTypeSupply,
-                                           duct_insulation_r_value: args[:ducts_supply_insulation_r],
-                                           duct_location: ducts_supply_location,
-                                           duct_surface_area: ducts_supply_surface_area)
+    hvac_distribution.ducts.add(duct_type: HPXML::DuctTypeSupply,
+                                duct_insulation_r_value: args[:ducts_supply_insulation_r],
+                                duct_location: ducts_supply_location,
+                                duct_surface_area: ducts_supply_surface_area)
 
     if not ([HPXML::HVACTypeEvaporativeCooler].include?(args[:cooling_system_type]) && args[:cooling_system_is_ducted])
-      hpxml.hvac_distributions[-1].ducts.add(duct_type: HPXML::DuctTypeReturn,
-                                             duct_insulation_r_value: args[:ducts_return_insulation_r],
-                                             duct_location: ducts_return_location,
-                                             duct_surface_area: ducts_return_surface_area)
+      hvac_distribution.ducts.add(duct_type: HPXML::DuctTypeReturn,
+                                  duct_insulation_r_value: args[:ducts_return_insulation_r],
+                                  duct_location: ducts_return_location,
+                                  duct_surface_area: ducts_return_surface_area)
     end
   end
 
@@ -4280,6 +4342,7 @@ class HPXMLFile
       if args[:mech_vent_fan_type] == HPXML::MechVentTypeCFIS
         hpxml.hvac_distributions.each do |hvac_distribution|
           next unless hvac_distribution.distribution_system_type == HPXML::HVACDistributionTypeAir
+          next if hvac_distribution.air_type != HPXML::AirTypeRegularVelocity
 
           distribution_system_idref = hvac_distribution.id
         end
@@ -4342,15 +4405,6 @@ class HPXMLFile
         end
       end
 
-      distribution_system_idref = nil
-      if args[:mech_vent_fan_type_2] == HPXML::MechVentTypeCFIS
-        hpxml.hvac_distributions.each do |hvac_distribution|
-          next unless hvac_distribution.distribution_system_type == HPXML::HVACDistributionTypeAir
-
-          distribution_system_idref = hvac_distribution.id
-        end
-      end
-
       hpxml.ventilation_fans.add(id: 'SecondMechanicalVentilation',
                                  fan_type: args[:mech_vent_fan_type_2],
                                  rated_flow_rate: args[:mech_vent_flow_rate_2],
@@ -4360,8 +4414,7 @@ class HPXMLFile
                                  total_recovery_efficiency_adjusted: total_recovery_efficiency_adjusted,
                                  sensible_recovery_efficiency: sensible_recovery_efficiency,
                                  sensible_recovery_efficiency_adjusted: sensible_recovery_efficiency_adjusted,
-                                 fan_power: args[:mech_vent_fan_power_2],
-                                 distribution_system_idref: distribution_system_idref)
+                                 fan_power: args[:mech_vent_fan_power_2])
     end
 
     if (args[:kitchen_fans_quantity] == Constants.Auto) || (args[:kitchen_fans_quantity].to_i > 0)
@@ -5223,14 +5276,20 @@ class HPXMLFile
       pump_usage_multiplier = args[:pool_pump_usage_multiplier]
     end
 
-    if args[:pool_heater_annual_kwh] != Constants.Auto
-      heater_load_units = 'kWh/year'
-      heater_load_value = args[:pool_heater_annual_kwh]
+    pool_heater_type = args[:pool_heater_type]
+
+    if [HPXML::HeaterTypeElectricResistance, HPXML::HeaterTypeHeatPump].include?(pool_heater_type)
+      if args[:pool_heater_annual_kwh] != Constants.Auto
+        heater_load_units = 'kWh/year'
+        heater_load_value = args[:pool_heater_annual_kwh]
+      end
     end
 
-    if args[:pool_heater_annual_therm] != Constants.Auto
-      heater_load_units = 'therm/year'
-      heater_load_value = args[:pool_heater_annual_therm]
+    if [HPXML::HeaterTypeGas].include?(pool_heater_type)
+      if args[:pool_heater_annual_therm] != Constants.Auto
+        heater_load_units = 'therm/year'
+        heater_load_value = args[:pool_heater_annual_therm]
+      end
     end
 
     if args[:pool_heater_usage_multiplier] != 1.0
@@ -5242,7 +5301,7 @@ class HPXMLFile
                     pump_type: HPXML::TypeUnknown,
                     pump_kwh_per_year: pump_kwh_per_year,
                     pump_usage_multiplier: pump_usage_multiplier,
-                    heater_type: args[:pool_heater_type],
+                    heater_type: pool_heater_type,
                     heater_load_units: heater_load_units,
                     heater_load_value: heater_load_value,
                     heater_usage_multiplier: heater_usage_multiplier)
@@ -5259,14 +5318,20 @@ class HPXMLFile
       pump_usage_multiplier = args[:hot_tub_pump_usage_multiplier]
     end
 
-    if args[:hot_tub_heater_annual_kwh] != Constants.Auto
-      heater_load_units = 'kWh/year'
-      heater_load_value = args[:hot_tub_heater_annual_kwh]
+    hot_tub_heater_type = args[:hot_tub_heater_type]
+
+    if [HPXML::HeaterTypeElectricResistance, HPXML::HeaterTypeHeatPump].include?(hot_tub_heater_type)
+      if args[:hot_tub_heater_annual_kwh] != Constants.Auto
+        heater_load_units = 'kWh/year'
+        heater_load_value = args[:hot_tub_heater_annual_kwh]
+      end
     end
 
-    if args[:hot_tub_heater_annual_therm] != Constants.Auto
-      heater_load_units = 'therm/year'
-      heater_load_value = args[:hot_tub_heater_annual_therm]
+    if [HPXML::HeaterTypeGas].include?(hot_tub_heater_type)
+      if args[:hot_tub_heater_annual_therm] != Constants.Auto
+        heater_load_units = 'therm/year'
+        heater_load_value = args[:hot_tub_heater_annual_therm]
+      end
     end
 
     if args[:hot_tub_heater_usage_multiplier] != 1.0
@@ -5278,7 +5343,7 @@ class HPXMLFile
                        pump_type: HPXML::TypeUnknown,
                        pump_kwh_per_year: pump_kwh_per_year,
                        pump_usage_multiplier: pump_usage_multiplier,
-                       heater_type: args[:hot_tub_heater_type],
+                       heater_type: hot_tub_heater_type,
                        heater_load_units: heater_load_units,
                        heater_load_value: heater_load_value,
                        heater_usage_multiplier: heater_usage_multiplier)