diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/.modelkit-config b/commercial measures/SWHC005-05 Water Cooled Chiller/.modelkit-config
new file mode 100644
index 00000000..b11027e5
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/.modelkit-config	
@@ -0,0 +1,24 @@
+
+# Paths are expanded relative to this modelkit-config file.
+
+prototypes-dir = '../../prototypes'
+templates-dir = '../../templates/energyplus/templates'
+weather-dir = '../../weather'
+codes-dir = '../../codes'
+
+max-workers = 12  # Maximum number of simulations to run in parallel
+
+
+[template-compose]
+annotate = true
+indent = "    "
+esc-line = "! "
+dirs = '~\Documents\Modelkit Caboodle\templates\energyplus\templates'  # Must be an absolute path
+
+[energyplus-run]
+engine = 'C:\EnergyPlusV22-2-0'  # Must be an absolute path
+#engine = '/Applications/EnergyPlus-22-2-0'  # Must be an absolute path
+#engine = '/Applications/EnergyPlus-9-2-0'  # Must be an absolute path
+readvars = true
+keep = false
+output-files = "eplusout.err; eplusout.sql; eplustbl.htm; eplusvar.csv"
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/DEER_EnergyPlus_Modelkit_Measure_list_working.xlsx b/commercial measures/SWHC005-05 Water Cooled Chiller/DEER_EnergyPlus_Modelkit_Measure_list_working.xlsx
new file mode 100644
index 00000000..fe185382
Binary files /dev/null and b/commercial measures/SWHC005-05 Water Cooled Chiller/DEER_EnergyPlus_Modelkit_Measure_list_working.xlsx differ
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/ECC&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/ECC&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/ECC&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/ESe&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/ESe&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/ESe&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/EUn&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/EUn&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/EUn&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Hsp&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Hsp&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Hsp&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/MBT&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/MBT&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/MBT&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Nrs&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Nrs&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Nrs&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/OfL&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/OfL&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/OfL&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/OfS&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/OfS&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/OfS&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Rt3&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Rt3&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cases/Rt3&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/climates.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/climates.csv
new file mode 100644
index 00000000..2b7ad0aa
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/climates.csv	
@@ -0,0 +1,17 @@
+skip,climate,weather_file,climate_zone,codes_file
+,CZ01,CA_EUREKA_725940S_CZ2022.epw,1,T24_weight_averaged_ex.csv
+,CZ02,CA_NAPA-CO_724955S_CZ2022.epw,2,T24_weight_averaged_ex.csv
+,CZ03,CA_OAKLAND-METRO-AP_724930S_CZ2022.epw,3,T24_weight_averaged_ex.csv
+,CZ04,CA_SAN-JOSE-IAP_724945S_CZ2022.epw,4,T24_weight_averaged_ex.csv
+,CZ05,CA_SANTA-MARIA-PUBLIC-AP_723940S_CZ2022.epw,5,T24_weight_averaged_ex.csv
+,CZ06,CA_LOS-ANGELES-IAP_722950S_CZ2022.epw,6,T24_weight_averaged_ex.csv
+,CZ07,CA_SAN-DIEGO-LINDBERGH-FLD_722900S_CZ2022.epw,7,T24_weight_averaged_ex.csv
+,CZ08,CA_LONG-BEACH-DAUGHERTY-FLD_722970S_CZ2022.epw,8,T24_weight_averaged_ex.csv
+,CZ09,CA_LOS-ANGELES-DOWNTOWN-USC_722874S_CZ2022.epw,9,T24_weight_averaged_ex.csv
+,CZ10,CA_RIVERSIDE-MUNI_722869S_CZ2022.epw,10,T24_weight_averaged_ex.csv
+,CZ11,CA_RED-BLUFF-MUNI-AP_725910S_CZ2022.epw,11,T24_weight_averaged_ex.csv
+,CZ12,CA_STOCKTON-METRO-AP_724920S_CZ2022.epw,12,T24_weight_averaged_ex.csv
+,CZ13,CA_FRESNO-YOSEMITE-IAP_723890S_CZ2022.epw,13,T24_weight_averaged_ex.csv
+,CZ14,CA_DAGGETT-BARSTOW-AP_723815S_CZ2022.epw,14,T24_weight_averaged_ex.csv
+,CZ15,CA_EL-CENTRO-NAF_722810S_CZ2022.epw,15,T24_weight_averaged_ex.csv
+,CZ16,CA_BISHOP-AP_724800S_CZ2022.epw,16,T24_weight_averaged_ex.csv
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cohorts.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cohorts.csv
new file mode 100644
index 00000000..2f3a89a0
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/cohorts.csv	
@@ -0,0 +1,27 @@
+skip,cohort,root,wall_type,:wall_base_cavity_insul,:wall_base_cont_insul,:roof_base_cont_insul,:window_u,:window_shgc,:window_transmittance,:floor_base_cont_insul,:office_large_light_area,:kitchen_light_area,:dining_fast_light_area,:classroom_class_light_area,:corridor_light_area,:retail_sales_light_area,:storage_warehouse_light_area,:computer_light_area,:lobby_light_area,:guestroom_light_area,:auditorium_light_area,:conference_light_area,:dining_fine_light_area,:gym_light_area,:restroom_light_area,:health_patient_light_area,:industrial_low_light_area,:laundry_light_area,:auto_light_area,:classroom_shop_light_area,:grocery_light_area,:health_operating_light_area,:industrial_high_light_area,:lab_light_area,:mech_light_area,:office_open_light_area,:storage_refrig_light_area,:office_small_light_area,:main_oa_econ_max_temp
+,Asm&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Asm/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auditorium"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,ECC&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,ECC/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""classroom_shop"", ""LPD"")['W/ft2']",,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,EPr&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,EPr/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""gym"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,ERC&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,ERC/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,ESe&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,ESe/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""gym"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,EUn&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,EUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""industrial_low"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Fin&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Fin/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Gro&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Gro/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""grocery"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""industrial_high"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""storage_refrig"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Hsp&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Hsp/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_patient"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_operating"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Htl&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Htl/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""dining_fine"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""laundry"", ""LPD"")['W/ft2']",,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Lib&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Lib/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""conference"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,MBT&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,MBT/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""conference"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lab"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,MLI&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,MLI/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""industrial_low"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Mtl&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Mtl/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""laundry"", ""LPD"")['W/ft2']",,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Nrs&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Nrs/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_patient"", ""LPD"")['W/ft2']",,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,OfL&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,OfL/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""mech"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""office_open"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,OfS&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,OfS/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""office_small"", ""LPD"")['W/ft2']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Rel&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Rel/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auditorium"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,RFF&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,RFF/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""restroom"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,RSD&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,RSD/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""dining_fine"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""restroom"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Rt3&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Rt3/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,RtL&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,RtL/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auto"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,RtS&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,RtS/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,SCn&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,SCn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,SUn&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,SUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Wrf&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,WRf/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/query.txt b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/query.txt
new file mode 100644
index 00000000..66e76be7
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Ex/query.txt	
@@ -0,0 +1,30 @@
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy, Net Site Energy
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses, Electricity
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses, Natural Gas
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Source Energy, Net Source EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Source Energy, Net Source Energy
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Total End Uses, Total
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heating, Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Cooling, Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Lighting, Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Lighting, Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Equipment, Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Equipment, Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Fans, Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Pumps, Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Recovery, Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Water Systems, Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Refrigeration, Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Generators, Generators
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Water Systems, Water Systems
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Heating, Unmet Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Cooling, Unmet Cooling
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/cases/Htl&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/cases/Htl&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/cases/Htl&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/climates.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/climates.csv
new file mode 100644
index 00000000..9f5cc7a8
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/climates.csv	
@@ -0,0 +1,17 @@
+skip,climate,weather_file,climate_zone,codes_file
+,CZ01,CA_EUREKA_725940S_CZ2022.epw,1,T24_weight_averaged_ex_Htl.csv
+,CZ02,CA_NAPA-CO_724955S_CZ2022.epw,2,T24_weight_averaged_ex_Htl.csv
+,CZ03,CA_OAKLAND-METRO-AP_724930S_CZ2022.epw,3,T24_weight_averaged_ex_Htl.csv
+,CZ04,CA_SAN-JOSE-IAP_724945S_CZ2022.epw,4,T24_weight_averaged_ex_Htl.csv
+,CZ05,CA_SANTA-MARIA-PUBLIC-AP_723940S_CZ2022.epw,5,T24_weight_averaged_ex_Htl.csv
+,CZ06,CA_LOS-ANGELES-IAP_722950S_CZ2022.epw,6,T24_weight_averaged_ex_Htl.csv
+,CZ07,CA_SAN-DIEGO-LINDBERGH-FLD_722900S_CZ2022.epw,7,T24_weight_averaged_ex_Htl.csv
+,CZ08,CA_LONG-BEACH-DAUGHERTY-FLD_722970S_CZ2022.epw,8,T24_weight_averaged_ex_Htl.csv
+,CZ09,CA_LOS-ANGELES-DOWNTOWN-USC_722874S_CZ2022.epw,9,T24_weight_averaged_ex_Htl.csv
+,CZ10,CA_RIVERSIDE-MUNI_722869S_CZ2022.epw,10,T24_weight_averaged_ex_Htl.csv
+,CZ11,CA_RED-BLUFF-MUNI-AP_725910S_CZ2022.epw,11,T24_weight_averaged_ex_Htl.csv
+,CZ12,CA_STOCKTON-METRO-AP_724920S_CZ2022.epw,12,T24_weight_averaged_ex_Htl.csv
+,CZ13,CA_FRESNO-YOSEMITE-IAP_723890S_CZ2022.epw,13,T24_weight_averaged_ex_Htl.csv
+,CZ14,CA_DAGGETT-BARSTOW-AP_723815S_CZ2022.epw,14,T24_weight_averaged_ex_Htl.csv
+,CZ15,CA_EL-CENTRO-NAF_722810S_CZ2022.epw,15,T24_weight_averaged_ex_Htl.csv
+,CZ16,CA_BISHOP-AP_724800S_CZ2022.epw,16,T24_weight_averaged_ex_Htl.csv
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/cohorts.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/cohorts.csv
new file mode 100644
index 00000000..d0195daa
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/cohorts.csv	
@@ -0,0 +1,26 @@
+skip,cohort,root,wall_type,:wall_base_cavity_insul,:wall_base_cont_insul,:roof_base_cont_insul,:window_u,:window_shgc,:window_transmittance,:floor_base_cont_insul,:main_oa_econ_max_temp
+#,Asm,Asm/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,ECC,ECC/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,EPr,EPr/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,ERC,ERC/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,ESe,ESe/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,EUn,EUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Fin,Fin/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Gro,Gro/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Hsp,Hsp/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Htl&0&cAVVG&Ex&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Htl/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Lib,Lib/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,MBT,MBT/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,MLI,MLI/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Mtl,Mtl/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Nrs,Nrs/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,OfL,OfL/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,OfS,OfS/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Rel,Rel/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RFF,RFF/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RSD,RSD/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Rt3,Rt3/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RtL,RtL/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RtS,RtS/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,SCn,SCn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,SUn,SUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/query.txt b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/query.txt
new file mode 100644
index 00000000..66e76be7
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_Ex/query.txt	
@@ -0,0 +1,30 @@
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy, Net Site Energy
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses, Electricity
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses, Natural Gas
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Source Energy, Net Source EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Source Energy, Net Source Energy
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Total End Uses, Total
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heating, Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Cooling, Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Lighting, Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Lighting, Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Equipment, Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Equipment, Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Fans, Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Pumps, Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Recovery, Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Water Systems, Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Refrigeration, Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Generators, Generators
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Water Systems, Water Systems
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Heating, Unmet Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Cooling, Unmet Cooling
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/cases/Htl&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/cases/Htl&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/cases/Htl&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/climates.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/climates.csv
new file mode 100644
index 00000000..14f1e59a
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/climates.csv	
@@ -0,0 +1,17 @@
+skip,climate,weather_file,climate_zone,codes_file
+,CZ01,CA_EUREKA_725940S_CZ2022.epw,1,T24_2025_new_Htl.csv
+,CZ02,CA_NAPA-CO_724955S_CZ2022.epw,2,T24_2025_new_Htl.csv
+,CZ03,CA_OAKLAND-METRO-AP_724930S_CZ2022.epw,3,T24_2025_new_Htl.csv
+,CZ04,CA_SAN-JOSE-IAP_724945S_CZ2022.epw,4,T24_2025_new_Htl.csv
+,CZ05,CA_SANTA-MARIA-PUBLIC-AP_723940S_CZ2022.epw,5,T24_2025_new_Htl.csv
+,CZ06,CA_LOS-ANGELES-IAP_722950S_CZ2022.epw,6,T24_2025_new_Htl.csv
+,CZ07,CA_SAN-DIEGO-LINDBERGH-FLD_722900S_CZ2022.epw,7,T24_2025_new_Htl.csv
+,CZ08,CA_LONG-BEACH-DAUGHERTY-FLD_722970S_CZ2022.epw,8,T24_2025_new_Htl.csv
+,CZ09,CA_LOS-ANGELES-DOWNTOWN-USC_722874S_CZ2022.epw,9,T24_2025_new_Htl.csv
+,CZ10,CA_RIVERSIDE-MUNI_722869S_CZ2022.epw,10,T24_2025_new_Htl.csv
+,CZ11,CA_RED-BLUFF-MUNI-AP_725910S_CZ2022.epw,11,T24_2025_new_Htl.csv
+,CZ12,CA_STOCKTON-METRO-AP_724920S_CZ2022.epw,12,T24_2025_new_Htl.csv
+,CZ13,CA_FRESNO-YOSEMITE-IAP_723890S_CZ2022.epw,13,T24_2025_new_Htl.csv
+,CZ14,CA_DAGGETT-BARSTOW-AP_723815S_CZ2022.epw,14,T24_2025_new_Htl.csv
+,CZ15,CA_EL-CENTRO-NAF_722810S_CZ2022.epw,15,T24_2025_new_Htl.csv
+,CZ16,CA_BISHOP-AP_724800S_CZ2022.epw,16,T24_2025_new_Htl.csv
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/cohorts.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/cohorts.csv
new file mode 100644
index 00000000..c1644d09
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/cohorts.csv	
@@ -0,0 +1,26 @@
+skip,cohort,root,wall_type,:wall_base_cavity_insul,:wall_base_cont_insul,:roof_base_cont_insul,:window_u,:window_shgc,:window_transmittance,:floor_base_cont_insul,:main_oa_econ_max_temp
+#,Asm,Asm/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,ECC,ECC/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,EPr,EPr/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,ERC,ERC/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,ESe,ESe/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,EUn,EUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Fin,Fin/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Gro,Gro/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Hsp,Hsp/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Htl&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Htl/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Lib,Lib/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,MBT,MBT/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,MLI,MLI/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Mtl,Mtl/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Nrs,Nrs/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,OfL,OfL/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,OfS,OfS/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Rel,Rel/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RFF,RFF/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RSD,RSD/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Rt3,Rt3/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RtL,RtL/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RtS,RtS/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,SCn,SCn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,SUn,SUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/query.txt b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/query.txt
new file mode 100644
index 00000000..66e76be7
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_Htl_New/query.txt	
@@ -0,0 +1,30 @@
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy, Net Site Energy
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses, Electricity
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses, Natural Gas
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Source Energy, Net Source EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Source Energy, Net Source Energy
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Total End Uses, Total
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heating, Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Cooling, Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Lighting, Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Lighting, Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Equipment, Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Equipment, Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Fans, Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Pumps, Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Recovery, Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Water Systems, Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Refrigeration, Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Generators, Generators
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Water Systems, Water Systems
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Heating, Unmet Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Cooling, Unmet Cooling
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/ECC&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/ECC&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/ECC&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/ESe&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/ESe&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/ESe&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/EUn&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/EUn&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/EUn&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Hsp&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Hsp&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Hsp&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/MBT&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/MBT&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/MBT&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Nrs&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Nrs&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Nrs&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/OfL&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/OfL&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/OfL&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/OfS&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/OfS&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..07b8d805
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/OfS&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Rt3&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Rt3&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv
new file mode 100644
index 00000000..cb064b9e
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cases/Rt3&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr.csv	
@@ -0,0 +1,36 @@
+skip,case_name,:main_cool_coil_type,:chw_chiller_model,:chw_chiller_plr_curve,:chw_chiller_cop,:chw_cooling_source,:chw_chiller_type,:chw_wc_option,:chw_pump_type,:chw_chiller_condenser,:cool_sizing_factor,:main_hvac_type,:heat_sizing_factor,:hvac_config,:main_atu_reheat_coil_type,:main_atu_reheat_control,:main_fan_rise,:main_heat_coil_type,:main_dx_type,:main_sat_reset_type,:main_sat_temp_max,:main_design_peak_load,:main_oa_econ_type,:main_cool_coil_cop,:main_dx_comp_speed,:main_cool_flow_min_frac,:main_unitary_no_load_flow_method,:main_fan_speed,:main_fan_motor_eff,:main_heat_coil_cop,:main_heat_coil_eff,:main_heat_flow_frac,:hw_boiler_eff
+#,defaults,WATER,WC Cent 2010 B,Bicubic,5.1,CHILLER,ELECTRIC,,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.646-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.332-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.591-kwpton-0.352-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.324-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.553-kwpton-0.343-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.415-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.315-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.544-kwpton-0.334-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.365-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.632-kwpton-0.387-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.34-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.581-kwpton-0.361-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,6.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.407-IPLV,WATER,Model 9 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.698-kwpton-0.431-IPLV,WATER,Model 7 WC Chiller,ChillerPartLoadWithLift,5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.695-kwpton-0.44-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.1,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.635-kwpton-0.4-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.595-kwpton-0.39-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.9,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldCentChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.78-kwpton-0.5-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.5,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.75-kwpton-0.49-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.7,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.68-kwpton-0.44-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.2,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.625-kwpton-0.41-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,5.6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,NE-Chiller-WtrCldScrewChlr-0.585-kwpton-0.38-IPLV,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,6,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldCentChlr-0.646-kwpton-0.365-IPLV-Base,WATER,ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Bicubic,5.4,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+,Test-WtrCldScrewChlr-0.725-kwpton-0.44-IPLV-Base,WATER,ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve,Bicubic,4.8,CHILLER,ELECTRIC,Reformulated,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Cent,WATER,WC Cent Carrier 19XR 1234kW/5.39COP/VSD,Quadratic,5.39,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
+#,Test-EIR_Screw,WATER,Screw WC Trane RTHB 1051kW/5.05COP/Valve,Quadratic,5.05,CHILLER,ELECTRIC,EIR,VARIABLE,WATERCOOLED,1.15,MZ-VAV,1.25,FLOOR,WATER,DUAL-MAX-LIMIT,5.361969['in H2O'],WATER,PNNL,WARMEST-ZONE,60.0['F'],COINCIDENT,FIXED-DRY-BULB,,,,,VARIABLE,0.9,,,0.5,0.805
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/climates.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/climates.csv
new file mode 100644
index 00000000..5b1f9662
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/climates.csv	
@@ -0,0 +1,17 @@
+skip,climate,weather_file,climate_zone,codes_file
+,CZ01,CA_EUREKA_725940S_CZ2022.epw,1,T24_2025_new.csv
+,CZ02,CA_NAPA-CO_724955S_CZ2022.epw,2,T24_2025_new.csv
+,CZ03,CA_OAKLAND-METRO-AP_724930S_CZ2022.epw,3,T24_2025_new.csv
+,CZ04,CA_SAN-JOSE-IAP_724945S_CZ2022.epw,4,T24_2025_new.csv
+,CZ05,CA_SANTA-MARIA-PUBLIC-AP_723940S_CZ2022.epw,5,T24_2025_new.csv
+,CZ06,CA_LOS-ANGELES-IAP_722950S_CZ2022.epw,6,T24_2025_new.csv
+,CZ07,CA_SAN-DIEGO-LINDBERGH-FLD_722900S_CZ2022.epw,7,T24_2025_new.csv
+,CZ08,CA_LONG-BEACH-DAUGHERTY-FLD_722970S_CZ2022.epw,8,T24_2025_new.csv
+,CZ09,CA_LOS-ANGELES-DOWNTOWN-USC_722874S_CZ2022.epw,9,T24_2025_new.csv
+,CZ10,CA_RIVERSIDE-MUNI_722869S_CZ2022.epw,10,T24_2025_new.csv
+,CZ11,CA_RED-BLUFF-MUNI-AP_725910S_CZ2022.epw,11,T24_2025_new.csv
+,CZ12,CA_STOCKTON-METRO-AP_724920S_CZ2022.epw,12,T24_2025_new.csv
+,CZ13,CA_FRESNO-YOSEMITE-IAP_723890S_CZ2022.epw,13,T24_2025_new.csv
+,CZ14,CA_DAGGETT-BARSTOW-AP_723815S_CZ2022.epw,14,T24_2025_new.csv
+,CZ15,CA_EL-CENTRO-NAF_722810S_CZ2022.epw,15,T24_2025_new.csv
+,CZ16,CA_BISHOP-AP_724800S_CZ2022.epw,16,T24_2025_new.csv
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cohorts.csv b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cohorts.csv
new file mode 100644
index 00000000..a5e9be60
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/cohorts.csv	
@@ -0,0 +1,27 @@
+skip,cohort,root,wall_type,:wall_base_cavity_insul,:wall_base_cont_insul,:roof_base_cont_insul,:window_u,:window_shgc,:window_transmittance,:floor_base_cont_insul,:office_large_light_area,:kitchen_light_area,:dining_fast_light_area,:classroom_class_light_area,:corridor_light_area,:retail_sales_light_area,:storage_warehouse_light_area,:computer_light_area,:lobby_light_area,:guestroom_light_area,:auditorium_light_area,:conference_light_area,:dining_fine_light_area,:gym_light_area,:restroom_light_area,:health_patient_light_area,:industrial_low_light_area,:laundry_light_area,:auto_light_area,:classroom_shop_light_area,:grocery_light_area,:health_operating_light_area,:industrial_high_light_area,:lab_light_area,:mech_light_area,:office_open_light_area,:storage_refrig_light_area,:office_small_light_area,:main_oa_econ_max_temp
+#,Asm&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Asm/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auditorium"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,ECC&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,ECC/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""classroom_shop"", ""LPD"")['W/ft2']",,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,EPr&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,EPr/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""gym"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,ERC&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,ERC/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,ESe&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,ESe/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""gym"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,EUn&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,EUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""industrial_low"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Fin&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Fin/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Gro&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Gro/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""grocery"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""industrial_high"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""storage_refrig"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Hsp&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Hsp/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_patient"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_operating"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Htl&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Htl/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""dining_fine"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""laundry"", ""LPD"")['W/ft2']",,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Lib&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Lib/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""conference"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,MBT&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,MBT/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""computer"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""conference"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lab"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,MLI&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,MLI/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""industrial_low"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Mtl&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Mtl/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,"%= codes.lookup(""Lighting Power Density"", ""guestroom"", ""LPD"")['W/ft2']",,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""laundry"", ""LPD"")['W/ft2']",,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Nrs&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Nrs/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""health_patient"", ""LPD"")['W/ft2']",,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,OfL&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,OfL/templates/root.pxt,Metal Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""mech"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""office_open"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,OfS&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,OfS/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""corridor"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""office_small"", ""LPD"")['W/ft2']","%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Rel&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Rel/templates/root.pxt,steel-frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']",,,"%= codes.lookup(""Lighting Power Density"", ""classroom_class"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auditorium"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RFF&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,RFF/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""dining_fast"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""restroom"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RSD&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,RSD/templates/root.pxt,Wood Frame,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Wood Framed and Other"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,"%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""lobby"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""dining_fine"", ""LPD"")['W/ft2']",,"%= codes.lookup(""Lighting Power Density"", ""restroom"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+,Rt3&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,Rt3/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RtL&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,RtL/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']","%= codes.lookup(""Lighting Power Density"", ""office_large"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""kitchen"", ""LPD"")['W/ft2']",,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,"%= codes.lookup(""Lighting Power Density"", ""auto"", ""LPD"")['W/ft2']",,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,RtS&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,RtS/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,"%= codes.lookup(""Lighting Power Density"", ""retail_sales"", ""LPD"")['W/ft2']","%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,SCn&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,SCn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Metal Framed"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Metal Buildings"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,SUn&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,SUn/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
+#,Wrf&0&cAVVG&New&Chiller __WtrCldCentChlr&WtrCldScrewChlr,WRf/templates/root.pxt,Mass Heavy,"%= codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Cavity R-Value"")['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Walls Above Grade | Mass Heavy"", ""Maximum U-Factor"")-1.49)['R-IP']","%= (1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Roofs | Wood Framed and Other"", ""Maximum U-Factor"")-0.78)['R-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""U-Factor""))['U-IP']","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""SHGC""))","%= (codes.lookup(""Fenestration Requirements | Climate Zone #{climate_zone}"", ""Fixed Window"", ""VT""))","%= ((1/codes.lookup(""Opaque Envelope Requirements | Climate Zone #{climate_zone}"", ""Floors | Other"", ""Maximum U-Factor""))-4.261)['R-IP']",,,,,,,"%= codes.lookup(""Lighting Power Density"", ""storage_warehouse"", ""LPD"")['W/ft2']",,,,,,,,,,,,,,,,,,,,,,"%= codes.lookup(""Economizer Setpoints"", ""#{climate_zone}"", ""Fixed Drybulb"")['F']"
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/query.txt b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/query.txt
new file mode 100644
index 00000000..66e76be7
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/SWHC005-05 Water Cooled Chiller_New/query.txt	
@@ -0,0 +1,30 @@
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy, Net Site Energy
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses, Electricity
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses, Natural Gas
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Source Energy, Net Source EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Source Energy, Net Source Energy
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Total End Uses, Total
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heating, Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Cooling, Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Lighting, Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Lighting, Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Interior Equipment, Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Exterior Equipment, Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Fans, Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Pumps, Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Heat Recovery, Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Water Systems, Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Refrigeration, Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Total Energy/Generators, Generators
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Heat Rejection, Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Humidification, Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Water/Water Systems, Water Systems
+
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Heating, Unmet Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Comfort and Setpoint Not Met Summary/Facility/Time Setpoint Not Met During Occupied Cooling, Unmet Cooling
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/global.pxv b/commercial measures/SWHC005-05 Water Cooled Chiller/global.pxv
new file mode 100644
index 00000000..c707bb60
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/global.pxv	
@@ -0,0 +1,2 @@
+:timestep => 6,
+:run_control => "ANNUAL"  # ANNUAL | SIZING
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/query_wcc.txt b/commercial measures/SWHC005-05 Water Cooled Chiller/query_wcc.txt
new file mode 100644
index 00000000..faba355b
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/query_wcc.txt	
@@ -0,0 +1,38 @@
+ComponentSizingSummary/Entire Facility/Chiller:Electric:EIR/Design Size Reference Capacity/*, Chiller Cooling Capacity
+ComponentSizingSummary/Entire Facility/Chiller:Electric:ReformulatedEIR/Design Size Reference Capacity/*, Chiller Cooling Capacity
+EquipmentSummary/Entire Facility/Central Plant/IPLV in SI Units/*, IPLV in SI Units
+SystemSummary/Entire Facility/Time Setpoint Not Met/During Occupied Heating/, Occupied unmet heating hour
+SystemSummary/Entire Facility/Time Setpoint Not Met/During Occupied Cooling/, Occupied unmet cooling hour	
+InputVerificationandResultsSummary/Entire Facility/General/Value/Program Version and Build
+InputVerificationandResultsSummary/Entire Facility/General/Value/Weather File
+InputVerificationandResultsSummary/Entire Facility/Zone Summary/Area/Conditioned Total
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Utility Use Per Conditioned Floor Area/Electricity Intensity/HVAC
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Utility Use Per Conditioned Floor Area/Natural Gas Intensity/HVAC
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Generators
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heating
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Cooling
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Exterior Lighting
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Interior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Exterior Equipment
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Fans
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Pumps
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heat Rejection
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Humidification
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Heat Recovery
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Water Systems
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Refrigeration
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Generators
diff --git a/commercial measures/SWHC005-05 Water Cooled Chiller/rakefile.rb b/commercial measures/SWHC005-05 Water Cooled Chiller/rakefile.rb
new file mode 100644
index 00000000..4ed80a71
--- /dev/null
+++ b/commercial measures/SWHC005-05 Water Cooled Chiller/rakefile.rb	
@@ -0,0 +1,1010 @@
+# Copyright (c) 2011-2020 Big Ladder Software LLC. All rights reserved.
+# See the file "license.txt" for additional terms and conditions.
+
+if (not defined?(Modelkit))
+  begin
+    require("modelkit")
+  rescue LoadError => exception
+    args = ARGV.join(" ")
+    puts exception
+    puts "\e[1m\e[31mERROR: This rakefile requires the Modelkit library. Make sure that you have the\nModelkit gem installed in your local Rubygems environment, or try running the\nrakefile using your stand-alone installation of Modelkit by typing:\e[0m\n  \e[1mmodelkit rake #{args}\e[0m"
+    exit
+  end
+end
+
+
+require("pathname")
+require("json")
+
+require("modelkit/config")
+require("modelkit/multitable")
+require("modelkit/parametrics")
+require("modelkit/parametrics/worksheet")
+require("modelkit/energyplus")
+
+
+# Add to modelkit-energyplus:
+# other args:
+# - which design days
+# - water mains temp?
+# - daylight saving time?
+def generate_site_pxt(idd, ddy_path, site_path)
+  site_file = File.open(site_path, "w")
+
+  if (File.exists?(ddy_path))
+    input_file = OpenStudio::InputFile.open(idd, ddy_path)
+  else
+    raise("file not found: #{ddy_path.inspect}")
+  end
+
+  site_locations = input_file.find_objects_by_class_name("Site:Location").to_a
+
+  if (site_locations.empty?)
+    raise("could not find Site:Location object in #{ddy_path.inspect}")
+  else
+    site_file.puts(site_locations.first.to_idf)
+  end
+
+  all_design_days = input_file.find_objects_by_class_name("SizingPeriod:DesignDay").to_a
+  selected_design_days = all_design_days.select { |dd| dd.name[/Ann Htg 99.6% Condns DB|Ann Clg 0?.4% Condns DB/i] }
+
+  if (selected_design_days.length < 2)
+    puts "warning: could not find requested design days; including all design days\n"
+    selected_design_days = all_design_days
+  end
+
+  # Write design days to site file.
+  selected_design_days.each { |dd| site_file.puts(dd.to_idf) }
+
+
+# 'CorrelationFromWeatherFile' is available starting in EP 9.0.
+
+# Does this work for design-day only runs?
+# Seems to work for annual.
+  site_file.puts("\n\nSite:WaterMainsTemperature,\n  CorrelationFromWeatherFile;\n")
+
+  daylight_saving_time = input_file.find_objects_by_class_name("RunPeriodControl:DaylightSavingTime").to_a
+  if (not daylight_saving_time.empty?)
+    site_file.puts
+    site_file.puts(daylight_saving_time.first.to_idf)
+  end
+
+  site_file.close
+end
+
+
+# NOPUB Should move into Modelkit somewhere.
+# Support for running simulations in parallel.
+require("open3")
+require("set")
+
+$child_pids = Set.new  # Global tracking of child PIDs
+
+# Return PID?
+def run_process(command, dir)
+  # NOTE: Separate processes are required to make the EnergyPlus runs thread safe!
+  Open3.popen3(command, :chdir => dir) do |stdin, stdout, stderr, thread|
+    $child_pids.add(thread.pid)
+    # This might work with just an instance variable or similar.
+
+    stdin.close  # All input already sent with command
+
+    file_out = File.open("#{dir}/stdout", "w")
+    file_err = File.open("#{dir}/stderr", "w")
+
+    while (line = stdout.gets)
+      file_out.puts(line)
+      #@proc_out.call(line) if (@proc_out)
+    end
+
+    # This is probably not right.
+    while (line = stderr.gets)
+      file_err.puts(line)
+      #@proc_err.call(line) if (@proc_err)
+    end
+
+    stdout.close
+    stderr.close
+
+    file_out.close
+    file_err.close
+
+    #print "Completed: #{File.basename(dir)}\n"
+    $child_pids.delete(thread.pid)
+  end
+end
+
+# Search up through parent directories for one or more possible file names.
+def search_parent_dirs(start_dir, *file_names)
+  path = nil
+  dir_names = start_dir.to_s.split("/")
+  while (not dir_names.empty?) do
+    file_names.each do |file_name|
+      test_path = "#{dir_names.join("/")}/#{file_name}"
+      if (File.exist?(test_path))
+        path = test_path
+        break
+      end
+    end
+    break if (path)
+    dir_names.pop
+  end
+  return(path)
+end
+
+# Search for a file name or partial path in an array of provided directories.
+# Directories are expected to already be absolute paths.
+def resolve_path(path, dirs)
+  resolved_path = nil
+  dirs.each do |dir|
+    expanded_path = File.expand_path(path, dir)
+    if (File.exist?(expanded_path))
+      resolved_path = expanded_path
+      break
+    end
+  end
+  return(resolved_path)
+end
+
+# Clean up any previous output files left behind if 'compose' or 'run' fails.
+# Leftover files can be processed unintentionally by downstream tasks and
+# ultimately generate false results.
+def clean_energyplus_output_files(dir)
+  # Not all of these files might be present. Others might be present and unhandled.
+  paths = [
+    "#{dir}/instance-out.err",
+    "#{dir}/instance-out.rdd",
+    "#{dir}/instance-out.sql",  # Most important for downstream tasks
+    "#{dir}/instance-tbl.htm",
+    "#{dir}/instance-var.csv",
+    "#{dir}/stderr",
+    "#{dir}/stdout"
+  ]
+  FileUtils.rm_f(paths)
+end
+
+
+# Rake stubbornly sets the working directory to wherever the Rakefile is located.
+# The target directory could optionally be set from a CLI option instead.
+study_dir = Rake.application.original_dir
+
+climates_csv_path = "#{study_dir}/climates.csv"
+cohorts_csv_path = "#{study_dir}/cohorts.csv"
+
+query_path = "#{study_dir}/query.txt"
+results_summary_path = "#{study_dir}/results-summary.csv"
+results_profile_elec_path = "#{study_dir}/results-profile-elec.csv"
+results_profile_gas_path = "#{study_dir}/results-profile-gas.csv"
+results_paths = [results_summary_path, results_profile_elec_path, results_profile_gas_path]
+
+cases_dir = "#{study_dir}/cases"
+runs_dir = "#{study_dir}/runs"
+runs_pathname = Pathname.new(runs_dir)
+
+MUTEX = Mutex.new  # Thread lock for when something needs to run in a single thread
+
+config_path = search_parent_dirs(study_dir, ".modelkit-config")
+if (not config_path)
+  raise("modelkit-config file not found in working directory or any parent directory")
+else
+  CONFIG = Modelkit::Config.new(config_path)
+  puts "Using modelkit-config at #{config_path}\n"
+end
+
+config = Hash.new
+[:prototypes_dir, :templates_dir, :weather_dir, :codes_dir].each do |key|
+  config[key] = []
+  field = key.to_s.gsub(/_/, "-")
+  if (not CONFIG[field])
+    raise("#{field} variable missing in modelkit-config")
+  else
+    config_paths = CONFIG[field].split(/\s*;\s*/)  # Split string with semicolons into array of paths
+    config_paths.each do |path|
+      # Resolve path relative to modelkit-config file and normalize the slashes.
+      config[key] << File.expand_path(path.strip.gsub(/\\/, "/"), File.dirname(config_path))
+    end
+  end
+end
+
+max_workers = CONFIG["max-workers"]
+if (max_workers.nil?)
+  max_workers = 1
+end
+
+global_pxv_path = search_parent_dirs(study_dir, "global.pxv")
+if (global_pxv_path)
+  puts "Using global.pxv at #{global_pxv_path}\n"
+end
+
+rake_tasks = Rake.application.top_level_tasks
+rake_task_name = rake_tasks.first  # Multiple tasks are allowed, but assume one
+
+rake_options = Rake.application.options
+rake_options.always_multitask = true  # --multitask, -m
+#rake_options.job_stats = true  # --job-stats   true | :history
+rake_options.thread_pool_size = max_workers - 1  # --jobs, -j (default 12 on Mac)
+
+if (rake_options.dryrun or rake_options.show_all_tasks or
+  rake_options.show_prereqs or rake_options.show_tasks)
+  # These are information-only requests. Rake nonetheless registers as invoked
+  # with the "default" task name but nothing actually gets run.
+  rake_task_name = "none"
+end
+
+
+# Show threads message and info about how to change
+#   Running with 8 threads (edit .modelkit-config to change).
+#   Type Ctrl+C to cancel all tasks.
+
+require "io/console"  # need this anyway for progress bar
+
+#$stdin.echo = false  # turn off echo; in Mac shows a cursor with a key icon
+# This prevents the user from over-typing the output stream.
+
+# also try switching to raw mode--should also block user input; maybe no key icon?
+
+#print "\e[?25l"  # hide the cursor; MUST remember to show it again on exit or else it's permanent for the session!
+
+
+trap("INT") do  # Ctrl+C (polite kill)
+  puts "Canceling all tasks.\n"
+  if ($child_pids)
+    $child_pids.each { |pid| Process.kill("KILL", pid) }
+  end
+  exit
+end
+
+if (Modelkit::Platform.unix?)
+  trap("TSTP") do  # Ctrl+Z (suspend)
+    puts "Suspending all tasks. Type 'fg' to resume.\n"
+    exit
+  end
+end
+
+if (not rake_task_name =~ /^(prune|clean|none)$/)
+
+# If possible, detect if any tasks will be run before showing this message:
+puts "\e[1mType Ctrl+C to cancel all tasks.\e[0m\n"
+
+end
+
+# modelkit rake -A crashes for some reason
+
+# NOPUB Some of above could be included here too.
+# Don't evaluate worksheets and generate file tasks if not necessary!
+# NOTE: prune does need to evaluate worksheets.
+if (not rake_task_name =~ /^(clean|none)$/)
+
+  pxv_paths = []
+  site_paths = []
+
+  compose_idf_paths = []
+
+
+  #rename size_ to sizerun_  size_run_  sizing_run_
+  size_ref_paths = []
+  size_idf_paths = []
+  size_sql_paths = []
+  size_json_paths = []
+
+  hardsize_idf_paths = []
+
+  run_sql_paths = []
+  run_csv_paths = []
+
+
+
+  old_site_paths = Dir.glob("#{runs_dir}/*/site.pxt")
+  old_pxv_paths = Dir.glob("#{runs_dir}/**/instance.pxv")
+
+  climates = Modelkit::Worksheet.open(climates_csv_path)
+  cohorts = Modelkit::Worksheet.open(cohorts_csv_path)
+
+  climate_pattern = ENV["CLIMATE"] || ""
+
+  new_case_csv = "skip,case_name\n,defaults\n"  # Could be read from config instead
+
+  cohorts_first_pass = true
+
+  puts "Evaluating worksheets...\n"
+
+  csv_table = climates.each_row do |row1, index1, variables1, parameters1|
+    #puts "climate_index = #{index1}"
+
+    if (not variables1.key?(:climate))
+      raise("required column \"climate\" is missing in #{File.basename(climates_csv_path)}")
+    end
+
+    climate_name = variables1[:climate].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+    if (climate_name.empty?)
+      raise("climate field cannot be blank for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    next if (not climate_name =~ Regexp.new(climate_pattern))
+
+    FileUtils.mkdir_p("#{runs_dir}/#{climate_name}")
+
+    site_path = "#{runs_dir}/#{climate_name}/site.pxt"
+    if (site_paths.include?(site_path))
+      puts "warning: duplicate name #{climate_name.inspect} in climate column at row #{index1 + 2} in #{File.basename(climates_csv_path)}; row will be skipped"
+      next
+    end
+
+    site_paths << site_path
+
+    if (not variables1.key?(:weather_file))
+      raise("required column \"weather_file\" is missing in #{File.basename(climates_csv_path)}")
+    end
+
+    weather_name = variables1[:weather_file].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+    if (weather_name.empty?)
+      raise("weather_file field cannot be blank for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    epw_path = resolve_path(weather_name, config[:weather_dir])
+    if (not epw_path)
+      puts "Could not resolve path #{weather_name.inspect} from possible paths:\n"
+      config[:weather_dir].each { |dir| puts "  #{File.expand_path(weather_name, dir).inspect}\n" }
+      puts "Check the weather-dir variable in modelkit-config file.\n"
+      raise("weather file #{weather_name.inspect} not found for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    if (not File.file?(epw_path))
+      raise("weather file #{epw_path.inspect} is not a file for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    ddy_path = "#{File.dirname(epw_path)}/#{File.basename(epw_path, ".*")}.ddy"  # Ensure ddy is from same directory as resolved epw file
+    if (not File.exist?(ddy_path))
+      puts "Weather file path resolved to #{epw_path.inspect}\n"
+      raise("ddy file #{ddy_path.inspect} not found for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+    end
+
+    # This file only exists to indicate if the weather file changes for dependency purposes.
+    # The weather file is the one input that is separate from instance parameters.
+    weather_path = "#{runs_dir}/#{climate_name}/weather"
+    pathname = Pathname.new(weather_path).relative_path_from(runs_pathname)
+
+    if (File.exist?(weather_path))
+      old_epw_path = File.read(weather_path)
+      if (epw_path != old_epw_path)
+        puts "Updating: #{pathname}\n"
+        File.write(weather_path, epw_path)
+      end
+    else
+      puts "Writing: #{pathname}\n"
+      File.write(weather_path, epw_path)
+    end
+
+    # generate site.pxt from .ddy file
+    file site_path => [weather_path, ddy_path] do
+      idd = open_data_dictionary
+      pathname = Pathname.new(site_path).relative_path_from(runs_pathname)
+      puts "Generating: #{pathname}\n"
+      generate_site_pxt(idd, ddy_path, site_path)
+    end
+
+    if (variables1.key?(:codes_file))  # NOTE: codes_file is an optional column
+      codes_name = variables1[:codes_file].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+      if (codes_name.empty?)
+        raise("codes_file field cannot be blank for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+      end
+
+      codes_path = resolve_path(codes_name, config[:codes_dir])
+      if (not codes_path)
+        puts "Could not resolve path #{codes_name.inspect} from possible paths:\n"
+        config[:codes_dir].each { |dir| puts "  #{File.expand_path(codes_name, dir).inspect}\n" }
+        puts "Check the codes-dir variable in modelkit-config file.\n"
+        raise("codes file #{codes_name.inspect} not found for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+      end
+
+      if (not File.file?(codes_path))
+        raise("codes file #{codes_path.inspect} is not a file for row #{index1 + 2} of #{File.basename(climates_csv_path)}")
+      end
+
+      codes_table = Modelkit::MultiTable.new(codes_path)
+
+    else
+      codes_table = nil  # Must set something to pass to next worksheet
+    end
+
+    variables1[:codes] = codes_table  # For backwards compatibility
+
+  # Make sure objects passed in are not mutated by the Worksheet. Make dupes?
+
+    cohort_names = []  # Accumulate names to check for duplicates
+
+    cohorts.each_row(variables1) do |_, index2, variables2, parameters2|
+      #puts "  cohort_index = #{index2}"
+
+      # NOTE: Variables from outer worksheet (variables1) are copied into this worksheet.
+      # Changes to the variables here (variables2) do not propagate back up.
+
+      if (not variables2.key?(:cohort))
+        raise("required column \"cohort\" is missing in #{File.basename(cohorts_csv_path)}")
+      end
+
+      cohort_name = variables2[:cohort].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+      if (cohort_name.empty?)
+        raise("cohort field cannot be blank for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}")
+      end
+
+      if (cohort_names.include?(cohort_name))
+        if (cohorts_first_pass)  # Only warn about this row once
+          puts "warning: duplicate name #{cohort_name.inspect} in cohort column at row #{index2 + 2} in #{File.basename(cohorts_csv_path)}; row will be skipped"
+        end
+        next
+      end
+
+      cohort_names << cohort_name
+
+      cases_csv_path = "#{cases_dir}/#{cohort_name}.csv"
+      cases_csv_short_path = "#{File.basename(cases_dir)}/#{cohort_name}.csv"
+      if (not File.exist?(cases_csv_path))
+        puts("Cases worksheet #{cases_csv_short_path.inspect} not found for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}\n")
+        puts("Creating: #{cases_csv_short_path}\n")
+        FileUtils.mkdir_p(cases_dir)
+        File.write(cases_csv_path, new_case_csv)
+      end
+
+      if (not variables2.key?(:root))
+        raise("required column \"root\" is missing in #{File.basename(cohorts_csv_path)}")
+      end
+
+      root_name = variables2[:root].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+      if (root_name.empty?)
+        raise("root field cannot be blank for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}")
+      end
+
+      root_path = resolve_path(root_name, config[:prototypes_dir])
+      if (not root_path)
+        puts "Could not resolve path #{root_name.inspect} from possible paths:\n"
+        config[:prototypes_dir].each { |dir| puts "  #{File.expand_path(root_name, dir).inspect}\n" }
+        puts "Check the prototypes-dir variable in modelkit-config file.\n"
+        raise("root template #{root_name.inspect} not found for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}")
+      end
+
+      if (not File.file?(root_path))
+        raise("root template #{root_path.inspect} is not a file for row #{index2 + 2} of #{File.basename(cohorts_csv_path)}")
+      end
+
+      case_names = []  # Accumulate names to check for duplicates
+
+      # Better to pre-read and cache this outside the looping?
+      # There are only N worksheets...1 per building type.
+      cases = Modelkit::Worksheet.open(cases_csv_path)
+
+      cases.each_row(variables2) do |_, index3, variables3, parameters3|
+        #puts "    case_index = #{index3}"
+
+        # NOTE: Variables from outer worksheet (variables2) are copied into this worksheet.
+        # Changes to the variables here (variables3) do not propagate back up.
+
+        if (not variables3.key?(:case_name))
+          raise("required column \"case_name\" is missing in #{File.basename(cases_dir)}/#{File.basename(cases_csv_path)}")
+        end
+
+        case_name = variables3[:case_name].to_s.strip  # Could have been converted to non-string by Util.value_from_string
+        if (case_name.empty?)
+          raise("case_name field cannot be blank for row #{index3 + 2} of #{File.basename(cases_dir)}/#{File.basename(cases_csv_path)}")
+        end
+
+        if (case_names.include?(case_name))
+          if (cohorts_first_pass)  # Only warn about this row once
+            puts "warning: duplicate name #{case_name.inspect} in case_name column at row #{index3 + 2} in #{File.basename(cases_dir)}/#{File.basename(cases_csv_path)}; row will be skipped"
+          end
+          next
+        end
+
+        case_names << case_name
+        run_name = "#{climate_name}/#{cohort_name}/#{case_name}"
+        case_dir = "#{runs_dir}/#{run_name}"
+        FileUtils.mkdir_p(case_dir)
+
+  # better to create this dynamically in cases.csv by combining variables from other layers.
+  # all variables need to be propagated first from layer to layer.
+  # for example:
+  #   :run_name
+  #   %= "My Prefix Something: #{climate}/#{cohort}/#{case_name}"
+        pxv_string = ":run_name => #{run_name.inspect},\n"
+
+        parameters = parameters1 | parameters2 | parameters3
+        parameters.each do |key, value|
+          value_inspect = value.inspect
+          if (value.kind_of?(String))
+            # Using `inspect` on strings is useful because it reveals invisible
+            # characters and invalid byte sequences. The downside is that the
+            # string must be unescaped.
+            value_inspect.gsub!(/\\\\/, "\\")
+          end
+          pxv_string << ":#{key} => #{value_inspect},\n"
+        end
+
+        pxv_path = "#{case_dir}/instance.pxv"
+        pxv_paths << pxv_path
+
+        pathname = Pathname.new(pxv_path).relative_path_from(runs_pathname)
+
+        if (File.exist?(pxv_path))
+          old_pxv_string = File.read(pxv_path)
+          if (pxv_string != old_pxv_string)
+            puts "Updating: #{pathname}\n"
+            File.write(pxv_path, pxv_string)
+          end
+        else
+          puts "Writing: #{pathname}\n"
+          File.write(pxv_path, pxv_string)
+        end
+
+        compose_idf_path = "#{case_dir}/instance.idf"
+        compose_idf_paths << compose_idf_path
+
+        if (variables3[:sizing_case])
+          size_name = "#{climate_name}/#{cohort_name}/#{variables3[:sizing_case]}"
+          size_dir = "#{runs_dir}/#{size_name}"
+          size_ref_path = "#{size_dir}/instance.idf"
+
+          size_idf_path = "#{size_dir}/instance-size.idf"
+          size_sql_path = "#{size_dir}/instance-size-out.sql"
+          size_json_path = "#{size_dir}/instance-size-out.json"
+
+          if (size_ref_paths.include?(size_ref_path))
+            # Avoid creating redundant tasks when multiple cases reference same sizing case.
+            create_sizing_tasks = false
+          else
+            create_sizing_tasks = true
+
+            size_ref_paths << size_ref_path
+            size_idf_paths << size_idf_path
+            size_sql_paths << size_sql_path
+            size_json_paths << size_json_path
+          end
+
+          hardsize_idf_path = "#{case_dir}/instance-hardsize.idf"
+          hardsize_idf_paths << hardsize_idf_path
+
+          run_idf_path = hardsize_idf_path  # Which input file to run
+
+          run_sql_path = "#{case_dir}/instance-hardsize-out.sql"
+          run_sql_paths << run_sql_path
+
+          run_csv_path = "#{case_dir}/instance-hardsize-var.csv"
+          run_csv_paths << run_csv_path
+
+        else
+          # Autosize-only run.
+          size_ref_path = nil
+
+          run_idf_path = compose_idf_path  # Which input file to run
+
+          run_sql_path = "#{case_dir}/instance-out.sql"
+          run_sql_paths << run_sql_path
+
+          run_csv_path = "#{case_dir}/instance-var.csv"
+          run_csv_paths << run_csv_path
+        end
+
+        # Compose input file from parameter file.
+        #   need more dependencies here: template files
+        file compose_idf_path => [site_path, root_path, pxv_path, global_pxv_path].compact do  # If no path for global.pxv, remove nil element
+          pathname = Pathname.new(compose_idf_path).relative_path_from(runs_pathname)
+          puts "Composing: #{pathname}\n"
+
+          clean_energyplus_output_files(File.dirname(compose_idf_path))
+
+          site_dir = File.dirname(site_path)
+
+          begin
+            Modelkit::Parametrics.template_compose(root_path,
+              :annotate => CONFIG["template-compose.annotate"],
+              :indent => CONFIG["template-compose.indent"],
+              :esc_line => CONFIG["template-compose.esc-line"],
+              :dirs => [site_dir, *config[:templates_dir]],
+              :files => [global_pxv_path, pxv_path].compact,  # If no path for global.pxv, remove nil element
+              :output => compose_idf_path)
+          rescue Exception => exception
+            puts "#{exception.class.name}: #{exception.message}\n"
+            puts "#{exception.backtrace.first}\n" if (not SyntaxError === exception)
+            puts "Skipping: #{pathname}\n"
+          end
+        end
+
+        if (create_sizing_tasks)
+          # Generate a modified input file in order to run a design-day-only simulation.
+          # NOTE: This can be eliminated if a design-day option is added to energyplus-run.
+          file size_idf_path => size_ref_path do
+            pathname = Pathname.new(size_idf_path).relative_path_from(runs_pathname)
+            puts "Generating size run: #{pathname}\n"
+
+            FileUtils.cp(size_ref_path, size_idf_path)
+
+            idd = open_data_dictionary
+            input_file = OpenStudio::InputFile.open(idd, size_idf_path)
+
+            sc_objs = input_file.find_objects_by_class_name("SimulationControl")
+            if sc_objs.length != 1
+              raise "More than one SimulationControl object found"
+            end
+            sc = sc_objs[0]
+            sc.fields[1] = "Yes"
+            sc.fields[2] = "Yes"
+            sc.fields[3] = "Yes"
+            sc.fields[4] = "Yes"
+            sc.fields[5] = "No"
+
+            input_file.write(size_idf_path)
+          end
+
+          # Run sizing input files for design days only.
+          file size_sql_path => size_idf_path do
+            pathname = Pathname.new(size_idf_path).relative_path_from(runs_pathname)
+            puts "Running size run: #{pathname}\n"
+
+            command = "modelkit-energyplus energyplus-run --weather=\"#{epw_path}\" \"#{size_idf_path}\""
+            run_process(command, size_dir)
+          end
+
+          # Generate size data file (instance-size-out.json).
+          file size_json_path => size_sql_path do
+            pathname = Pathname.new(size_json_path).relative_path_from(runs_pathname)
+            puts "Extracting size data: #{pathname}\n"
+
+            # Make a copy to work on because the original gets overwritten by EnergyPlus.size.
+            temp_path = "#{File.dirname(size_idf_path)}/instance-temp.idf"
+            FileUtils.cp(size_idf_path, temp_path)
+
+            idd = open_data_dictionary
+            input_file = OpenStudio::InputFile.open(idd, temp_path)
+            sql = Modelkit::EnergyPlus::SQLOutput.new(size_sql_path)
+
+            # This will be fixed to only generate JSON and not modify the input file.
+            _, count, output_file = Modelkit::EnergyPlus.size(
+              sql, input_file, {json: size_json_path, version: "9-2"})
+            #puts("#{count} modifications made")
+
+            FileUtils.rm_f(temp_path)
+          end
+        end
+
+        if (hardsize_idf_path)
+          # This would be a reasonable place to use `multitask` because compose_idf_path and
+          # size_json_path are independent and can be run concurrently. However, it seems
+          # like `multitask` doesn't compare timestamps like `file` does. Instead it
+          # always runs like a regular `task`.
+          file hardsize_idf_path => [compose_idf_path, size_json_path] do
+            pathname = Pathname.new(hardsize_idf_path).relative_path_from(runs_pathname)
+            puts "Applying hard sizes: #{pathname}\n"
+
+            idd = open_data_dictionary
+            input_file = OpenStudio::InputFile.open(idd, compose_idf_path)
+
+            json_string = File.read(size_json_path)
+            value_map = JSON.parse(json_string, {:symbolize_names=>true})
+            output_file, count = Modelkit::EnergyPlus.modify_objects(input_file, value_map)
+            #puts("#{count} modifications made")
+
+            # Set SimulationControl fields 1, 2, and 3 to "No", "No", and "No"
+            sc_objs = output_file.find_objects_by_class_name("SimulationControl")
+            if sc_objs.length != 1
+              raise "More than one SimulationControl object found"
+            end
+            sc = sc_objs[0]
+            sc.fields[1] = "No"
+            sc.fields[2] = "No"
+            sc.fields[3] = "No"
+            # Remove Sizing:Zone and Sizing:System objects
+            sizing_zones = output_file.find_objects_by_class_name("Sizing:Zone")
+            sizing_systems = output_file.find_objects_by_class_name("Sizing:System")
+            sizing_plants = output_file.find_objects_by_class_name("Sizing:Plant")
+            (sizing_zones + sizing_systems + sizing_plants).each {|x| output_file.delete_object(x)}
+
+            output_file.write(hardsize_idf_path)
+          end
+        end
+
+        # Run input file in a separate process.
+        file run_sql_path => [epw_path, run_idf_path] do
+          # Not sure why this check is needed; seems to try to run if even IDF does not exist.
+          # May need in other places, like sizing run.
+          next if (not File.exist?(run_idf_path))
+
+          pathname = Pathname.new(run_idf_path).relative_path_from(runs_pathname)
+          puts "Running: #{pathname}\n"
+
+          # Because this is spawned to the shell, .modelkit-config options will be
+          # automatically applied.
+          # NOTE: If modelkit-energyplus was thread safe, would not have to run this
+          #   as a separate process.
+          command = "modelkit-energyplus energyplus-run --weather=\"#{epw_path}\" \"#{run_idf_path}\""
+          run_process(command, case_dir)
+          #$bar.inc
+        end
+
+
+  # see discussion with Michael
+        file run_csv_path => run_sql_path
+
+  # deleting instance-out.csv breaks it; doesn't know how to recover
+
+      end
+    end
+
+    cohorts_first_pass = false
+  end
+
+
+  prune_paths = (old_site_paths - site_paths) + (old_pxv_paths - pxv_paths)
+
+  if (not prune_paths.empty? and not rake_task_name =~ /^(prune|clean|none)$/)
+    puts "\e[1m\e[33mNote: There are cases in the runs directory that are not referenced by any\n" \
+      "worksheet. You may want to delete them by typing:\e[0m\n  \e[1mmodelkit rake prune\e[0m\n"
+  end
+
+end
+
+
+desc "Generate case files"
+task :cases do
+  # No operation; cases are generated when worksheets are evaluated.
+end
+
+
+desc "Delete unreferenced files"
+task :prune do
+  if (prune_paths.empty?)
+    puts "Prune has nothing to delete."
+  else
+    prune_dirs = []
+    puts "\e[1m\e[31mPrune will delete the following files:\e[0m"
+
+# show each as:  dirname/* (106 files)
+
+    prune_paths.each do |path|
+      dir = File.dirname(path)
+      prune_dirs << dir
+      pathname = Pathname.new(dir).relative_path_from(runs_pathname)
+      puts "  \e[31m#{pathname}\e[0m"
+    end
+    print "\e[1m\e[31mConfirm (y/n)?\e[0m "
+
+    input = ENV["CONFIRM"] || $stdin.gets || ""
+    if (ENV["CONFIRM"] or not $stdin.tty?)
+      puts input  # Echo when not already written to STDOUT
+    end
+
+    $start_time = Time.now  # Reset to cut out wait time on the user prompt
+    if (input.strip =~ /^y/i)
+      puts "Pruning files..."
+
+      # maybe don't have to repeat this--already said what was to be deleted
+      prune_dirs.each do |dir|
+        pathname = Pathname.new(dir).relative_path_from(runs_pathname)
+        puts "Deleting: #{pathname}"
+        FileUtils.rm_rf(dir)
+      end
+    else
+      puts "Task canceled."
+    end
+  end
+end
+
+
+desc "Delete all files and results"
+task :clean do
+  paths = []; names = []
+  [runs_dir, *results_paths].each do |path|
+    if (File.directory?(path))
+      count = Dir.glob("#{path}/**/*").count { |f| File.file?(f) }
+      if (count.nonzero?)
+        paths << Dir.glob("#{path}/*")
+        names << "#{File.basename(path)}/* (#{count} files)"
+      end
+    elsif (File.file?(path))
+      paths << path
+      names << File.basename(path)
+    end
+  end
+
+  if (paths.empty?)
+    puts "Clean has nothing to delete."
+  else
+    puts "\e[1m\e[31mClean will delete the following files:\e[0m"
+    names.each { |name| puts "  \e[31m#{name}\e[0m"}
+    print "\e[1m\e[31mConfirm (y/n)?\e[0m "
+
+    input = ENV["CONFIRM"] || $stdin.gets || ""
+    if (ENV["CONFIRM"] or not $stdin.tty?)
+      puts input  # Echo when not already written to STDOUT
+    end
+
+    $start_time = Time.now  # Reset to cut out wait time on the user prompt
+    if (input.strip =~ /^y/i)
+      puts "Cleaning files..."
+      FileUtils.rm_rf(paths)
+    else
+      puts "Task canceled."
+    end
+  end
+end
+
+
+desc "Generate site files (site.pxt)"
+multitask :sites => site_paths
+
+
+desc "Compose input files"
+multitask :compose => compose_idf_paths
+
+
+# Generate size input files
+multitask :"size-idf" => size_idf_paths
+
+
+# Run size input files
+multitask :"size-sql" => size_sql_paths
+
+
+# Extract size data
+multitask :"size-json" => size_json_paths
+
+
+desc "Apply hard sizes to input files"
+multitask :hardsize => hardsize_idf_paths
+
+
+desc "Run input files"
+multitask :run => run_sql_paths
+
+
+file query_path do
+  puts "Query file not found.\n"
+  query =
+"AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Energy Per Total Building Area/Net Site Energy, Net Site EUI
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/Site and Source Energy/Total Energy/Net Site Energy, Net Site Energy
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Electricity/Total End Uses, Electricity
+AnnualBuildingUtilityPerformanceSummary/Entire Facility/End Uses/Natural Gas/Total End Uses, Natural Gas\n"
+  File.write(query_path, query)
+  puts "Writing default query file: #{query_path}\n"
+end
+
+
+file results_summary_path => [*run_sql_paths, query_path] do
+  pathname = Pathname.new(results_summary_path).relative_path_from(Pathname.new(study_dir))
+  puts "Processing: #{pathname}\n"
+
+  short_paths = run_sql_paths.map { |path| Pathname.new(path).relative_path_from(runs_pathname) }
+  Modelkit::EnergyPlus.sql(short_paths, query_path, :dir => runs_dir, :output => results_summary_path)
+end
+
+
+file results_profile_elec_path => run_csv_paths do
+  aggregate_profiles("Electricity:Facility", results_profile_elec_path, run_csv_paths, runs_pathname, study_dir)
+end
+
+
+file results_profile_gas_path => run_csv_paths do
+  aggregate_profiles("Gas:Facility", results_profile_gas_path, run_csv_paths, runs_pathname, study_dir)
+end
+
+
+desc "Aggregate the simulation results"
+task :results => results_paths
+
+
+task :default => :results
+
+
+def aggregate_profiles(column_name, output_path, run_csv_paths, runs_pathname, study_dir)
+  pathname = Pathname.new(output_path).relative_path_from(Pathname.new(study_dir))
+  puts "Processing: #{pathname}\n"
+
+  short_paths = run_csv_paths.map { |path| Pathname.new(path).relative_path_from(runs_pathname) }
+
+  columns = []
+  column_header = nil
+  date_time = true
+  short_paths.each do |short_path|
+    csv_path = "#{runs_pathname}/#{short_path}"
+    if (File.exist?(csv_path))
+      csv = CSV.read(csv_path, :headers=>true)
+      if (date_time)
+        column = csv["Date/Time"]
+        column.unshift("Date/Time")  # Add header
+        columns << column
+        date_time = false
+      end
+      if (not column_header)
+        # Match column name to the header while ignoring units/interval, i.e., [J](Hourly).
+        column_header = csv.headers.find { |header| header.match(column_name) }
+      end
+      column = csv[column_header]
+      column.unshift(short_path)  # Add header
+      columns << column
+    else
+      puts "warning: file not found: #{csv_path}\n"
+    end
+  end
+
+  File.open(output_path, "w") do |file|
+    columns.transpose.each { |row| file.puts(row.join(",")) }
+  end
+end
+
+
+# NOPUB consider building this into modelkit-energyplus.
+#   basically caches IDD path and avoids concurrent openings.
+
+# Open the EnergyPlus IDD if needed, but only do it once.
+def open_data_dictionary
+  MUTEX.synchronize do  # Lock to prevent opening multiple times concurrently
+    if (@idd.nil?)
+      puts "Opening Energy+.idd...\n"
+
+      if (path = CONFIG["energyplus-run.engine"])
+        path = File.expand_path(path.gsub(/\\/, "/"))  # Resolve path and normalize
+        if (File.exist?(path))
+          idd_path = "#{path}/Energy+.idd"
+          if (not File.exist?(idd_path))
+            raise("Energy+.idd not found in specified EnergyPlus directory: #{path}")
+          end
+        else
+          raise("EnergyPlus directory not found: #{path}")
+        end
+      else
+        raise("energyplus-run.engine field missing in .modelkit-config")
+      end
+
+      @idd = OpenStudio::DataDictionary.open(idd_path)
+    end
+  end
+  return(@idd)
+end
+
+
+# NICE, works
+#require "rake/cpu_counter"
+#puts "cpu=#{Rake::CpuCounter.count}"
+
+# Almost works but not quite:
+
+# shows what command was invoked from CLI
+# if blank (even with -T), it's "default".
+#puts "top level:"
+# cli_tasks = Rake.application.top_level_tasks
+# cli_task_name = cli_tasks.first  # could be more than one; just grab first for now
+# puts "cli_task_name=#{cli_task_name}"  # returns String
+
+# cli_task = Rake.application.tasks.find { |t| t.name == cli_task_name }  # returns Rake::Task
+# puts "cli_task=#{cli_task}"
+#
+
+#
+## Rake has this builtin:
+#  Rake.application.lookup(task_name) => task
+
+# work_to_do = false
+# if (cli_task.needed?)
+#   # Just because needed doesn't mean there is any work to do--check prereqs!
+#   cli_task.prerequisite_tasks.each do |prereq|
+#     if (prereq.needed?)
+#       work_to_do = true
+#       break
+#     end
+#   end
+# end
+#
+# if (work_to_do)
+#   puts "Work to do!"
+# else
+#   puts "Up to date; nothing to do."
+# end
+
+
+$start_time = Time.now
+#$bar = RakeProgressbar.new(run_sql_paths.length)
+
+at_exit do
+  #$bar.finished
+  if (not rake_task_name =~ /^none$/)
+    puts "Elapsed task duration: #{Time.now - $start_time} sec"
+  end
+end
diff --git a/templates/energyplus/templates/system/chw.pxt b/templates/energyplus/templates/system/chw.pxt
index 53e927a8..289dd1e5 100644
--- a/templates/energyplus/templates/system/chw.pxt
+++ b/templates/energyplus/templates/system/chw.pxt
@@ -31,8 +31,12 @@ parameter "chiller_generator_type", :default=>"HOTWATER"  # For absorption chill
 # NOTE: If DIRECTFIRED is selected, the heating_source must be set to "ABSORPTIONCHILLER" for hotwater.imf.
 
 parameter "num_chillers", :default=>1
-parameter "chiller_model", :default=>"TRANE_RTAA_125"  # (TRANE_RTAA_125 | TRANE_CGA_120 | Air-Cooled GTE 150tons Default 90.1-2004 | WC Screw Default 90.1-2004 | WC Centrifugal Default 90.1-2004 | AC 2010 | AC 2004 | WC Cent 2010 A | WC Cent 2010 B | WC Cent 2004 Small | WC Cent 2004 Large | WC PD 2010 B | WC PD 2010 A Small | WC PD 2010 A Large | WC PD 2004 )
+parameter "chiller_model", :default=>"TRANE_RTAA_125"  # (Model 9 WC Chiller | Model 7 WC Chiller | TRANE_RTAA_125 | TRANE_CGA_120 | Air-Cooled GTE 150tons Default 90.1-2004 | WC Screw Default 90.1-2004 | WC Centrifugal Default 90.1-2004 | AC 2010 | AC 2004 | WC Cent 2010 A | WC Cent 2010 B | WC Cent 2004 Small | WC Cent 2004 Large | WC PD 2010 B | WC PD 2010 A Small | WC PD 2010 A Large | WC PD 2004)
+														# Solaris - 2024-06-12 Added two more water cooled chiller (Model 9 WC Chiller | Model 7 WC Chiller)
+														# Solaris(Behzad S. Rizi) - 2024-08-09 & 2024-08-22 Added two water cooled chiller models for the basecases(ElectricEIR & ReformulatedEIR)>>>(ElectricEIRChiller Carrier 19XR 1234kW/5.39COP/VSD & ReformEIRChiller Carrier 19XR 1234kW/5.39COP/VSD | ElectricEIRChiller Trane RTHB 1051kW/5.05COP/Valve & ReformEIRChiller Trane RTHB 1051kW/5.05COP/Valve)
 parameter "chiller_cop", :default=>2.87  # Chiller nominal COP
+										# Solaris - 2024-06-12 Added more chiller nominal COP for water-cooled chiller reformulated EIR (4.8 | 5.0 | 5.4 | 5.6 | 6.0 | 6.1 | 6.4 | 6.5)
+parameter "wc_option", :default=>"Reformulated"  # (EIR | Reformulated)										
 parameter "chiller_sizing", :default=>1.0  # Chiller sizing factor (formerly to counteract oversizing problem; as of 7.2 chiller seems to undersize)
 parameter "chiller_condenser", :default=>"AIRCOOLED"  # Chiller condenser type (AIRCOOLED | WATERCOOLED | EVAPCOOLED)
 parameter "chiller_heatpump_hr", :default=>false  # Chiller heat pump heat recovery
@@ -61,7 +65,7 @@ parameter "hi_outdoor_temp", :default=>80['F']  # Outside air high temperature f
 
 parameter "chw_temp_ref", :default=>6.67['C'] # Reference Leaving Chilled Water Temperature
 parameter "cw_temp_ref", :default=>34.4444['C'] # Reference Leaving Condenser Water Temperature
-
+parameter "chiller_plr_curve", :default=>"ChillerPartLoadWithLift"  # Chiller PLR Curve (ChillerPartLoadWithLift | Bicubic | Quadratic)
 parameter "operation_schedule", :default => "Through: 12/31,\n  For: AllDays,\n  Until: 24:00, 1;"
 
 %>
@@ -310,7 +314,11 @@ PlantEquipmentList,
 <% if (cooling_source == "CHILLER") %>
   <% if (chiller_type == "ELECTRIC") %>
     <% if (chiller_condenser == "WATERCOOLED") %>
+      <% if (wc_option == "EIR") %>
+  Chiller:Electric:EIR,    !- Equipment 1 Object Type
+      <% else %>
   Chiller:Electric:ReformulatedEIR,  !- Equipment 1 Object Type
+      <% end %>
     <% else %>
   Chiller:Electric:EIR,    !- Equipment 1 Object Type
     <% end %>
@@ -330,7 +338,11 @@ PlantEquipmentList,
   <% for i in (1..num_chillers-1) %>
   <%= name %> Chiller <%= i %>,        !- Equipment 1 Name
   <% if (chiller_condenser == "WATERCOOLED") %>
+    <% if (wc_option == "EIR") %>
+  Chiller:Electric:EIR,    !- Equipment 2 Object Type
+    <% else %>
   Chiller:Electric:ReformulatedEIR,  !- Equipment 2 Object Type
+    <% end %>
   <% else %>
   Chiller:Electric:EIR,    !- Equipment 2 Object Type
   <% end %>
@@ -502,7 +514,11 @@ Branch,
 <% if (cooling_source == "CHILLER") %>
   <% if (chiller_type == "ELECTRIC") %>
     <% if (chiller_condenser == "WATERCOOLED") %>
+      <% if (wc_option == "EIR") %>
+  Chiller:Electric:EIR,    !- Component 1 Object Type
+      <% else %>
   Chiller:Electric:ReformulatedEIR,  !- Component 1 Object Type
+      <% end %>
     <% else %>
   Chiller:Electric:EIR,    !- Component 1 Object Type
     <% end %>
@@ -524,7 +540,9 @@ Branch,
 
 <% if (cooling_source == "CHILLER") %>
 <% if (chiller_type == "ELECTRIC") %>
+
 <% if (chiller_condenser == "WATERCOOLED") %>
+<% if (wc_option == "Reformulated") %>
 Chiller:Electric:ReformulatedEIR,
   <%= name %> Chiller <%= i %>,  !- Name
   Autosize,                !- Reference Capacity {W}
@@ -535,7 +553,12 @@ Chiller:Electric:ReformulatedEIR,
   Autosize,                !- Reference Condenser Water Flow Rate {m3/s}
   <%= name %> Chiller Cap Curve,  !- Cooling Capacity Function of Temperature Curve Name
   <%= name %> Chiller EIR Curve,  !- Electric Input to Cooling Output Ratio Function of Temperature Curve Name
+  !Behzad Rizi - 2024-06-17 - Changed LeavingCondenserWaterTemperature to Lift 
+<% if (chiller_plr_curve == "ChillerPartLoadWithLift") %>
+  Lift,  !- Electric Input to Cooling Output Ratio Function of Part Load Ratio Curve Type
+<% else %>
   LeavingCondenserWaterTemperature,  !- Electric Input to Cooling Output Ratio Function of Part Load Ratio Curve Type
+<% end %>
   <%= name %> Chiller PLR Curve,  !- Electric Input to Cooling Output Ratio Function of Part Load Ratio Curve Name
   0.1,                    !- Minimum Part Load Ratio {}
   1.0,                     !- Maximum Part Load Ratio {}
@@ -560,8 +583,50 @@ Branch,
   <%= name %> Chiller <%= i %>,   !- Component 1 Name
   <%= name %> Chiller <%= i %> Water Inlet Node,  !- Component 1 Inlet Node Name
   <%= name %> Chiller <%= i %> Water Outlet Node;  !- Component 1 Outlet Node Name
+  
+  <% else %>
+# if cw_option is "EIR"
+Chiller:Electric:EIR,
+  <%= name %> Chiller <%= i %>,  !- Name
+  Autosize,                !- Reference Capacity {W}
+  <%= chiller_cop %>,  !- Reference COP {}
+  <%= chw_temp_ref %>,                    !- Reference Leaving Chilled Water Temperature {C}
+  <%= cw_temp_ref %>,                    !- Reference Leaving Condenser Water Temperature {C}
+  <%= design_flow %>,  !- Reference Chilled Water Flow Rate {m3/s}
+  Autosize,                !- Reference Condenser Fluid Flow Rate {m3/s}
+  <%= name %> Chiller Cap Curve,  !- Cooling Capacity Function of Temperature Curve Name
+  <%= name %> Chiller EIR Curve,  !- Electric Input to Cooling Output Ratio Function of Temperature Curve Name
+  <%= name %> Chiller PLR Curve,  !- Electric Input to Cooling Output Ratio Function of Part Load Ratio Curve Name
+  0.15,                    !- Minimum Part Load Ratio {}
+  1.0,                     !- Maximum Part Load Ratio {}
+  0.8,                     !- Optimum Part Load Ratio {}
+  0.15,                    !- Minimum Unloading Ratio {}
+  <%= name %> Chiller <%= i %> Inlet Node,  !- Chilled Water Inlet Node Name
+  <%= name %> Supply Equipment Outlet Node <%= i %>,  !- Chilled Water Outlet Node Name
+  <%= name %> Chiller <%= i %> Water Inlet Node,  !- Condenser Inlet Node Name
+  <%= name %> Chiller <%= i %> Water Outlet Node,                        !- Condenser Outlet Node Name
+  WaterCooled,     !- Condenser Type
+  ,                        !- Condenser Fan Power Ratio {W/W}
+  1.0,                     !- Fraction of Compressor Electric Consumption Rejected by Condenser {}
+  2.0,                     !- Leaving Chilled Water Lower Temperature Limit {C}
+  <%= chiller_flow_mode %>,  !- Chiller Flow Mode
+  0.0,                     !- Design Heat Recovery Water Flow Rate {m3/s}
+  ,                        !- Heat Recovery Inlet Node Name
+  ,                        !- Heat Recovery Outlet Node Name
+  <%= chiller_sizing %>;  !- Sizing Factor
+  
+Branch,
+  <%= name %> <%= i %> HR Demand Branch,  !- Name
+  ,                        !- Pressure Drop Curve Name
+  Chiller:Electric:EIR,    !- Component 1 Object Type
+  <%= name %> Chiller <%= i %>,   !- Component 1 Name
+  <%= name %> Chiller <%= i %> Water Inlet Node,  !- Component 1 Inlet Node Name
+  <%= name %> Chiller <%= i %> Water Outlet Node;  !- Component 1 Outlet Node Name
+  
+  <% end %>
 
 <% else %>
+! If chiller condenser is aircooled 
 Chiller:Electric:EIR,
   <%= name %> Chiller <%= i %>,  !- Name
   Autosize,                !- Reference Capacity {W}
@@ -595,7 +660,6 @@ Chiller:Electric:EIR,
   ,                        !- Heat Recovery Outlet Node Name
   <%= chiller_sizing %>;  !- Sizing Factor
 
-
 OutdoorAir:Node,
   <%= name %> Chiller <%= i %> Condenser Inlet Node;    !- Name
 
@@ -1913,6 +1977,188 @@ Curve:Bicubic,
   36.52,                   !- Maximum Value of x
   0.19,                    !- Minimum Value of y
   1.03;                    !- Maximum Value of y
+  
+! Solaris(Behzad S. Rizi) - 2024-08-09 Added water-cooled centrifugal chiller performance curves as the basecase >>> ElectricEIRChiller Carrier 19XR 1234kW/5.39COP/VSD
+<% elsif (chiller_model == "WC Cent Carrier 19XR 1234kW/5.39COP/VSD") %>
+
+Curve:Biquadratic,
+    <%= name %> Chiller Cap Curve,  !- Name
+    5.905815E-01,            !- Coefficient1 Constant
+    1.190927E-01,            !- Coefficient2 x
+    -6.727309E-03,           !- Coefficient3 x**2
+    -9.580836E-03,           !- Coefficient4 y
+    -3.034704E-04,           !- Coefficient5 y**2
+    1.540686E-03,            !- Coefficient6 x*y
+    7.22,                    !- Minimum Value of x
+    12.78,                   !- Maximum Value of x
+    12.78,                   !- Minimum Value of y
+    26.67;                   !- Maximum Value of y
+	
+Curve:Biquadratic,
+    <%= name %> Chiller EIR Curve,  !- Name
+    3.771659E-01,            !- Coefficient1 Constant
+    1.144965E-01,            !- Coefficient2 x
+    -8.186893E-03,           !- Coefficient3 x**2
+    -3.372584E-03,           !- Coefficient4 y
+    1.689440E-04,            !- Coefficient5 y**2
+    1.008523E-03,            !- Coefficient6 x*y
+    7.22,                    !- Minimum Value of x
+    12.78,                   !- Maximum Value of x
+    12.78,                   !- Minimum Value of y
+    26.67;                   !- Maximum Value of y
+	
+ Curve:Quadratic,
+    <%= name %> Chiller PLR Curve,  !- Name
+    1.495681E-01,            !- Coefficient1 Constant
+    -1.449639E-01,           !- Coefficient2 x
+    9.941070E-01,            !- Coefficient3 x**2
+    0.19,                    !- Minimum Value of x
+    1.02;                    !- Maximum Value of x 
+
+! Solaris(Behzad S. Rizi) - 2024-08-22 Added water-cooled centrifugal chiller performance curves as the basecase >>> ReformEIRChiller Carrier 19XR 1234kW/5.39COP/VSD
+<% elsif (chiller_model == "ReformEIRChiller WC Cent Carrier 19XR 1234kW/5.39COP/VSD") %>
+
+  Curve:Biquadratic,
+    <%= name %> Chiller Cap Curve,  !- Name
+    6.134255E-01,            !- Coefficient1 Constant
+    1.092476E-01,            !- Coefficient2 x
+    -7.352739E-03,           !- Coefficient3 x**2
+    -2.589985E-03,           !- Coefficient4 y
+    -3.793512E-04,           !- Coefficient5 y**2
+    1.839978E-03,            !- Coefficient6 x*y
+    7.22,                    !- Minimum Value of x
+    12.78,                   !- Maximum Value of x
+    22.24,                   !- Minimum Value of y
+    36.28;                   !- Maximum Value of y
+
+!
+! Energy Input to Cooling Output Ratio Function of Temperature Curve
+! x = Leaving Chilled Water Temperature and y = Leaving Condenser Water Temperature
+
+  Curve:Biquadratic,
+    <%= name %> Chiller EIR Curve,  !- Name
+    4.746375E-01,            !- Coefficient1 Constant
+    9.120326E-02,            !- Coefficient2 x
+    -7.295060E-03,           !- Coefficient3 x**2
+    -5.662273E-03,           !- Coefficient4 y
+    1.928027E-04,            !- Coefficient5 y**2
+    8.244779E-04,            !- Coefficient6 x*y
+    7.22,                    !- Minimum Value of x
+    12.78,                   !- Maximum Value of x
+    22.24,                   !- Minimum Value of y
+    36.28;                   !- Maximum Value of y
+
+!
+! Energy Input to Cooling Output Ratio Function of Part Load Ratio Curve
+! x = Leaving Condenser Water Temperature and y = Part Load Ratio (load/capacity)
+
+  Curve:Bicubic,
+    <%= name %> Chiller PLR Curve,  !- Name
+    1.207212E-01,            !- Coefficient1 Constant
+    -9.914826E-03,           !- Coefficient2 x
+    1.854918E-05,            !- Coefficient3 x**2
+    9.880331E-01,            !- Coefficient4 y
+    -8.955866E-01,           !- Coefficient5 y**2
+    8.894574E-03,            !- Coefficient6 x*y
+    0.000000E+00,            !- Coefficient7 x**3
+    8.005552E-01,            !- Coefficient8 y**3
+    0.000000E+00,            !- Coefficient9 x**2*y
+    0.000000E+00,            !- Coefficient10 x*y**2
+    14.38,                   !- Minimum Value of x
+    34.99,                   !- Maximum Value of x
+    0.19,                    !- Minimum Value of y
+    1.02;                    !- Maximum Value of y
+
+! Solaris(Behzad S. Rizi) - 2024-08-09 Added water-cooled screw chiller performance curves as the basecase 	>>> ElectricEIRChiller Trane RTHB 1051kW/5.05COP/Valve
+<% elsif (chiller_model == "Screw WC Trane RTHB 1051kW/5.05COP/Valve") %>
+
+Curve:Biquadratic,
+    <%= name %> Chiller Cap Curve,  !- Name
+    9.482157E-01,            !- Coefficient1 Constant
+    3.306737E-02,            !- Coefficient2 x
+    -6.450072E-05,           !- Coefficient3 x**2
+    -3.756522E-03,           !- Coefficient4 y
+    -6.501672E-05,           !- Coefficient5 y**2
+    2.517986E-15,            !- Coefficient6 x*y
+    4.44,                    !- Minimum Value of x
+    8.89,                    !- Maximum Value of x
+    23.89,                   !- Minimum Value of y
+    35.00;                   !- Maximum Value of y
+
+Curve:Biquadratic,
+    <%= name %> Chiller EIR Curve,  !- Name
+    4.904181E-01,            !- Coefficient1 Constant
+    -5.530317E-03,           !- Coefficient2 x
+    1.209907E-03,            !- Coefficient3 x**2
+    9.122333E-03,            !- Coefficient4 y
+    5.923591E-04,            !- Coefficient5 y**2
+    -1.469958E-03,           !- Coefficient6 x*y
+    4.44,                    !- Minimum Value of x
+    8.89,                    !- Maximum Value of x
+    23.89,                   !- Minimum Value of y
+    35.00;                   !- Maximum Value of y
+	
+Curve:Quadratic,
+    <%= name %> Chiller PLR Curve,  !- Name
+    2.590465E-01,            !- Coefficient1 Constant
+    2.148987E-01,            !- Coefficient2 x
+    5.265039E-01,            !- Coefficient3 x**2
+    0.20,                    !- Minimum Value of x
+    1.01;                    !- Maximum Value of x
+
+! Solaris(Behzad S. Rizi) - 2024-08-22 Added water-cooled screw chiller performance curves as the basecase 	>>> ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve
+<% elsif (chiller_model == "ReformEIRChiller Screw WC Carrier 23XL 1062kW/5.50COP/Valve") %>
+
+Curve:Biquadratic,
+    <%= name %> Chiller Cap Curve,  !- Name
+    1.054485E+00,            !- Coefficient1 Constant
+    1.015650E-02,            !- Coefficient2 x
+    -4.899041E-03,           !- Coefficient3 x**2
+    -3.792726E-03,           !- Coefficient4 y
+    -3.699876E-04,           !- Coefficient5 y**2
+    2.891276E-03,            !- Coefficient6 x*y
+    6.67,                    !- Minimum Value of x
+    10.00,                   !- Maximum Value of x
+    26.44,                   !- Minimum Value of y
+    35.10;                   !- Maximum Value of y
+
+!
+! Energy Input to Cooling Output Ratio Function of Temperature Curve
+! x = Leaving Chilled Water Temperature and y = Leaving Condenser Water Temperature
+
+  Curve:Biquadratic,
+    <%= name %> Chiller EIR Curve,  !- Name
+    1.369592E-01,            !- Coefficient1 Constant
+    -5.681693E-03,           !- Coefficient2 x
+    2.795150E-04,            !- Coefficient3 x**2
+    2.407603E-02,            !- Coefficient4 y
+    2.142516E-04,            !- Coefficient5 y**2
+    -8.850727E-04,           !- Coefficient6 x*y
+    6.67,                    !- Minimum Value of x
+    10.00,                   !- Maximum Value of x
+    26.44,                   !- Minimum Value of y
+    35.10;                   !- Maximum Value of y
+
+!
+! Energy Input to Cooling Output Ratio Function of Part Load Ratio Curve
+! x = Leaving Condenser Water Temperature and y = Part Load Ratio (load/capacity)
+
+  Curve:Bicubic,
+    <%= name %> Chiller PLR Curve,  !- Name
+    1.385765E+00,            !- Coefficient1 Constant
+    -3.549685E-02,           !- Coefficient2 x
+    -4.110930E-06,           !- Coefficient3 x**2
+    -7.678018E-01,           !- Coefficient4 y
+    7.228808E-01,            !- Coefficient5 y**2
+    3.573245E-02,            !- Coefficient6 x*y
+    0.000000E+00,            !- Coefficient7 x**3
+    -3.442173E-01,           !- Coefficient8 y**3
+    0.000000E+00,            !- Coefficient9 x**2*y
+    0.000000E+00,            !- Coefficient10 x*y**2
+    30.60,                   !- Minimum Value of x
+    34.70,                   !- Maximum Value of x
+    0.20,                    !- Minimum Value of y
+    1.01;                    !- Maximum Value of y
 
 <% elsif (chiller_model == "WC PD 2010 B") %>
 
@@ -2004,6 +2250,126 @@ Curve:Bicubic,
   0.19,                    !- Minimum Value of y
   1.03;                    !- Maximum Value of y
 
+! Solaris - 2024-06-12 Added water-cooled chiller performance curves(Chiller:Electric:ReformulatedEIR) 
+! Model 7 performance curves for 12% Path B PLE improvement
+<% elsif (chiller_model == "Model 7 WC Chiller") %>
+Curve:Biquadratic,
+  <%= name %> Chiller Cap Curve,  !- Name
+  0.989616849,             !- Coefficient1 Constant
+  0.029621942,              !- Coefficient2 x
+  0.000137363,            !- Coefficient3 x**2
+  -0.007781822,             !- Coefficient4 y
+  0.000103918,            !- Coefficient5 y**2
+  -0.00020792,            !- Coefficient6 x*y
+  0,                       !- Minimum Value of x
+  100,                     !- Maximum Value of x
+  0,                       !- Minimum Value of y
+  100,                     !- Maximum Value of y
+  0,                       !- Minimum Curve Output
+  1.5;                     !- Maximum Curve Output
+
+Curve:Biquadratic,
+  <%= name %> Chiller EIR Curve,  !- Name
+  0.544578782,             !- Coefficient1 Constant
+  -0.011128038,            !- Coefficient2 x
+  0.00061257,             !- Coefficient3 x**2
+  0.000848405,            !- Coefficient4 y
+  0.0005857,             !- Coefficient5 y**2
+  -0.000966413,            !- Coefficient6 x*y
+  0,                       !- Minimum Value of x
+  100,                     !- Maximum Value of x
+  0,                       !- Minimum Value of y
+  100,                     !- Maximum Value of y
+  0,                       !- Minimum Curve Output
+  1.5;                     !- Maximum Curve Output
+	  	  
+Curve:ChillerPartLoadWithLift,
+  <%= name %> Chiller PLR Curve,    !- Name
+  0.162615058,             !- Coefficient1 C1
+  -0.843913483,            !- Coefficient2 C2 
+  0.283449427,             !- Coefficient3 C3 
+  -0.078715236,             !- Coefficient4 C4 
+  0.394265877,            !- Coefficient5 C5 
+  1.100071665,             !- Coefficient6 C6
+  0.000000E+00,            !- Coefficient7 C7
+  0.000000E+00,             !- Coefficient8 C8
+  0.000000E+00,            !- Coefficient9 C9
+  0.000000E+00,            !- Coefficient10 C10
+  0.000000E+00,            !- Coefficient11 C11
+  0.000000E+00,            !- Coefficient12 C12
+  0.36,                  !- Minimum Value of x
+  1.08,                  !- Maximum Value of x
+  0.1,                     !- Minimum Value of y
+  1,                       !- Maximum Value of y
+  -0.035,                  !- Minimum Value of z
+  0.3144,                  !- Maximum Value of z
+  ,                        !- Minimum Curve Output
+  ,                        !- Maximum Curve Output
+  Dimensionless,           !- Input Unit Type for x
+  Dimensionless,           !- Input Unit Type for y
+  Dimensionless,           !- Input Unit Type for z
+  Dimensionless;           !- Output Unit Type
+
+! Solaris - 2024-06-12 Added water-cooled chiller performance curves(Chiller:Electric:ReformulatedEIR)
+! Model 9 performance curves for 17% Path B PLE improvement
+<% elsif (chiller_model == "Model 9 WC Chiller") %>
+Curve:Biquadratic,
+  <%= name %> Chiller Cap Curve,  !- Name
+  1.833870,             !- Coefficient1 Constant
+  -0.018299,              !- Coefficient2 x
+  0.004437,            !- Coefficient3 x**2
+  -0.054290,             !- Coefficient4 y
+  0.000876,            !- Coefficient5 y**2
+  -0.000356,            !- Coefficient6 x*y
+  0,                       !- Minimum Value of x
+  100,                     !- Maximum Value of x
+  0,                       !- Minimum Value of y
+  100,                     !- Maximum Value of y
+  0,                       !- Minimum Curve Output
+  1.5;                     !- Maximum Curve Output
+
+Curve:Biquadratic,
+  <%= name %> Chiller EIR Curve,  !- Name
+  1.097221,             !- Coefficient1 Constant
+  -0.013698,            !- Coefficient2 x
+  0.001890,             !- Coefficient3 x**2
+  -0.031726,            !- Coefficient4 y
+  0.001072,             !- Coefficient5 y**2
+  -0.001329,            !- Coefficient6 x*y
+  0,                       !- Minimum Value of x
+  100,                     !- Maximum Value of x
+  0,                       !- Minimum Value of y
+  100,                     !- Maximum Value of y
+  0,                       !- Minimum Curve Output
+  1.5;                     !- Maximum Curve Output
+	  
+Curve:ChillerPartLoadWithLift,
+  <%= name %> Chiller PLR Curve,    !- Name
+  0.087760714,             !- Coefficient1 C1
+  -0.214192565,            !- Coefficient2 C2 
+  0.277130448,             !- Coefficient3 C3 
+  -0.111975778,             !- Coefficient4 C4 
+  0.31630787,            !- Coefficient5 C5 
+  0.629734788,             !- Coefficient6 C6 
+  0.000000E+00,            !- Coefficient7 C7
+  0.000000E+00,             !- Coefficient8 C8
+  0.000000E+00,            !- Coefficient9 C9
+  0.000000E+00,            !- Coefficient10 C10
+  0.000000E+00,            !- Coefficient11 C11
+  0.000000E+00,            !- Coefficient12 C12
+  0.35,                  !- Minimum Value of x
+  1.08,                  !- Maximum Value of x
+  0.1,                     !- Minimum Value of y
+  1,                       !- Maximum Value of y
+  -0.035,                  !- Minimum Value of z
+  0.3144,                  !- Maximum Value of z
+  ,                        !- Minimum Curve Output
+  ,                        !- Maximum Curve Output
+  Dimensionless,           !- Input Unit Type for x
+  Dimensionless,           !- Input Unit Type for y
+  Dimensionless,           !- Input Unit Type for z
+  Dimensionless;           !- Output Unit Type
+
 <% elsif (chiller_model == "WC PD 2010 A Large") %>
 
 Curve:Biquadratic,