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 local dataset notion #2645

Merged

Conversation

BjarneHerland
Copy link
Contributor

Issue
Resolves #2539

Approach
Moving functionality from local_dataset_type to local_ministep_type, the remove the former.

PR currently has two commits: first to make libres compile and run ctests, second to fix some issues and make the Python-based tests work. There will be at third commit to remove all traces of local_dataset_type but I expect a number of comments and suggestions on the first two to handle first.

@BjarneHerland BjarneHerland force-pushed the remove_local_dataset_notion branch 8 times, most recently from 51b8bac to 002f5b2 Compare January 4, 2022 08:05
@codecov-commenter
Copy link

codecov-commenter commented Jan 4, 2022

Codecov Report

Merging #2645 (c0a4b76) into main (8395824) will increase coverage by 0.04%.
The diff coverage is 23.29%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2645      +/-   ##
==========================================
+ Coverage   64.77%   64.82%   +0.04%     
==========================================
  Files         650      649       -1     
  Lines       54063    53876     -187     
  Branches     4591     4547      -44     
==========================================
- Hits        35021    34924      -97     
+ Misses      17562    17493      -69     
+ Partials     1480     1459      -21     
Impacted Files Coverage Δ
libres/lib/analysis/update.cpp 0.00% <0.00%> (ø)
libres/lib/enkf/local_config.cpp 62.31% <ø> (+5.79%) ⬆️
libres/lib/enkf/local_ministep.cpp 28.35% <0.00%> (-23.65%) ⬇️
res/enkf/__init__.py 100.00% <ø> (ø)
res/enkf/local_obsdata.py 60.22% <ø> (-0.22%) ⬇️
libres/lib/include/ert/enkf/local_ministep.hpp 31.11% <31.11%> (ø)
libres/lib/enkf/enkf_main.cpp 52.78% <33.33%> (+0.19%) ⬆️
res/enkf/local_ministep.py 83.60% <89.28%> (-0.71%) ⬇️
res/enkf/local_config.py 89.33% <100.00%> (+3.01%) ⬆️
ert3/evaluator/_builder.py 91.30% <0.00%> (-5.06%) ⬇️
... and 17 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8395824...c0a4b76. Read the comment docs.

@ManInFez ManInFez marked this pull request as ready for review January 5, 2022 11:26
Copy link
Contributor

@ManInFez ManInFez left a comment

Choose a reason for hiding this comment

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

This looks very good! It would be good to remove the unordered maps used previously to hold parameters pr dataset, as they are no longer needed

libres/lib/analysis/update.cpp Outdated Show resolved Hide resolved
libres/lib/analysis/update.cpp Outdated Show resolved Hide resolved
res/enkf/local_ministep.py Outdated Show resolved Hide resolved
@ManInFez
Copy link
Contributor

ManInFez commented Jan 5, 2022

Remember to rebase and clean up the commit messages

raise TypeError("Keys must be strings, not int!")
if data_key in self:
return self._get_local_data(data_key)
def setEnsembleConfig(self, config):
Copy link
Contributor

Choose a reason for hiding this comment

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

perhaps we should avoid camel-casing?

This type was relevant when using Kalman-filters which is not the case
anymore. See equinor#2539 for details.
Some parts of the functionality was needed, however, so the class can
not just be removed.

Move necessary functionality from local_dataset_type to
local_ministep_type, then update and simplify usage. Separate unit-test
for local_dataset_type removed.
@BjarneHerland
Copy link
Contributor Author

test ert please

1 similar comment
@BjarneHerland
Copy link
Contributor Author

test ert please

@BjarneHerland BjarneHerland merged commit 9ff386b into equinor:main Jan 6, 2022
@oyvindeide oyvindeide added the release-notes:breaking-change Automatically categorise as breaking change in release notes label Jan 6, 2022
@BjarneHerland BjarneHerland deleted the remove_local_dataset_notion branch January 26, 2022 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes:breaking-change Automatically categorise as breaking change in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove the notion of several local_datasets within a local_ministep
4 participants