Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_s…

…fa_mf_models_unit_multiplier
NREL · Sep 19, 2023 · 4d28cc0 · 4d28cc0
2 parents d64bf86 + d8c2883
commit 4d28cc0
Show file tree

Hide file tree

Showing 33 changed files with 981 additions and 1,579 deletions.
diff --git a/BuildResidentialHPXML/measure.rb b/BuildResidentialHPXML/measure.rb
@@ -650,7 +650,6 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
     arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('roof_radiant_barrier_grade', roof_radiant_barrier_grade_choices, false)
     arg.setDisplayName('Roof: Radiant Barrier Grade')
     arg.setDescription('The grade of the radiant barrier. If not provided, the OS-HPXML default is used.')
-    arg.setDefaultValue('1')
     args << arg
 
     wall_type_choices = OpenStudio::StringVector.new
@@ -1199,9 +1198,6 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
     heat_pump_heating_efficiency_type_choices << HPXML::UnitsHSPF2
     heat_pump_heating_efficiency_type_choices << HPXML::UnitsCOP
 
-    heat_pump_fuel_choices = OpenStudio::StringVector.new
-    heat_pump_fuel_choices << HPXML::FuelTypeElectricity
-
     heat_pump_backup_type_choices = OpenStudio::StringVector.new
     heat_pump_backup_type_choices << 'none'
     heat_pump_backup_type_choices << HPXML::HeatPumpBackupTypeIntegrated