Parameterize indirect costs [v3.9.34]#84

Merged

softwareengineerprogrammer merged 22 commits intomainfrom

parameterize-indirect-costs

Jul 23, 2025

Commits on Jul 22, 2025

Parameterize Reservoir Stimulation Indirect Capital Cost Percentage
softwareengineerprogrammer
committed
Separate function for stimulation cost calculation. Clarify that Reservoir Stimulation Capital Cost includes contingency and indirect cost (meaning they won't be applied)
softwareengineerprogrammer
committed
Parameterize Indirect Cost Percentage (default = 12%)
softwareengineerprogrammer
committed
Parameterize Well Drilling and Completion Indirect Capital Cost Percentage
softwareengineerprogrammer
committed
Parameterize indirect costs in SBTEconomics
softwareengineerprogrammer
committed
Address FIXME in SBTEconomics
softwareengineerprogrammer
committed
tweak tooltip texts
softwareengineerprogrammer
committed

Commits on Jul 23, 2025

Enumerate categories that indirect cost is applied to. Specify stimulation per-well cost parameters are before indirect costs and contingency.
softwareengineerprogrammer
committed
Generated schemas test that functionally addresses https://github.com/NREL/GEOPHIRES-X/issues/379?title=Schema+Generator+should+be+run+automatically+as+pre-commit+hook
softwareengineerprogrammer
committed
address py38-incompatible annotation introduced in previous commit (https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16475995168/job/46577644537?pr=84)
softwareengineerprogrammer
committed
import __future__ annotations in correct file (main.py instead of test_generated_schemas.py)
softwareengineerprogrammer
committed
Well Drilling and Completion Capital Cost more complete documentation in tooltip text
softwareengineerprogrammer
committed
Address new intermittent failure observed in GitHub Actions py311 macos (https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16476574734/job/46579711905)
softwareengineerprogrammer
committed
Break out Economics.calculate_wellfield_costs (no functional change)
softwareengineerprogrammer
committed
workaround intermittent failure now also occurring on py311 ubuntu (https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16477002832/job/46581220253)
softwareengineerprogrammer
committed
Root cause of intermittent failures may have been introduced in 9ad5d2a9265080c6ff07e48459c8c0181afdae09 due to schema generator adding log handlers. Address by reverting previous workaround strate…
softwareengineerprogrammer
committed
Workaround in previous commit may have been partially successful, workaround remaining intermittent failure in test_unsupported_econ_params_ignored_with_warning for now
softwareengineerprogrammer
committed
use presence of TOXPYTHON env var to determine if running in GitHub Actions
softwareengineerprogrammer
committed
wrap with self.assertLogs in try/except, not just self.assertHasLogRecordWithMessage (https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16479502968/job/46589787461)
softwareengineerprogrammer
committed
apply workaround in test_discount_rate_and_fixed_internal_rate
softwareengineerprogrammer
committed
Bump version: 3.9.33 → 3.9.34
softwareengineerprogrammer
committed
test_indirect_costs
softwareengineerprogrammer
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Parameterize indirect costs [v3.9.34]#84

Parameterize indirect costs [v3.9.34]#84
softwareengineerprogrammer merged 22 commits intomainfrom
parameterize-indirect-costs

Commits on Jul 22, 2025

Parameterize Reservoir Stimulation Indirect Capital Cost Percentage

Separate function for stimulation cost calculation. Clarify that Reservoir Stimulation Capital Cost includes contingency and indirect cost (meaning they won't be applied)

Parameterize Indirect Cost Percentage (default = 12%)

Parameterize Well Drilling and Completion Indirect Capital Cost Percentage

Parameterize indirect costs in SBTEconomics

Address FIXME in SBTEconomics

tweak tooltip texts

Commits on Jul 23, 2025

Enumerate categories that indirect cost is applied to. Specify stimulation per-well cost parameters are before indirect costs and contingency.

Generated schemas test that functionally addresses https://github.com/NREL/GEOPHIRES-X/issues/379?title=Schema+Generator+should+be+run+automatically+as+pre-commit+hook

address py38-incompatible annotation introduced in previous commit (https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16475995168/job/46577644537?pr=84)

import future annotations in correct file (main.py instead of test_generated_schemas.py)

Well Drilling and Completion Capital Cost more complete documentation in tooltip text

Address new intermittent failure observed in GitHub Actions py311 macos (https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16476574734/job/46579711905)

Break out Economics.calculate_wellfield_costs (no functional change)

workaround intermittent failure now also occurring on py311 ubuntu (https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16477002832/job/46581220253)

Root cause of intermittent failures may have been introduced in 9ad5d2a9265080c6ff07e48459c8c0181afdae09 due to schema generator adding log handlers. Address by reverting previous workaround strate…

Workaround in previous commit may have been partially successful, workaround remaining intermittent failure in test_unsupported_econ_params_ignored_with_warning for now

use presence of TOXPYTHON env var to determine if running in GitHub Actions

wrap with self.assertLogs in try/except, not just self.assertHasLogRecordWithMessage (https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16479502968/job/46589787461)

apply workaround in test_discount_rate_and_fixed_internal_rate

Bump version: 3.9.33 → 3.9.34

test_indirect_costs

Parameterize indirect costs [v3.9.34]#84softwareengineerprogrammer merged 22 commits intomainsoftwareengineerprogrammer/GEOPHIRES:mainfrom parameterize-indirect-costssoftwareengineerprogrammer/GEOPHIRES:parameterize-indirect-costsCopy head branch name to clipboard

Commits

Commits on Jul 22, 2025

Commits on Jul 23, 2025

Parameterize indirect costs [v3.9.34]#84
softwareengineerprogrammer merged 22 commits intomainfrom
parameterize-indirect-costs