Skip to content

SAM-EM Other Incentives and One-time Grants Etc fix [v3.14]#169

Merged
softwareengineerprogrammer merged 8 commits into
mainfrom
sam-em-other-incentives-and-one-time-flat-fees-2
Jun 10, 2026
Merged

SAM-EM Other Incentives and One-time Grants Etc fix [v3.14]#169
softwareengineerprogrammer merged 8 commits into
mainfrom
sam-em-other-incentives-and-one-time-flat-fees-2

Conversation

@softwareengineerprogrammer

@softwareengineerprogrammer softwareengineerprogrammer commented Jun 10, 2026

Copy link
Copy Markdown
Owner

Description

  1. Addresses SAM-EM Other Incentives not correctly applied to OCC/Total CAPEX NatLabRockies/GEOPHIRES-X#504 by fixing erroneous double deduction of Other Incentives and One-time Grants Etc from Total CAPEX
image image

TODO

  1. WIP to adjust Other Incentives to be output after OCC
  2. Verify OCC/Total CAPEX adjustment: https://github.com/softwareengineerprogrammer/GEOPHIRES/pull/169/changes#diff-d30db77f0b9935ff4e2e3b4cf58e36685bbb84b494f5ced0aad96833c4bf1a6aR241-R250
  3. v3.14 minor version bump (backwards-incompatible behavioral change): b165607

Testing & Verification

  1. Unit tests added: test_other_incentives_one_time_flat_fees_and_total_grants
  2. Unit tests updated: N/A
  3. Manual testing:
    1. Manually tested/verified in self-review

Change Checklist

Observe the following checklist items before and after merging, as applicable.

Before merging:

  1. I certify that I am a human and I have manually verified the correctness of the changes in this PR.
  2. Add a CHANGELOG entry if your change includes a new version: c1a5447
    1. Include Changed note re: backwards-incompatible behavioral changes

After merging:

  1. Push tag(s) to GitHub: git push fork refs/tags/v3.13.0

Self-reviewed in #169

@softwareengineerprogrammer softwareengineerprogrammer added the bug Something isn't working label Jun 10, 2026
@softwareengineerprogrammer softwareengineerprogrammer changed the title SAM-EM Other Incentives handling. SAM-EM Other Incentives handling Jun 10, 2026
@softwareengineerprogrammer softwareengineerprogrammer changed the title SAM-EM Other Incentives handling SAM-EM Other Incentives and One-time Grants fix [v3.14] Jun 10, 2026
@softwareengineerprogrammer softwareengineerprogrammer changed the title SAM-EM Other Incentives and One-time Grants fix [v3.14] SAM-EM Other Incentives and One-time Grants Etc fix [v3.14] Jun 10, 2026
@softwareengineerprogrammer softwareengineerprogrammer merged commit 604bf9f into main Jun 10, 2026
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant