Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/NREL/SAM into 2023_defau…
Browse files Browse the repository at this point in the history 
…lts_updates
  • Loading branch information
@brtietz
brtietz committed Nov 16, 2023
2 parents 9259b67 + db0ceb5 commit f48dd87
Show file tree
Hide file tree
Showing 25 changed files with 291 additions and 64 deletions.
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Host Developer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@
"sales_tax_total": 0.0,
"sizing_warning": 0.0,
"specify_label": 0.0,
"step": 0.0,
"system_capacity": 100.0,
"system_use_lifetime_output": 0.0,
"total_installed_cost": 456073.0,
Expand All @@ -409,6 +410,7 @@
"turbine_cost_per_kw": 2732.4,
"turbine_cost_per_turbine": 0.0,
"turbine_cost_total": 359773.0,
"ui_step_minutes": 0.0,
"use_specific_wf_wind": 0.0,
"user_specified_wf_wind": " ",
"wake_ext_loss": 1.1,
Expand Down
43 changes: 36 additions & 7 deletions deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@
"sales_tax_total": 0.0,
"sizing_warning": 0.0,
"specify_label": 1.0,
"step": 0.0,
"system_capacity": 200000.0,
"system_use_lifetime_output": 0.0,
"total_installed_cost": 299792000.0,
Expand All @@ -403,6 +404,7 @@
"turbine_cost_per_kw": 1112.4,
"turbine_cost_per_turbine": 0.0,
"turbine_cost_total": 228392000.0,
"ui_step_minutes": 0.0,
"use_specific_wf_wind": 0.0,
"user_specified_wf_wind": " ",
"wake_ext_loss": 1.1,
Expand Down Expand Up @@ -11005,10 +11007,36 @@
"batt_discharge_percent_4": 25.0,
"batt_discharge_percent_5": 25.0,
"batt_discharge_percent_6": 25.0,
"batt_dispatch_auto_can_charge": 0.0,
"batt_dispatch_auto_can_clipcharge": 0.0,
"batt_dispatch_auto_can_fuelcellcharge": 0.0,
"batt_dispatch_auto_can_gridcharge": 0.0,
"batt_dispatch_choice": 3.0,
"batt_dispatch_choice_ui": 2.0,
"batt_dispatch_excl": 2.0,
"batt_dispatch_pvs_ac_lb": -0.1,
"batt_dispatch_pvs_ac_lb_enable": 0.0,
"batt_dispatch_pvs_ac_ub": 1.05,
"batt_dispatch_pvs_ac_ub_enable": 0.0,
"batt_dispatch_pvs_battery_energy": 0.0,
"batt_dispatch_pvs_battery_power": 0.0,
"batt_dispatch_pvs_battery_rte": 0.0,
"batt_dispatch_pvs_curtail_as_control": 0.0,
"batt_dispatch_pvs_curtail_if_violation": 0.0,
"batt_dispatch_pvs_forecast_shift_periods": 3.0,
"batt_dispatch_pvs_interconnection_limit": 0.0,
"batt_dispatch_pvs_kf": 0.3,
"batt_dispatch_pvs_ki": 1.8,
"batt_dispatch_pvs_kp": 1.2,
"batt_dispatch_pvs_max_ramp": 10.0,
"batt_dispatch_pvs_nameplate": 0.0,
"batt_dispatch_pvs_nameplate_ac": 0.0,
"batt_dispatch_pvs_ramp_interval": 10.0,
"batt_dispatch_pvs_short_forecast_enable": 0.0,
"batt_dispatch_pvs_soc_rest": 50.0,
"batt_dispatch_pvs_timestep_multiplier": 3.0,
"batt_dispatch_pvs_wf_forecast_choice": 0.0,
"batt_dispatch_pvs_wf_timestep": 60.0,
"batt_dispatch_update_frequency_hours": 0.0,
"batt_dispatch_wf_forecast_choice": 0.0,
"batt_duration_choice": 0.0,
Expand Down Expand Up @@ -11216,6 +11244,10 @@
"batt_pv_clipping_forecast": [
0.0
],
"batt_pvs_pv_ac_forecast": [
0.0
],
"batt_pvs_user_specified_weather_file": "",
"batt_replacement_capacity": 0.0,
"batt_replacement_option": 1.0,
"batt_replacement_schedule_percent": [
Expand Down Expand Up @@ -20059,9 +20091,6 @@
]
],
"compute_as_cube": 0.0,
"degradation": [
0.0
],
"dispatch_manual_btm_discharge_to_grid": [
0.0,
0.0,
Expand Down Expand Up @@ -21370,8 +21399,8 @@
1.0,
1.0
],
"en_batt": 1.0,
"en_standalone_batt": 0.0,
"generic_ui_step_minutes": 0.0,
"genericsys.cost.contingency": 2450100.0,
"genericsys.cost.contingency_percent": 3.0,
"genericsys.cost.epc.fixed": 0.0,
Expand All @@ -21388,6 +21417,7 @@
"genericsys.cost.sales_tax.total": 4206010.0,
"genericsys.cost.sales_tax.value": 5.0,
"grid_interconnection_limit_kwac": 20000.0,
"hybrid_system_capacity": 0.0,
"inflation_rate": 2.5,
"om_batt_capacity_cost": [
5.3
Expand Down Expand Up @@ -21435,11 +21465,10 @@
"pv.storage.p6.discharge": 0.0,
"pv.storage.p6.dischargetogrid": 0.0,
"pv.storage.p6.gridcharge": 0.0,
"pv_system_capacity": 100000.0,
"pv_ui_step_minutes": 0.0,
"sales_tax_rate": 5.0,
"solar_resource_file": "phoenix_az_33.450495_-111.983688_psmv3_60_tmy.csv",
"system_capacity": 57600.0,
"system_use_lifetime_output": 1.0,
"total_direct_cost": 84120300.0,
"total_indirect_cost": 0.0,
"total_installed_cost": 88326300.0,
Expand All @@ -21450,7 +21479,7 @@
"ui_copy_batt_discharge_percent_4": 25.0,
"ui_copy_batt_discharge_percent_5": 25.0,
"ui_copy_batt_discharge_percent_6": 25.0,
"ui_step_minutes": 60.0
"wind_ui_step_minutes": 0.0
},
"Hybrid": {
"ac_nameplate": 76923.1,
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@
"sales_tax_total": 0.0,
"sizing_warning": 0.0,
"specify_label": 0.0,
"step": 0.0,
"system_capacity": 100.0,
"system_use_lifetime_output": 0.0,
"total_installed_cost": 359773.0,
Expand All @@ -316,6 +317,7 @@
"turbine_cost_per_kw": 2732.4,
"turbine_cost_per_turbine": 0.0,
"turbine_cost_total": 359773.0,
"ui_step_minutes": 0.0,
"use_specific_wf_wind": 0.0,
"user_specified_wf_wind": " ",
"wake_ext_loss": 1.1,
Expand Down
42 changes: 35 additions & 7 deletions deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@
"sales_tax_total": 0.0,
"sizing_warning": 0.0,
"specify_label": 1.0,
"step": 0.0,
"system_capacity": 200000.0,
"system_use_lifetime_output": 0.0,
"total_installed_cost": 299792000.0,
Expand All @@ -333,6 +334,7 @@
"turbine_cost_per_kw": 1112.4,
"turbine_cost_per_turbine": 0.0,
"turbine_cost_total": 228392000.0,
"ui_step_minutes": 0.0,
"use_specific_wf_wind": 0.0,
"user_specified_wf_wind": " ",
"wake_ext_loss": 1.1,
Expand Down Expand Up @@ -1322,10 +1324,36 @@
"batt_discharge_percent_4": 25.0,
"batt_discharge_percent_5": 25.0,
"batt_discharge_percent_6": 25.0,
"batt_dispatch_auto_can_charge": 0.0,
"batt_dispatch_auto_can_clipcharge": 0.0,
"batt_dispatch_auto_can_fuelcellcharge": 0.0,
"batt_dispatch_auto_can_gridcharge": 0.0,
"batt_dispatch_choice": 3.0,
"batt_dispatch_choice_ui": 2.0,
"batt_dispatch_excl": 2.0,
"batt_dispatch_pvs_ac_lb": -0.1,
"batt_dispatch_pvs_ac_lb_enable": 0.0,
"batt_dispatch_pvs_ac_ub": 1.05,
"batt_dispatch_pvs_ac_ub_enable": 0.0,
"batt_dispatch_pvs_battery_energy": 0.0,
"batt_dispatch_pvs_battery_power": 0.0,
"batt_dispatch_pvs_battery_rte": 0.0,
"batt_dispatch_pvs_curtail_as_control": 0.0,
"batt_dispatch_pvs_curtail_if_violation": 0.0,
"batt_dispatch_pvs_forecast_shift_periods": 3.0,
"batt_dispatch_pvs_interconnection_limit": 0.0,
"batt_dispatch_pvs_kf": 0.3,
"batt_dispatch_pvs_ki": 1.8,
"batt_dispatch_pvs_kp": 1.2,
"batt_dispatch_pvs_max_ramp": 10.0,
"batt_dispatch_pvs_nameplate": 0.0,
"batt_dispatch_pvs_nameplate_ac": 0.0,
"batt_dispatch_pvs_ramp_interval": 10.0,
"batt_dispatch_pvs_short_forecast_enable": 0.0,
"batt_dispatch_pvs_soc_rest": 50.0,
"batt_dispatch_pvs_timestep_multiplier": 3.0,
"batt_dispatch_pvs_wf_forecast_choice": 0.0,
"batt_dispatch_pvs_wf_timestep": 60.0,
"batt_dispatch_update_frequency_hours": 0.0,
"batt_dispatch_wf_forecast_choice": 0.0,
"batt_duration_choice": 0.0,
Expand Down Expand Up @@ -1533,6 +1561,10 @@
"batt_pv_clipping_forecast": [
0.0
],
"batt_pvs_pv_ac_forecast": [
0.0
],
"batt_pvs_user_specified_weather_file": "",
"batt_replacement_capacity": 50.0,
"batt_replacement_option": 1.0,
"batt_replacement_schedule_percent": [
Expand Down Expand Up @@ -10376,9 +10408,6 @@
]
],
"compute_as_cube": 0.0,
"degradation": [
0.0
],
"dispatch_manual_btm_discharge_to_grid": [
0.0,
0.0,
Expand Down Expand Up @@ -11686,7 +11715,6 @@
1.0,
1.0
],
"en_batt": 1.0,
"en_standalone_batt": 0.0,
"genericsys.cost.contingency": 2450100.0,
"genericsys.cost.contingency_percent": 3.0,
Expand All @@ -11704,6 +11732,7 @@
"genericsys.cost.sales_tax.total": 4206010.0,
"genericsys.cost.sales_tax.value": 5.0,
"grid_interconnection_limit_kwac": 20000.0,
"hybrid_system_capacity": 0.0,
"inflation_rate": 2.5,
"om_batt_capacity_cost": [
5.3
Expand Down Expand Up @@ -11751,11 +11780,10 @@
"pv.storage.p6.discharge": 0.0,
"pv.storage.p6.dischargetogrid": 0.0,
"pv.storage.p6.gridcharge": 0.0,
"pv_system_capacity": 100000.0,
"pv_ui_step_minutes": 0.0,
"sales_tax_rate": 5.0,
"solar_resource_file": "phoenix_az_33.450495_-111.983688_psmv3_60_tmy.csv",
"system_capacity": 57600.0,
"system_use_lifetime_output": 1.0,
"total_direct_cost": 84120300.0,
"total_indirect_cost": 11356200.0,
"total_installed_cost": 99682500.0,
Expand All @@ -11766,7 +11794,7 @@
"ui_copy_batt_discharge_percent_4": 25.0,
"ui_copy_batt_discharge_percent_5": 25.0,
"ui_copy_batt_discharge_percent_6": 25.0,
"ui_step_minutes": 60.0
"wind_ui_step_minutes": 0.0
},
"Hybrid": {
"ac_nameplate": 76923.1,
Expand Down
2 changes: 2 additions & 0 deletions deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@
"sales_tax_total": 0.0,
"sizing_warning": 0.0,
"specify_label": 0.0,
"step": 0.0,
"system_capacity": 100.0,
"system_use_lifetime_output": 0.0,
"total_installed_cost": 456073.0,
Expand All @@ -316,6 +317,7 @@
"turbine_cost_per_kw": 2732.4,
"turbine_cost_per_turbine": 0.0,
"turbine_cost_total": 359773.0,
"ui_step_minutes": 0.0,
"use_specific_wf_wind": 0.0,
"user_specified_wf_wind": " ",
"wake_ext_loss": 1.1,
Expand Down
Loading

0 comments on commit f48dd87

Please sign in to comment.