Skip to content

Ready to be tested #2265

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
sjanzou merged 23 commits into from
Oct 7, 2026
Merged

Ready to be tested #2265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e40e7cf
Fix bug in fcall_var_exists for hybrids
sjanzou Sep 4, 2026
187da8f
Update ssc_auto_exec call for design point and add fcall_var_exists_h…
sjanzou Sep 6, 2026
1a57dd2
Propagate errors from fcall_ssc_exec and add multiple vartable to var…
sjanzou Sep 7, 2026
3517ec3
Update Case Evaluator for all hybrid vartables
sjanzou Sep 8, 2026
46a5dae
Update ssc_auto_exec processing and partially implement option 2
sjanzou Sep 10, 2026
b6f76e0
Test update - failing to run hybrids
sjanzou Sep 11, 2026
37a23cb
Update calling of hybrids - switching model not quite right.
sjanzou Sep 11, 2026
6355581
Rerun default - MSPT Hybrid case failing, all others run.
sjanzou Sep 13, 2026
178aea4
ndx in fcall_var_exists got reset - update
sjanzou Sep 13, 2026
a56be89
Testing changing model - only MSPT hybrid fails others work fine.
sjanzou Sep 13, 2026
599a25e
Fix issue with changing model - update defaults - set en_batt=1
sjanzou Sep 14, 2026
7847cc7
Update so that change model runs - still have issues with defaults
sjanzou Sep 14, 2026
f101c75
Ready to merge - defaults run when switching to MSPT hybrid needs to …
sjanzou Sep 16, 2026
9342bca
Fix energy revenue retained defaults
mjprilliman Sep 25, 2026
6b07d8d
Add autographs
mjprilliman Sep 25, 2026
d79779d
Address potential issue with null wxstring assignment exceptions
sjanzou Oct 2, 2026
c967159
Address comments on #2265
sjanzou Oct 4, 2026
d364329
Address remaining items in #2265 and add additional test
sjanzou Oct 4, 2026
b86ed54
Update test file for hard crash on Linux runner
sjanzou Oct 6, 2026
ee08dc6
Update sibling branch for pull request to match commit for Windows ru…
sjanzou Oct 6, 2026
03389f0
Address heap corruption on Ubuntu runner
sjanzou Oct 6, 2026
c32816a
Updated Windows defaults results for runners
sjanzou Oct 6, 2026
1fa9b90
Change from NREL-PySAM=3.0.0 to NLR-PySAM=8.0.0 for python differ
sjanzou Oct 7, 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
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
run: |
echo "GIT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
echo "DEFAULT_BRANCH=$GITHUB_BASE_REF" >> $GITHUB_ENV
- name: Get branch name for push
shell: bash
if: ${{ github.event_name == 'push' }}
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,3 +394,7 @@ deploy/physical_trough_v2_mimo_ssc_auto_exec.lk

deploy/physical_trough_IPH_v2_mimo_ssc_auto_exec.lk
/samples/CSP/sco2_analysis_python_V2/.vscode

deploy/mspt_system_design_after_exec.lk

deploy/mspt_system_design_before_exec.lk
1 change: 1 addition & 0 deletions api/api_autogen/data_structures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ static std::unordered_map<std::string, std::string> config_to_cmod_name = {
{"PVWattsBattery", "BattWatts"},
{"PVWattsWindBatteryHybrid", "Pvwattsv8,Windpower,Battery"},
{"PVWattsWindFuelCellBatteryHybrid", "Pvwattsv8,Windpower,Fuelcell,Battery"},
{"PVWattsCSPTowerMoltenSaltBatteryHybrid", "Pvwattsv8,TcsmoltenSalt,Battery"},
{"PTES", "EtesPtes"},
{"Residential", "Residential"},
{"SaleLeaseback", "Saleleaseback"},
Expand Down
4 changes: 2 additions & 2 deletions ...api_autogen/library/defaults/Battery_CustomGenerationBatteryAllEquityPartnershipFlip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryCommercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryHostDeveloper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions ...api_autogen/library/defaults/Battery_CustomGenerationBatteryLeveragedPartnershipFlip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryMerchantPlant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryResidential.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatterySaleLeaseback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatterySingleOwner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_CustomGenerationBatteryThirdParty.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions ...brary/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.000000],
Expand Down
4 changes: 2 additions & 2 deletions ...library/defaults/Battery_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.000000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_FuelCellCommercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,10 @@
[40.000000, 100.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,10 @@
[40.000000, 100.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@
[45.000000, 105.400000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.000000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatteryAllEquityPartnershipFlip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.000000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatteryCommercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatteryHostDeveloper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatteryLeveragedPartnershipFlip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.000000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatteryMerchantPlant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@
[48.044326, 114.950386]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.000000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatteryResidential.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatterySaleLeaseback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.000000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatterySingleOwner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.000000],
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/Battery_PVWattsBatteryThirdParty.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@
[60.000000, 101.000000]
]
},
"Inverter": {
},
"Losses": {
},
"Inverter": {
},
"BatteryDispatch": {
"batt_custom_dispatch": [0.000000],
"batt_cycle_cost": [0.100000],
Expand Down
Loading
Loading