Merge branch 'hybrids' into carbonFreeDispatch

api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json

@@ -69,7 +69,7 @@
 			"batt_chem": 1,
 			"batt_h_to_ambient": 500,
 			"batt_initial_SOC": 50,
-			"batt_life_model": 1,
+			"batt_life_model": 0,
 			"batt_lifetime_matrix": [
 				[20.000000, 0.000000, 100.000000],
 				[20.000000, 5000.000000, 80.000000],

api/api_autogen/library/defaults/Cashloan_FuelCellCommercial.json

@@ -37,7 +37,7 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 2.53018e+06
+			"total_installed_cost": 2.93647e+06
 		},
 		"LandLease": {
 		},
@@ -204,7 +204,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 0
+			"battery_total_cost_lcos": 406288
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]

api/api_autogen/library/defaults/Singleowner_FuelCellSingleOwner.json

@@ -40,7 +40,7 @@
 		},
 		"FinancialParameters": {
 			"analysis_period": 30,
-			"construction_financing_cost": 2.00575e+06,
+			"construction_financing_cost": 3.60261e+06,
 			"cost_debt_closing": 450000,
 			"cost_debt_fee": 2.75,
 			"cost_other_financing": 0,
@@ -97,7 +97,7 @@
 			"om_production": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 1.06973e+08
+			"total_installed_cost": 1.92139e+08
 		},
 		"LandLease": {
 			"land_area": 650.278,
@@ -302,7 +302,7 @@
 		},
 		"LCOS": {
 			"batt_salvage_percentage": 0,
-			"battery_total_cost_lcos": 0
+			"battery_total_cost_lcos": 8.51662e+07
 		},
 		"ChargesByMonth": {
 		},

deploy/runtime/defaults/Fuel Cell_Commercial.json

@@ -17888,17 +17888,17 @@
         ]
     ],
     "batt_volume": 2.39443,
-    "battery_energy": 0.0,
-    "battery_energy_kwh": 0.0,
+    "battery_energy": 1200.21,
+    "battery_energy_kwh": 1200.21,
     "battery_losses_shown": 0.0,
     "battery_per_kW": 405.56,
     "battery_per_kWh": 225.06,
-    "battery_power": 0.0,
-    "battery_power_kw": 0.0,
+    "battery_power": 288.05,
+    "battery_power_kw": 288.05,
     "battery_replacements_shown": 0.0,
     "battery_thermal_shown": 0.0,
-    "battery_total": 0.0,
-    "battery_total_cost_lcos": 0.0,
+    "battery_total": 386941.0,
+    "battery_total_cost_lcos": 406288.0,
     "battery_voltage_shown": 0.0,
     "bifaciality": 0.0,
     "bos_equip_battperkw": 0.0,
@@ -17964,7 +17964,7 @@
             0.65
         ]
     ],
-    "capex_table_batt_cost_per_kw": 2167.38,
+    "capex_table_batt_cost_per_kw": 708.18,
     "capex_table_batt_cost_per_kwh": 0.0,
     "capex_table_batt_inputs": [
         [
@@ -18058,7 +18058,7 @@
         ]
     ],
     "capex_table_total_installed_ac_cost": 0.0,
-    "capex_table_total_installed_batt_cost": 0.0,
+    "capex_table_total_installed_batt_cost": 849964.0,
     "capex_table_total_installed_dc_cost": 0.0,
     "capex_table_total_installed_fuelcell_cost": 0.0,
     "cbi_fed_amount": 0.0,
@@ -28212,7 +28212,7 @@
         1.0
     ],
     "elev": 358.0,
-    "en_batt": 0.0,
+    "en_batt": 1.0,
     "en_snowloss": 0.0,
     "en_user_spec_losses": 0.0,
     "enable_interconnection_limit": 0.0,
@@ -54769,7 +54769,7 @@
     "install_margin_perarea": 0.0,
     "install_margin_perwatt": 0.31,
     "install_margin_total": 66650.0,
-    "installed_per_capacity": 11.7683,
+    "installed_per_capacity": 13.658,
     "insurance_rate": 0.0,
     "inv_eff": 96.0,
     "inverter_costunits": 1.0,
@@ -72499,7 +72499,7 @@
     "permitting_total": 6450.0,
     "prop_tax_assessed_decline": 0.0,
     "prop_tax_cost_assessed_percent": 100.0,
-    "property_assessed_value": 2530180.0,
+    "property_assessed_value": 2936470.0,
     "property_tax_rate": 0.0,
     "ptc_fed_amount": [
         0.0
@@ -72545,7 +72545,7 @@
     "run_resiliency_calcs": 0.0,
     "sales_tax_percent": 100.0,
     "sales_tax_rate": 5.0,
-    "sales_tax_total": 115059.0,
+    "sales_tax_total": 134406.0,
     "sales_tax_value": 5.0,
     "salvage_percentage": 0.0,
     "salvage_value": 0.0,
@@ -72604,7 +72604,7 @@
     ],
     "station_id": "78208",
     "step": 3600.0,
-    "subtotal_direct": 2292400.0,
+    "subtotal_direct": 2679340.0,
     "system_capacity": 215.0,
     "system_use_lifetime_output": 1.0,
     "thermal_1": 493721.0,
@@ -125234,9 +125234,9 @@
     ],
     "tilt": 20.0,
     "total_battery_indirect_cost": 0.0,
-    "total_direct_cost": 2301170.0,
+    "total_direct_cost": 2688110.0,
     "total_indirect_cost": 113950.0,
-    "total_installed_cost": 2530180.0,
+    "total_installed_cost": 2936470.0,
     "total_land_area": 1.39886,
     "total_module_area": 1131.58,
     "total_system_indirect_cost": 113950.0,
@@ -125256,8 +125256,8 @@
     "ui_land_area_additional": 0.0,
     "ui_land_area_additional_units": 0.0,
     "ui_land_area_per_mw": 0.0,
-    "ui_loan_amount": 2530180.0,
-    "ui_net_capital_cost": 2530180.0,
+    "ui_loan_amount": 2936470.0,
+    "ui_net_capital_cost": 2936470.0,
     "ui_pv_capacity": 215.0,
     "ui_step_minutes": 60.0,
     "ui_total_land_area_ha": 0.5661,

deploy/runtime/defaults/Fuel Cell_Single Owner.json

@@ -188,7 +188,7 @@
     "batt_h_to_ambient": 500.0,
     "batt_initial_SOC": 50.0,
     "batt_inverter_efficiency_cutoff": 90.0,
-    "batt_life_model": 1.0,
+    "batt_life_model": 0.0,
     "batt_lifetime_matrix": [
         [
             20.0,
@@ -9112,17 +9112,17 @@
         ]
     ],
     "batt_volume": 478.803,
-    "battery_energy": 0.0,
-    "battery_energy_kwh": 0.0,
+    "battery_energy": 240000.0,
+    "battery_energy_kwh": 240000.0,
     "battery_losses_shown": 0.0,
     "battery_per_kW": 233.17,
     "battery_per_kWh": 282.0,
-    "battery_power": 0.0,
-    "battery_power_kw": 0.0,
+    "battery_power": 57600.1,
+    "battery_power_kw": 57600.1,
     "battery_replacements_shown": 0.0,
     "battery_thermal_shown": 0.0,
-    "battery_total": 0.0,
-    "battery_total_cost_lcos": 0.0,
+    "battery_total": 81110700.0,
+    "battery_total_cost_lcos": 85166200.0,
     "battery_voltage_shown": 0.0,
     "bifaciality": 0.0,
     "bos_equip_battperkw": 0.0,
@@ -9188,7 +9188,7 @@
             0.65
         ]
     ],
-    "capex_table_batt_cost_per_kw": 0.0,
+    "capex_table_batt_cost_per_kw": 469.01,
     "capex_table_batt_cost_per_kwh": 0.0,
     "capex_table_batt_inputs": [
         [
@@ -9282,7 +9282,7 @@
         ]
     ],
     "capex_table_total_installed_ac_cost": 0.0,
-    "capex_table_total_installed_batt_cost": 0.0,
+    "capex_table_total_installed_batt_cost": 112563000.0,
     "capex_table_total_installed_dc_cost": 0.0,
     "capex_table_total_installed_fuelcell_cost": 0.0,
     "cbi_fed_amount": 0.0,
@@ -9312,7 +9312,7 @@
     "chk_update_peaks": 1.0,
     "city": "-",
     "compute_as_cube": 0.0,
-    "const_per_interest1": 936014.0,
+    "const_per_interest1": 1681220.0,
     "const_per_interest2": 0.0,
     "const_per_interest3": 0.0,
     "const_per_interest4": 0.0,
@@ -9322,7 +9322,7 @@
     "const_per_interest_rate3": 0.0,
     "const_per_interest_rate4": 0.0,
     "const_per_interest_rate5": 0.0,
-    "const_per_interest_total": 936014.0,
+    "const_per_interest_total": 1681220.0,
     "const_per_months1": 6.0,
     "const_per_months2": 0.0,
     "const_per_months3": 0.0,
@@ -9339,13 +9339,13 @@
     "const_per_percent4": 0.0,
     "const_per_percent5": 0.0,
     "const_per_percent_total": 100.0,
-    "const_per_principal1": 106973000.0,
+    "const_per_principal1": 192139000.0,
     "const_per_principal2": 0.0,
     "const_per_principal3": 0.0,
     "const_per_principal4": 0.0,
     "const_per_principal5": 0.0,
-    "const_per_principal_total": 106973000.0,
-    "const_per_total1": 2005750.0,
+    "const_per_principal_total": 192139000.0,
+    "const_per_total1": 3602610.0,
     "const_per_total2": 0.0,
     "const_per_total3": 0.0,
     "const_per_total4": 0.0,
@@ -9355,7 +9355,7 @@
     "const_per_upfront_rate3": 0.0,
     "const_per_upfront_rate4": 0.0,
     "const_per_upfront_rate5": 0.0,
-    "construction_financing_cost": 2005750.0,
+    "construction_financing_cost": 3602610.0,
     "contingency": 0.0,
     "contingency_percent": 0.0,
     "cost_debt_closing": 450000.0,
@@ -20151,7 +20151,7 @@
     "dscr_maximum_debt_fraction": 100.0,
     "dscr_reserve_months": 0.0,
     "elev": 358.0,
-    "en_batt": 0.0,
+    "en_batt": 1.0,
     "en_electricity_rates": 0.0,
     "en_snowloss": 0.0,
     "en_user_spec_losses": 0.0,
@@ -46699,7 +46699,7 @@
     "install_margin_perarea": 0.0,
     "install_margin_perwatt": 0.12,
     "install_margin_total": 12000000.0,
-    "installed_per_capacity": 1.06973,
+    "installed_per_capacity": 1.92139,
     "insurance_rate": 0.0,
     "inv_eff": 96.0,
     "inverter_costunits": 0.0,
@@ -47521,7 +47521,7 @@
     "ppa_soln_mode": 1.0,
     "prop_tax_assessed_decline": 0.0,
     "prop_tax_cost_assessed_percent": 100.0,
-    "property_assessed_value": 106973000.0,
+    "property_assessed_value": 192139000.0,
     "property_tax_rate": 1.0,
     "ptc_fed_amount": [
         0.0
@@ -47570,7 +47570,7 @@
     "revenue_curtailment_is_shown": 0.0,
     "sales_tax_percent": 100.0,
     "sales_tax_rate": 5.0,
-    "sales_tax_total": 4665380.0,
+    "sales_tax_total": 8720920.0,
     "sales_tax_value": 5.0,
     "salvage_percentage": 0.0,
     "salvage_value": 0.0,
@@ -47631,7 +47631,7 @@
     ],
     "station_id": "78208",
     "step": 3600.0,
-    "subtotal_direct": 93307700.0,
+    "subtotal_direct": 174418000.0,
     "system_capacity": 100000.0,
     "system_use_lifetime_output": 1.0,
     "term_int_rate": 4.0,
@@ -82696,9 +82696,9 @@
     "tilt": 0.0,
     "tod_library": "Uniform Dispatch",
     "total_battery_indirect_cost": 0.0,
-    "total_direct_cost": 93307700.0,
+    "total_direct_cost": 174418000.0,
     "total_indirect_cost": 9000000.0,
-    "total_installed_cost": 106973000.0,
+    "total_installed_cost": 192139000.0,
     "total_land_area": 650.278,
     "total_module_area": 526316.0,
     "total_system_indirect_cost": 9000000.0,