Skip to content

Combine snake oils - #13980

Merged
frode-aarstad merged 10 commits into
equinor:mainfrom
frode-aarstad:combine-snake-oils
Jul 14, 2026
Merged

Combine snake oils#13980
frode-aarstad merged 10 commits into
equinor:mainfrom
frode-aarstad:combine-snake-oils

Conversation

@frode-aarstad

Copy link
Copy Markdown
Contributor

Issue
Resolves #12784

Approach
Short description of the approach

(Screenshot of new behavior in GUI if applicable)

  • PR title captures the intent of the changes, and is fitting for release notes.
  • Added appropriate release note label
  • Commit history is consistent and clean, in line with the contribution guidelines.
  • Make sure unit tests pass locally after every commit (git rebase -i main --exec 'just rapid-tests')

When applicable

  • When there are user facing changes: Updated documentation
  • New behavior or changes to existing untested code: Ensured that unit tests are added (See Ground Rules).
  • Large PR: Prepare changes in small commits for more convenient review
  • Bug fix: Add regression test for the bug
  • Bug fix: Add backport label to latest release (format: 'backport release-branch-name')

@frode-aarstad frode-aarstad self-assigned this Jul 9, 2026
@frode-aarstad frode-aarstad added the maintenance Not a bug now but could be one day, repaying technical debt label Jul 9, 2026
@ertomatic

Copy link
Copy Markdown
Collaborator

Screenshots differ from baselines. A baseline update PR has been prepared: equinor/ert-testdata#46

ertomatic pushed a commit to equinor/ert-testdata that referenced this pull request Jul 13, 2026
@codecov-commenter

codecov-commenter commented Jul 13, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 91.39%. Comparing base (137d9f2) to head (c206ecf).

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #13980      +/-   ##
==========================================
- Coverage   91.40%   91.39%   -0.02%     
==========================================
  Files         481      481              
  Lines       34213    34213              
==========================================
- Hits        31273    31268       -5     
- Misses       2940     2945       +5     
Flag Coverage Δ
cli-tests 35.96% <ø> (ø)
fuzz 43.58% <ø> (ø)
gui-tests 59.22% <ø> (-0.01%) ⬇️
performance-and-unit-tests 79.45% <ø> (-0.02%) ⬇️
test 46.02% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes

ertomatic pushed a commit to equinor/ert-testdata that referenced this pull request Jul 13, 2026
ertomatic pushed a commit to equinor/ert-testdata that referenced this pull request Jul 13, 2026
ertomatic pushed a commit to equinor/ert-testdata that referenced this pull request Jul 13, 2026
ertomatic pushed a commit to equinor/ert-testdata that referenced this pull request Jul 13, 2026
ertomatic pushed a commit to equinor/ert-testdata that referenced this pull request Jul 13, 2026
ertomatic pushed a commit to equinor/ert-testdata that referenced this pull request Jul 14, 2026
ertomatic pushed a commit to equinor/ert-testdata that referenced this pull request Jul 14, 2026
@codspeed-hq

codspeed-hq Bot commented Jul 14, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 36 untouched benchmarks


Comparing frode-aarstad:combine-snake-oils (c206ecf) with main (137d9f2)

Open in CodSpeed

REPORT_STEPS:199

GEN_KW SNAKE_OIL_PARAM_BPR templates/snake_oil_template.txt snake_oil_params.txt parameters/snake_oil_parameters_BPR.txt
GEN_KW SNAKE_OIL_PARAM_OP1 templates/snake_oil_template.txt snake_oil_params.txt parameters/snake_oil_parameters_OP1.txt

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Out of curiosity, why we need to have a separate OP1 and OP2 groups?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It the way its done in snake_oil_field.py

@xjules xjules left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think it is good!
Please provide a commit message explaining (on a higher level) the changes.

@frode-aarstad
frode-aarstad merged commit ed77de3 into equinor:main Jul 14, 2026
35 checks passed
Comment on lines +29 to +31
GEN_KW SNAKE_OIL_PARAM_BPR templates/snake_oil_template.txt snake_oil_params.txt parameters/snake_oil_parameters_BPR.txt
GEN_KW SNAKE_OIL_PARAM_OP1 templates/snake_oil_template.txt snake_oil_params.txt parameters/snake_oil_parameters_OP1.txt
GEN_KW SNAKE_OIL_PARAM_OP2 templates/snake_oil_template.txt snake_oil_params.txt parameters/snake_oil_parameters_OP2.txt

@eilskra eilskra Jul 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This seems to be what triggered equinor/ert-testdata#46, attempt at more info in:
#14017 (comment)

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

Labels

maintenance Not a bug now but could be one day, repaying technical debt

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Merge test-data snake_oil and snake_oil_field

5 participants