Skip to content
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.

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

Merge marker used for simulation fw models in Everest and Ert #8978

Conversation

StephanDeHoop
Copy link
Contributor

Issue
Resolves #8859

Approach
Merge the markers in Everest to the ones we use in Ert for when the eclipse simulator is not available.

(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 'pytest tests/ert/unit_tests -n logical -m "not integration_test"')

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: Create Backport PR to latest release

@StephanDeHoop StephanDeHoop added release-notes:skip If there should be no mention of this in release notes everest labels Oct 16, 2024
@StephanDeHoop StephanDeHoop self-assigned this Oct 16, 2024
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.59%. Comparing base (45b9a36) to head (7c11bfc).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8978      +/-   ##
==========================================
+ Coverage   91.57%   91.59%   +0.01%     
==========================================
  Files         345      345              
  Lines       21302    21302              
==========================================
+ Hits        19507    19511       +4     
+ Misses       1795     1791       -4     
Flag Coverage Δ
cli-tests 39.72% <ø> (+<0.01%) ⬆️
gui-tests 73.51% <ø> (ø)
performance-tests 50.30% <ø> (+0.02%) ⬆️
unit-tests 80.33% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@yngve-sk yngve-sk left a comment

Choose a reason for hiding this comment

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

lgtm

@StephanDeHoop StephanDeHoop merged commit 6e1fa35 into equinor:main Oct 17, 2024
56 checks passed
@StephanDeHoop StephanDeHoop deleted the merge_fwm_flowsim_markers_everest_ert branch October 17, 2024 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
everest release-notes:skip If there should be no mention of this in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants