opm-grid icon indicating copy to clipboard operation
opm-grid copied to clipboard

[refactor] Remove non-DUNE methods in CartesianIndexMapper

Open aritorto opened this issue 1 year ago • 11 comments

Based on OPM/opm-grid#765

Improvement of OPM/opm-grid#765 since it removes the non-DUNE methods added in CartesianIndexMapper.

Create a template class LevelCartesianIndexMapper. It mimics the Dune::CartesianIndexMapper class. Difference: methods have "int level" as a function parameter. Specialization for CpGrid and PolyhedralGrid are added accordingly.

PR OPM/opm-simulators#5649 deals with the AluGrid specialization. Additionally, it refactors the code where those non-DUNE methods were used (RelpermDiagnostics).

Not relevant for the Reference Manual.

aritorto avatar Oct 01 '24 14:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 07 '24 13:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 07 '24 13:10 aritorto

@blattms, @bska I might need some help to understand what's wrong here.

These two PRs (OPM/opm-grid#766 and OPM/opm-simulators#5649) are based on two previous ones. So maybe the issue is also there. Let's see what I get in OPM/opm-grid#765 and OPM/opm-simulators#5633

The "first" pair of PRs passes the tests.

aritorto avatar Oct 07 '24 13:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 07 '24 14:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 08 '24 07:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 08 '24 07:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 08 '24 08:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 08 '24 09:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 08 '24 11:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 08 '24 11:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 08 '24 13:10 aritorto

Also, can you squash/restructure the commits a bit, like:

  • instead of commits like "add draft file" "remove draft file", the draft file does not appear at all anymore
  • when you add the files, directly add the headers in cmake for that file in the same commit

I know that might be some work, yet ideally you're able to check out a commit from the history and the code will be in a working condition :)

Thanks!!

Thanks for your first feedback. I always rewrite history before merging for so those weird commit messages won't be there, and so on. I'll keep that in mind for the future though!

aritorto avatar Oct 15 '24 07:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 16 '24 08:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 16 '24 08:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 16 '24 09:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 17 '24 06:10 aritorto

Hopefully now, all the comments are addressed correctly. One last jenikins run! Thanks @lisajulia :)

aritorto avatar Oct 21 '24 09:10 aritorto

jenkins build this opm-simulators=5649 please

aritorto avatar Oct 21 '24 09:10 aritorto