Merge pull request #2113 from NREL/SAM_2105_use_detailed_batt_w_pvwatts

Sam 2105 use detailed batt w pvwatts

Author: brtietz

…/Battwatts_PVWattsBatteryCommercial.json …attsBatteryAllEquityPartnershipFlip.jsonapi/api_autogen/library/defaults/Battwatts_PVWattsBatteryCommercial.json renamed to api/api_autogen/library/defaults/Battery_PVWattsBatteryAllEquityPartnershipFlip.json api/api_autogen/library/defaults/Battwatts_PVWattsBatteryCommercial.json renamed to api/api_autogen/library/defaults/Battery_PVWattsBatteryAllEquityPartnershipFlip.json

@@ -17,13 +17,13 @@
 			"system_capacity": 540
 		},
 		"SystemCosts": {
-			"om_capacity": [59.380000],
+			"om_capacity": [22.000000],
 			"om_capacity_escal": 0,
 			"om_fixed": [0.000000],
 			"om_fixed_escal": 0,
 			"om_production": [0.000000],
 			"om_production_escal": 0,
-			"total_installed_cost": 1.44459e+06
+			"total_installed_cost": 9.96066e+08
 		},
 		"LandLease": {
 		},
@@ -148,7 +148,13 @@
 			"pbi_uti_term": 0
 		},
 		"BatterySystem": {
-			"battery_per_kWh": 184
+			"batt_computed_bank_capacity": 1200.54,
+			"batt_replacement_option": 1,
+			"batt_replacement_schedule_percent": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
+			"battery_per_kWh": 184,
+			"en_batt": 1,
+			"en_standalone_batt": 0,
+			"en_wave_batt": 0
 		},
 		"FuelCell": {
 		},
@@ -172,15 +178,15 @@
 		},
 		"SystemOutput": {
 			"annual_energy_value": [0],
-			"degradation": [0.500000],
+			"degradation": [0.000000],
 			"gen": [0]
 		},
 		"Lifetime": {
-			"system_use_lifetime_output": 0
+			"system_use_lifetime_output": 1
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 518341
+			"battery_total_cost_lcos": 4.35341e+07
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]