Skip to content

Develop merge#1799

Merged
dguittet merged 14 commits into
developfrom
develop_merge
Jun 25, 2024
Merged

Develop merge#1799
dguittet merged 14 commits into
developfrom
develop_merge

Conversation

@dguittet

@dguittet dguittet commented Jun 18, 2024

Copy link
Copy Markdown
Collaborator

Manual merge using a develop-based feature branch in order to merge patch into develop while skipping over the change to ci.yml. This way the ci.yml in patch is different from the ci.yml in develop. Future merges of patch into develop are hypothesized to not include the ci.yml change.

updated test_results_win64.csv

#1779 and #1797

sjanzou and others added 13 commits June 3, 2024 03:42
Update lhs.bin and stepwise.bin to address #1417
Rerun defaults on Windows for failing GitHub Actions
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
@dguittet dguittet marked this pull request as ready for review June 18, 2024 16:35
@dguittet dguittet requested review from brtietz and sjanzou June 20, 2024 14:35

@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.

The changes I have made look good. I am including @cpaulgilman as a reviewer since many of the file changes are documentation/help content.

@sjanzou sjanzou requested a review from cpaulgilman June 21, 2024 06:36

@brtietz brtietz 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.

Thanks for putting this together!

@dguittet dguittet merged commit 4ee1368 into develop Jun 25, 2024
@dguittet dguittet deleted the develop_merge branch June 25, 2024 15:12
@dguittet dguittet restored the develop_merge branch June 25, 2024 15:14
@dguittet dguittet mentioned this pull request Jun 25, 2024
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.

4 participants