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

Remove c usage of res_config #3922

Merged
merged 5 commits into from
Sep 23, 2022

Conversation

eivindjahren
Copy link
Contributor

Issue
In order to simplify #3847 we can simplify the res_config object by not having references to it in the c code.

Pre review checklist

  • Added appropriate release note label
  • PR title captures the intent of the changes, and is fitting for release notes.
  • Commit history is consistent and clean, in line with the contribution guidelines.

Adding labels helps the maintainers when writing release notes. This is the list of release note labels.

@eivindjahren eivindjahren force-pushed the remove_c_use_of_res_config branch 22 times, most recently from dcdc7e1 to 7c78090 Compare September 22, 2022 14:18
This function used a complicated way of setting
ext_node from the outer scope which mypy was unable
to type (also, difficult to read). This was simplified.
@eivindjahren eivindjahren force-pushed the remove_c_use_of_res_config branch 2 times, most recently from da58634 to ba4cdab Compare September 22, 2022 18:06
@eivindjahren eivindjahren marked this pull request as ready for review September 22, 2022 18:16
@eivindjahren eivindjahren self-assigned this Sep 22, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #3922 (800a163) into main (9ac2efd) will increase coverage by 0.13%.
The diff coverage is 57.64%.

@@            Coverage Diff             @@
##             main    #3922      +/-   ##
==========================================
+ Coverage   58.56%   58.69%   +0.13%     
==========================================
  Files         545      545              
  Lines       41463    41277     -186     
  Branches     3765     3759       -6     
==========================================
- Hits        24281    24229      -52     
+ Misses      16181    16049     -132     
+ Partials     1001      999       -2     
Impacted Files Coverage Δ
src/clib/lib/enkf/enkf_main.cpp 3.30% <0.00%> (-0.58%) ⬇️
src/clib/lib/enkf/enkf_state.cpp 1.64% <ø> (+0.08%) ⬆️
src/clib/lib/enkf/subst_config.cpp 0.00% <0.00%> (ø)
src/clib/lib/python/model_callbacks.cpp 5.00% <0.00%> (-1.67%) ⬇️
...rt/ensemble_evaluator/builder/_ensemble_builder.py 92.25% <ø> (ø)
src/clib/lib/enkf/res_config.cpp 18.18% <18.18%> (+14.51%) ⬆️
src/ert/simulator/simulation_context.py 85.03% <66.66%> (ø)
src/ert/_c_wrappers/enkf/res_config.py 92.71% <97.05%> (-0.99%) ⬇️
src/ert/_c_wrappers/config/config_parser.py 100.00% <100.00%> (ø)
src/ert/_c_wrappers/enkf/enkf_main.py 97.97% <100.00%> (ø)
... and 12 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@dafeda dafeda left a comment

Choose a reason for hiding this comment

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

Nice 👍

@eivindjahren eivindjahren merged commit de7beea into equinor:main Sep 23, 2022
@eivindjahren eivindjahren deleted the remove_c_use_of_res_config branch September 23, 2022 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants