Skip to content

Patch to develop 240718#1810

Merged
brtietz merged 72 commits into
developfrom
patch_to_develop_240718
Jul 24, 2024
Merged

Patch to develop 240718#1810
brtietz merged 72 commits into
developfrom
patch_to_develop_240718

Conversation

@brtietz

@brtietz brtietz commented Jul 18, 2024

Copy link
Copy Markdown
Collaborator

Pairs with NatLabRockies/ssc#1184 Tests may fail due to branch naming

For review: please confirm merge of equations.cpp went as intended.

sjanzou and others added 30 commits June 3, 2024 03:42
Update lhs.bin and stepwise.bin to address #1417
Rerun defaults on Windows for failing GitHub Actions
Generate code...->LK for SDKtool code generation working for hybrids and non-hybrids configurations using generated JSON for inputs
Old version was misleading for one-axis trackers.

Delete extra copies of image file.
Add json_file_to_ssc_data for code generation for SAM #1717
Cell CashFlow!B398 incorrectly referred to $C$141 for federal custom depreciation allocation which caused divide by zero errors that propagated through workbook all the way to LCOE and NPV results.

This issue only affected Host Developer send-to-Excel with equations when 20-yr SL allocation (Inputs!C141) is set to zero.

Checked that all other FOM spreadsheets do not have this problem.
Also trigger message on_change so message appears when you switch to Battery Dispatch pages.
* fix base branch

* fix ref name

* set default branch to patch
sjanzou and others added 14 commits June 30, 2024 04:26
* Update defaults test results for new basis calculations. Expect increased lcoe due to decreased basis

* Update single owner cash flow to excel for new basis calculations

* Community solar send to excel for new basis calculations

* Partnership flip spreadsheet for updated basis

* Sale leaseback spreadsheet for basis updates

* Update TPO Host Developer spreadsheet for new basis calcs

* Merchant Plant spreadsheet for basis updates

* Fix spreadsheet formatting for depr calcs

* Help revisions for depreciation basis update

* SAM_api and Windows test results updates for #1808

---------

Co-authored-by: Brian Mirletz <brian.mirletz@nrel.gov>
Co-authored-by: Steven Janzou <steven@janzouconsulting.com>
@brtietz brtietz requested a review from sjanzou July 18, 2024 15:02
@brtietz brtietz changed the base branch from patch to develop July 18, 2024 15:03

@sjanzou sjanzou left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

equations.cpp appears correct based on issue 1634.

@brtietz , should we merge ssc PR 1184 first and then update the ci.yml to use the develop branches and update the test results on Windows using develop branch of ssc and this branch of SAM and commit and push and check GitHub Actions?

Comment thread src/equations.cpp
@@ -220,7 +212,8 @@ bool EqnDatabase::PreProcessScript( wxString *text, wxArrayString* errors)
arg[1] = compute module name
arg[2] = sim_type value

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks correct based on issue 1634.

@brtietz

brtietz commented Jul 19, 2024

Copy link
Copy Markdown
Collaborator Author

equations.cpp appears correct based on issue 1634.

@brtietz , should we merge ssc PR 1184 first and then update the ci.yml to use the develop branches and update the test results on Windows using develop branch of ssc and this branch of SAM and commit and push and check GitHub Actions?

#1813 resulted from attempting to do that. I'm open to merging this sooner (since develop will be less broken than it is with ssc merged) but also ok to hold off for a few days while I fix 1813.

@brtietz brtietz merged commit 4d576dc into develop Jul 24, 2024
@brtietz brtietz deleted the patch_to_develop_240718 branch December 13, 2024 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants