Skip to content

[pull] develop from NatLabRockies:develop #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jun 10, 2026
Merged

[pull] develop from NatLabRockies:develop #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e993c8a
Fix FOM Custom Generation Profile Battery Custom Forecast (#2211)
cpaulgilman Jun 10, 2026
0c4225f
Revert bifacial inputs in PVWatts (#2205)
janinefreeman Jun 10, 2026
be3cb83
Bump urllib3 in /samples/Python Scripts/End Use Load Profiles/eulp (#…
dependabot[bot] Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
"losses": 14.075660688264469,
"losses_user": 14.0,
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts Battery_All Equity Partnership Flip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29861,7 +29861,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts Battery_Leveraged Partnership Flip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29870,7 +29870,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts Battery_Merchant Plant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19361,7 +19361,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts Battery_Sale Leaseback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29856,7 +29856,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts Battery_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29881,7 +29881,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"losses": 14.075660688264469,
"losses_user": 14.0,
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"losses": 14.075660688264469,
"losses_user": 14.0,
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts_All Equity Partnership Flip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19240,7 +19240,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts_Community Solar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9210,7 +9210,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 3000.0,
"module_total": 1020000.0000000001,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts_LCOE Calculator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8859,7 +8859,7 @@
"loss_wiring": 2.0,
"losses": 14.075660688264469,
"losses_user": 14.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_type": 0.0,
"pv_land_area_is_shown": 0.0,
"pvwatts.advanced.is_shown": 0.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts_Leveraged Partnership Flip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19249,7 +19249,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts_Merchant Plant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9218,7 +9218,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts_Sale Leaseback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19235,7 +19235,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/PVWatts_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19260,7 +19260,7 @@
"mera_name2": "Replacement Reserve 2",
"mera_name3": "Replacement Reserve 3",
"module_costunits": 0.0,
"module_is_bifacial": 1.0,
"module_is_bifacial": 0.0,
"module_num_units": 1.0,
"module_power": 100000.0,
"module_total": 34000000.0,
Expand Down
4 changes: 2 additions & 2 deletions deploy/runtime/ui/Battery Dispatch Common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,12 +689,12 @@
"{",
"\tlogmsg('Forecast data: ' + data);",
"",
"\tforecast_run = ssc_module_create_from_case('generic_system');",
"\tforecast_run = ssc_module_create_from_case('custom_generation');",
"\tssc_var(forecast_run, 'en_batt', false);",
"\tssc_var(forecast_run, 'energy_output_array', data);",
"\tssc_var(forecast_run, 'spec_mode', 1);",
"",
"\tstatus = ssc_exec(forecast_run, 'generic_system', {'show_dialog'=true, 'hold_dialog'=true});",
"\tstatus = ssc_exec(forecast_run, 'custom_generation', {'show_dialog'=true, 'hold_dialog'=true});",
"\t",
"\tif (status != 0)",
"\t{",
Expand Down
2 changes: 1 addition & 1 deletion doc/source/reference/configure_proxy_server.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The following is a list of all of the URLs that SAM may use. You can find this l
https://developer.nlr.gov/api/nsrdb/v2/solar/nsrdb-data-query.json?&api_key=<SAMAPIKEY>&email=<USEREMAIL>&wkt=POINT(<LON>%20<LAT>)
https://developer.nlr.gov/api/sam/v1/tracker
https://sam.nlr.gov/sites/default/files/content/updates/messages.html
https://samrepo.nrelcloud.org/updates/welcome.lk
https://samrepo.nlr.gov/updates/welcome.lk
https://nrel.github.io/SAM/doc/releasenotes.html
https://developer.nlr.gov/api/reopt/stable/job/<RUN_UUID>/results/?api_key=<SAMAPIKEY>
https://developer.nlr.gov/api/reopt/stable/job?format=json&api_key=<SAMAPIKEY>
Expand Down
2 changes: 1 addition & 1 deletion samples/Python Scripts/End Use Load Profiles/eulp/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ matplotlib==3.6.0
pandas==1.5.2
pyarrow==14.0.1
seaborn==0.12.1
urllib3==1.26.18
urllib3==1.26.19
Loading
Loading