HPWH measure arg bugfix. Removed unused tsv's.

Rakefile

@@ -211,6 +211,7 @@ def integrity_check(project_dir_names=nil)
     end # parameter_name
 
     # Additional integrity checks for option_lookup.tsv
+    max_checks = 1000
     measures.keys.each do |measure_subdir|
       puts "Checking for issues with #{measure_subdir} measure..."
       # Check that measures exist
@@ -227,7 +228,12 @@ def integrity_check(project_dir_names=nil)
       end
       option_combinations = options_array.first.product(*options_array[1..-1])
       all_measure_args = []
-      option_combinations.each do |option_combination|
+      max_checks_reached = false
+      option_combinations.each_with_index do |option_combination, combo_num|
+        if combo_num > max_checks
+          max_checks_reached = true
+          break
+        end
         measure_args = {}
         option_combination.each_with_index do |option_name, idx|
             measures[measure_subdir][param_names[idx]][option_name].each do |k,v|
@@ -237,8 +243,11 @@ def integrity_check(project_dir_names=nil)
         next if all_measure_args.include?(measure_args)
         all_measure_args << measure_args
       end
-      all_measure_args.each do |measure_args|
-          validate_measure_args(measure_instances[measure_subdir].arguments(model), measure_args, lookup_file, measure_subdir, nil)
+      all_measure_args.shuffle.each_with_index do |measure_args, idx|
+        validate_measure_args(measure_instances[measure_subdir].arguments(model), measure_args, lookup_file, measure_subdir, nil)
+      end
+      if max_checks_reached
+        puts "Max number of checks (#{max_checks}) reached. Continuing..."
       end
     end
 

resources/options_lookup.tsv

@@ -561,13 +561,13 @@ Water Heater	"Propane Premium, Condensing"	ResidentialHotWaterHeaterTankFuel	fue
 		ResidentialAirflow	has_water_heater_flue=false																																											
 Water Heater	Propane Tankless	ResidentialHotWaterHeaterTanklessFuel	fuel_type=propane	setpoint_temp=125	location=auto	capacity=199	energy_factor=0.82	cycling_derate=0.08	offcyc_power=5	oncyc_power=65																																				
 		ResidentialAirflow	has_water_heater_flue=false																																											
-Water Heater	"Electric Heat Pump, 50 gal"	ResidentialHotWaterHeaterHeatPump	storage_tank_volume=50.0	dhw_setpoint_temperature=125.0	space=auto	element_capacity=4.5	min_temp=45.0	max_temp=120.0	cap=0.5	cop=2.8	shr=0.88	airflow_rate=181.0	fan_power=0.0462	parasitics=3.0	tank_ua=3.9	int_factor=1.0	temp_depress=0.0																													
+Water Heater	"Electric Heat Pump, 50 gal"	ResidentialHotWaterHeaterHeatPump	storage_tank_volume=50.0	setpoint_temp=125.0	space=auto	element_capacity=4.5	min_temp=45.0	max_temp=120.0	cap=0.5	cop=2.8	shr=0.88	airflow_rate=181.0	fan_power=0.0462	parasitics=3.0	tank_ua=3.9	int_factor=1.0	temp_depress=0.0																													
 		ResidentialAirflow	has_water_heater_flue=false																																											
-Water Heater	"Electric Heat Pump, 50 gal, 140F"	ResidentialHotWaterHeaterHeatPump	storage_tank_volume=50.0	dhw_setpoint_temperature=140.0	space=auto	element_capacity=4.5	min_temp=45.0	max_temp=120.0	cap=0.5	cop=2.8	shr=0.88	airflow_rate=181.0	fan_power=0.0462	parasitics=3.0	tank_ua=3.9	int_factor=1.0	temp_depress=0.0																													
+Water Heater	"Electric Heat Pump, 50 gal, 140F"	ResidentialHotWaterHeaterHeatPump	storage_tank_volume=50.0	setpoint_temp=140.0	space=auto	element_capacity=4.5	min_temp=45.0	max_temp=120.0	cap=0.5	cop=2.8	shr=0.88	airflow_rate=181.0	fan_power=0.0462	parasitics=3.0	tank_ua=3.9	int_factor=1.0	temp_depress=0.0																													
 		ResidentialAirflow	has_water_heater_flue=false																																											
-Water Heater	"Electric Heat Pump, 50 gal, In Confined Space"	ResidentialHotWaterHeaterHeatPump	storage_tank_volume=50.0	dhw_setpoint_temperature=125.0	space=auto	element_capacity=4.5	min_temp=45.0	max_temp=120.0	cap=0.5	cop=2.8	shr=0.88	airflow_rate=181.0	fan_power=0.0462	parasitics=3.0	tank_ua=3.9	int_factor=0.7	temp_depress=8.1																													
+Water Heater	"Electric Heat Pump, 50 gal, In Confined Space"	ResidentialHotWaterHeaterHeatPump	storage_tank_volume=50.0	setpoint_temp=125.0	space=auto	element_capacity=4.5	min_temp=45.0	max_temp=120.0	cap=0.5	cop=2.8	shr=0.88	airflow_rate=181.0	fan_power=0.0462	parasitics=3.0	tank_ua=3.9	int_factor=0.7	temp_depress=8.1																													
 		ResidentialAirflow	has_water_heater_flue=false																																											
-Water Heater	"Electric Heat Pump, 80 gal"	ResidentialHotWaterHeaterHeatPump	storage_tank_volume=80.0	dhw_setpoint_temperature=125.0	space=auto	element_capacity=4.5	min_temp=45.0	max_temp=120.0	cap=0.979	cop=2.4	shr=0.98	airflow_rate=480.0	fan_power=0.178	parasitics=8.5	tank_ua=4.0	int_factor=1.0	temp_depress=0.0																													
+Water Heater	"Electric Heat Pump, 80 gal"	ResidentialHotWaterHeaterHeatPump	storage_tank_volume=80.0	setpoint_temp=125.0	space=auto	element_capacity=4.5	min_temp=45.0	max_temp=120.0	cap=0.979	cop=2.4	shr=0.98	airflow_rate=480.0	fan_power=0.178	parasitics=8.5	tank_ua=4.0	int_factor=1.0	temp_depress=0.0																													
 		ResidentialAirflow	has_water_heater_flue=false																																											
 Water Heater	FIXME Other Fuel	ResidentialHotWaterHeaterTankFuel	fuel_type=gas	tank_volume=auto	setpoint_temp=125	location=auto	capacity=40	energy_factor=0.59	recovery_efficiency=0.76	offcyc_power=0	oncyc_power=0																																			
 		ResidentialAirflow	has_water_heater_flue=false