[WIP] SAM-EM MCY Levelized Metrics Update #130

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

Jump to bottom

Open

softwareengineerprogrammer wants to merge 10 commits into user-provided-reservoir-output-profile-2 from sam-em-mcy-levelized-metrics_2026-01-26-2

Owner

softwareengineerprogrammer commented Jan 26, 2026 •

edited

Loading

Description

Addresses NatLabRockies#444 (comment)

Demonstrations of backfill calculations:

TODO

Sync SAM-EM MCY documentation
LPPA
Update LCOE extraction logic

Testing & Verification

Unit tests added: Describe new unit tests added, if any.
Unit tests updated: Describe existing unit tests that were updated, if any.
Manual testing: Describe any additional manual testing steps that were performed, such as running the change on a pre-existing data set you own.

Change Checklist:

Observe the following checklist items if your change includes a new version (see versioning notes and version management docs).

Before merging:

Add a CHANGELOG entry (example). RST Template:

M.m.P: `TITLE <https://github.com/NREL/GEOPHIRES-X/pull/PR-NUMBER>`__ | `release <https://github.com/NREL/GEOPHIRES-X/releases/tag/vM.m.P>`__

After merging:

Push tag(s) to GitHub: git push origin refs/tags/vM.m.P
Post a change announcement to the GEOPHIRES Change Announcements Discussion (example). Markdown template:

M.m.p: [TITLE](https://github.com/NREL/GEOPHIRES-X/pull/PR-NUMBER) | [release](https://github.com/NREL/GEOPHIRES-X/releases/tag/vM.m.P)

Additional metadata such as TODO items or link to your initial self-review (PR into your own fork created prior to submission)

softwareengineerprogrammer added 8 commits

January 26, 2026 13:59


          Note https://github.com/NatLabRockies/GEOPHIRES-X/issues/458\?title\=…

57e5674

…SAM+Economic+Models+do+not+calculate+carbon+revenue in SAM-EM Limitations section


          WIP - insert backfilled annual costs and electricity to grid rows in …

f89d5d9

…preparation to add backfilled PV/LCOE rows


          Present value of annual costs [backfilled] ($) line item (still WIP)

f00e42c


          minor code cleanup/readability refactor


          Present value of annual energy nominal [backfilled] (kWh) line item (…

271be52

…still WIP)


          LCOE Levelized cost of energy nominal [backfilled] (cents/kWh) line item

b67cf57


          backfill native rows instead of adding separate backfilled rows

1780d64


          handle GHA logs assertion failure (https://github.com/softwareenginee…

225e846

…rprogrammer/GEOPHIRES/actions/runs/21375418744/job/61530255924)

softwareengineerprogrammer commented

View reviewed changes

docs/SAM-Economic-Models.md

    
              1. Only Electricity end-use is supported

              2. Add-ons with electricity and heat are not currently supported. (Add-ons CAPEX, OPEX, and profit are supported.)

              3. Carbon Revenue is not currently supported, but will be in future releases. See [tracking issue](https://github.com/NatLabRockies/GEOPHIRES-X/issues/458?title=SAM+Economic+Models+do+not+calculate+carbon+revenue) for details.

Owner Author

softwareengineerprogrammer Jan 26, 2026

Ignore this change, it's incorrectly shown as belonging to this PR due to cherry-picking

softwareengineerprogrammer commented

View reviewed changes

tests/geophires_x_tests/test_reservoir.py

Comment on lines -326 to +359

    
                      with self.assertLogs(level='INFO') as logs:

                          _del_metadata(

                              GeophiresXClient().get_geophires_result(

                                  GeophiresInputParameters(

                                      from_file_path=self._get_test_file_path('../examples/example5b.txt'),

                                      params={

                                          'Reservoir Output Profile': ','.join(

                                              [str(it) for it in [30 * v for v in [*([10] * 7), 9, 8, 7]]]

                                          )

                                      },

                      try:

                          with self.assertLogs(level='INFO') as logs:

                              _del_metadata(

                                  GeophiresXClient().get_geophires_result(

                                      GeophiresInputParameters(

                                          from_file_path=self._get_test_file_path('../examples/example5b.txt'),

                                          params={

                                              'Reservoir Output Profile': ','.join(

                                                  [str(it) for it in [30 * v for v in [*([10] * 7), 9, 8, 7]]]

                                              )

                                          },

                                      )

                                  )

                              )

                          )

                          self.assertHasLogRecordWithMessage(

                              logs, 'Reservoir temperature extrapolation result', treat_substring_match_as_match=True

                          )

                              self.assertHasLogRecordWithMessage(

                                  logs, 'Reservoir temperature extrapolation result', treat_substring_match_as_match=True

                              )

                          self.assertHasLogRecordWithMessage(

                              logs,

                              # TODO make this less hard-coded

                              '[207.73, 177.48, 147.23, 116.97, 86.72, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                              '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                              '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                              '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                              '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                              '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                              '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                              '80.0, 80.0]',

                              treat_substring_match_as_match=True,

                          )

                              self.assertHasLogRecordWithMessage(

                                  logs,

                                  # TODO make this less hard-coded

                                  '[207.73, 177.48, 147.23, 116.97, 86.72, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                                  '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                                  '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                                  '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                                  '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                                  '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                                  '80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, 80.0, '

                                  '80.0, 80.0]',

                                  treat_substring_match_as_match=True,

                              )

                      except AssertionError as ae:

                          self._handle_assert_logs_failure(ae)

Owner Author

softwareengineerprogrammer Jan 26, 2026

Ignore this change, it's incorrectly shown as belonging to this PR due to cherry-picking

softwareengineerprogrammer mentioned this pull request

SAM-EM Multiple Construction Years: SAM SME Design Review NatLabRockies/GEOPHIRES-X#444

Open

2 tasks

softwareengineerprogrammer changed the title ~~SAM-EM MCY Levelized Metrics Update~~ [WIP] SAM-EM MCY Levelized Metrics Update

softwareengineerprogrammer added 2 commits

January 26, 2026 16:55


          fix e5bd50f

2e9ddb6


          fix logging context side effect introduced in previous commit

ce44e3e

softwareengineerprogrammer commented

View reviewed changes

tests/geophires_x_tests/test_economics_sam.py

Comment on lines -1140 to -1150

    
                  def _handle_assert_logs_failure(self, ae: AssertionError):

                      if sys.version_info[:2] == (3, 8) and self._is_github_actions():

                          # FIXME - see

                          #  https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/19646240874/job/56262028512#step:5:344

                          _log.warning(

                              f'WARNING: Skipping logs assertion in GitHub Actions '

                              f'for Python {sys.version_info.major}.{sys.version_info.minor}'

                          )

                      else:

                          raise ae

Owner Author

softwareengineerprogrammer Jan 27, 2026

Ignore this change, it's incorrectly shown as belonging to this PR due to cherry-picking

softwareengineerprogrammer commented

View reviewed changes

tests/base_test_case.py

Comment on lines +127 to 138

    
                  def _handle_assert_logs_failure(self, ae: AssertionError):

                      if sys.version_info[:2] == (3, 8) and self._is_github_actions():

                          # FIXME - see

                          #  https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/19646240874/job/56262028512#step:5:344

                          print(

                              f'WARNING: Skipping logs assertion in GitHub Actions '

                              f'for Python {sys.version_info.major}.{sys.version_info.minor}'

                          )

                      else:

                          raise ae

                  @staticmethod

Owner Author

softwareengineerprogrammer Jan 27, 2026

Ignore this change, it's incorrectly shown as belonging to this PR due to cherry-picking

softwareengineerprogrammer commented

View reviewed changes

tests/test_base_test_case.py

    
                          self.assertIn(str(msg_type_error), '(you may have meant to pass percent=10)')

                      with self.assertLogs(level='INFO') as logs:

                      with self.assertLogs('tests.base_test_case', level='INFO') as logs:

Owner Author

softwareengineerprogrammer Jan 27, 2026

Ignore this change, it's incorrectly shown as belonging to this PR due to cherry-picking

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet