Skip to content

Commit

Permalink
Merge branch 'develop' into SAM_1918
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjanzou
sjanzou committed Dec 6, 2024
2 parents fdd0fca + de92c63 commit 8e34a13
Show file tree
Hide file tree
Showing 308 changed files with 99,437 additions and 45,908 deletions.
6 changes: 3 additions & 3 deletions ...api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 60000.1,
"batt_power_discharge_max_kwac": 57600.1,
"batt_power_discharge_max_kwdc": 60000.1,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 18000,
Expand All @@ -49,7 +49,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 479617,
"batt_Qnom": 2,
Expand Down Expand Up @@ -336,7 +336,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [323.000000],
"om_batt_replacement_cost": [252.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
10 changes: 5 additions & 5 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 130.023,
"batt_power_discharge_max_kwac": 124.822,
"batt_power_discharge_max_kwdc": 130.023,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 90.0157,
Expand All @@ -55,7 +55,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 2398.5,
"batt_Qnom": 2,
Expand Down Expand Up @@ -300,9 +300,9 @@
"batt_target_power_monthly": [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
"dispatch_manual_btm_discharge_to_grid": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"dispatch_manual_charge": [1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"dispatch_manual_discharge": [0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"dispatch_manual_discharge": [0.000000, 1.000000, 1.000000, 1.000000, 0.000000, 0.000000],
"dispatch_manual_gridcharge": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"dispatch_manual_percent_discharge": [25.000000, 0.000000],
"dispatch_manual_percent_discharge": [25.000000, 25.000000, 25.000000, 0.000000],
"dispatch_manual_percent_gridcharge": [0.000000],
"dispatch_manual_sched": [
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 3.000000, 3.000000, 3.000000, 3.000000, 3.000000, 1.000000, 1.000000, 1.000000, 1.000000],
Expand Down Expand Up @@ -335,7 +335,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [225.060000],
"om_batt_replacement_cost": [184.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
10 changes: 5 additions & 5 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 130.023,
"batt_power_discharge_max_kwac": 124.822,
"batt_power_discharge_max_kwdc": 130.023,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 90.0157,
Expand All @@ -55,7 +55,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 2398.5,
"batt_Qnom": 2,
Expand Down Expand Up @@ -300,9 +300,9 @@
"batt_target_power_monthly": [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
"dispatch_manual_btm_discharge_to_grid": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"dispatch_manual_charge": [1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"dispatch_manual_discharge": [0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"dispatch_manual_discharge": [0.000000, 1.000000, 1.000000, 1.000000, 0.000000, 0.000000],
"dispatch_manual_gridcharge": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
"dispatch_manual_percent_discharge": [25.000000, 0.000000],
"dispatch_manual_percent_discharge": [25.000000, 25.000000, 25.000000, 0.000000],
"dispatch_manual_percent_gridcharge": [0.000000],
"dispatch_manual_sched": [
[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 3.000000, 3.000000, 3.000000, 3.000000, 3.000000, 1.000000, 1.000000, 1.000000, 1.000000],
Expand Down Expand Up @@ -335,7 +335,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [282.000000],
"om_batt_replacement_cost": [184.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
6 changes: 3 additions & 3 deletions ...api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 60000.1,
"batt_power_discharge_max_kwac": 57600.1,
"batt_power_discharge_max_kwdc": 60000.1,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 18000,
Expand All @@ -49,7 +49,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 479617,
"batt_Qnom": 2,
Expand Down Expand Up @@ -336,7 +336,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [323.000000],
"om_batt_replacement_cost": [252.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
6 changes: 3 additions & 3 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 60000.1,
"batt_power_discharge_max_kwac": 57600.1,
"batt_power_discharge_max_kwdc": 60000.1,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 18000,
Expand All @@ -49,7 +49,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 479617,
"batt_Qnom": 2,
Expand Down Expand Up @@ -336,7 +336,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [323.000000],
"om_batt_replacement_cost": [252.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
6 changes: 3 additions & 3 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 4.9896,
"batt_power_discharge_max_kwac": 4.79002,
"batt_power_discharge_max_kwdc": 4.9896,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 1.7098,
Expand All @@ -55,7 +55,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 247.5,
"batt_Qnom": 2,
Expand Down Expand Up @@ -335,7 +335,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [273.520000],
"om_batt_replacement_cost": [434.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
6 changes: 3 additions & 3 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatterySaleLeaseback.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 60000.1,
"batt_power_discharge_max_kwac": 57600.1,
"batt_power_discharge_max_kwdc": 60000.1,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 18000,
Expand All @@ -49,7 +49,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 479617,
"batt_Qnom": 2,
Expand Down Expand Up @@ -336,7 +336,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [323.000000],
"om_batt_replacement_cost": [252.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
6 changes: 3 additions & 3 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatterySingleOwner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 60000.1,
"batt_power_discharge_max_kwac": 57600.1,
"batt_power_discharge_max_kwdc": 60000.1,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 18000,
Expand All @@ -49,7 +49,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 479617,
"batt_Qnom": 2,
Expand Down Expand Up @@ -336,7 +336,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [0.000000],
"om_batt_replacement_cost": [252.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryThirdParty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"batt_power_charge_max_kwdc": 2.81475,
"batt_power_discharge_max_kwac": 2.70216,
"batt_power_discharge_max_kwdc": 2.81475,
"batt_replacement_capacity": 50,
"batt_replacement_capacity": 70,
"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],
"batt_surface_area": 1.00598,
Expand All @@ -55,7 +55,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 11.25,
"batt_Qnom": 2,
Expand Down
8 changes: 4 additions & 4 deletions ...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"batt_power_charge_max_kwdc": 300.052,
"batt_power_discharge_max_kwac": 288.05,
"batt_power_discharge_max_kwdc": 300.052,
"batt_replacement_capacity": 0,
"batt_replacement_capacity": 70,
"batt_replacement_option": 1,
"batt_replacement_schedule_percent": [0.000000],
"batt_surface_area": 90.0157,
Expand Down Expand Up @@ -334,7 +334,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [225.060000],
"om_batt_replacement_cost": [184.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down Expand Up @@ -386,12 +386,12 @@
},
"HybridCosts": {
"add_om_num_types": 1,
"om_batt_capacity_cost": [6.280000],
"om_batt_capacity_cost": [5.250000],
"om_batt_fixed_cost": [0.000000],
"om_batt_nameplate": 1200.21,
"om_capacity_escal": 0,
"om_fixed_escal": 0,
"total_installed_cost": 391808
"total_installed_cost": 420973
}
}
}
10 changes: 5 additions & 5 deletions ...library/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"batt_power_charge_max_kwdc": 60000.1,
"batt_power_discharge_max_kwac": 57600.1,
"batt_power_discharge_max_kwdc": 60000.1,
"batt_replacement_capacity": 0,
"batt_replacement_capacity": 70,
"batt_replacement_option": 1,
"batt_replacement_schedule_percent": [0.000000],
"batt_surface_area": 18000,
Expand All @@ -46,7 +46,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 479617,
"batt_Qnom": 2,
Expand Down Expand Up @@ -338,7 +338,7 @@
"dispatch_manual_system_charge_first": 0
},
"SystemCosts": {
"om_batt_replacement_cost": [323.000000],
"om_batt_replacement_cost": [252.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down Expand Up @@ -390,12 +390,12 @@
},
"HybridCosts": {
"add_om_num_types": 1,
"om_batt_capacity_cost": [5.300000],
"om_batt_capacity_cost": [7.250000],
"om_batt_fixed_cost": [0.000000],
"om_batt_nameplate": 240000,
"om_capacity_escal": 0,
"om_fixed_escal": 0,
"total_installed_cost": 9.9152e+07
"total_installed_cost": 7.44601e+07
}
}
}
6 changes: 3 additions & 3 deletions api/api_autogen/library/defaults/Battery_FuelCellCommercial.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions api/api_autogen/library/defaults/Battery_PVWattsWindBatteryHybridHostDeveloper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"batt_power_charge_max_kwdc": 300.052,
"batt_power_discharge_max_kwac": 288.05,
"batt_power_discharge_max_kwdc": 300.052,
"batt_replacement_capacity": 0,
"batt_replacement_capacity": 70,
"batt_replacement_option": 1,
"batt_replacement_schedule_percent": [0.000000],
"batt_surface_area": 90.0157,
Expand All @@ -50,7 +50,7 @@
"LeadAcid_tn": 1,
"batt_C_rate": 0.2,
"batt_Cp": 1500,
"batt_Qexp": 0.04,
"batt_Qexp": 0.0400001,
"batt_Qfull": 2.25,
"batt_Qfull_flow": 2398.5,
"batt_Qnom": 2,
Expand Down Expand Up @@ -334,7 +334,7 @@
"dispatch_manual_system_charge_first": 1
},
"SystemCosts": {
"om_batt_replacement_cost": [225.060000],
"om_batt_replacement_cost": [184.000000],
"om_batt_variable_cost": [0.000000],
"om_production_escal": 0,
"om_replacement_cost_escal": 0
Expand Down Expand Up @@ -386,12 +386,12 @@
},
"HybridCosts": {
"add_om_num_types": 1,
"om_batt_capacity_cost": [6.280000],
"om_batt_capacity_cost": [5.250000],
"om_batt_fixed_cost": [0.000000],
"om_batt_nameplate": 1200.21,
"om_capacity_escal": 0,
"om_fixed_escal": 0,
"total_installed_cost": 391808
"total_installed_cost": 420973
}
}
}
Loading

0 comments on commit 8e34a13

Please sign in to comment.