Use Existing Cartesian-to-IJK Functionality to Determine NNCs in MULTREGT #3639
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
jenkins build this please |
bska
force-pushed
the
multregt-revise-nnc-identification
branch
from
112bf6e
to
3afc1fe
Compare
|
jenkins build this please |
bska
force-pushed
the
multregt-revise-nnc-identification
branch
from
3afc1fe
to
8bbbf13
Compare
|
jenkins build this please |
1 similar comment
|
jenkins build this please |
A numeric index serves the same purpose as a pointer in this very specific instance and also has the benefit of being easily transferable between processes. This, in turn, means we can remove the 'getSearchMap()' and 'constructSearchMap()' member functions.
In particular, ensure that we include all requisite headers, hide type aliases that are not needed outside the class, consistently use std::size_t, split a few long lines, and switch to range-for in one location.
This commit replaces the data members 'nx', 'ny', and 'nz' with a copy of the GridDims object passed as an argument to the constructor. In turn, this enables using GridDims::getIJK() to compute the cell's IJK tuple from its global Cartesian index instead of implementing the same calculation locally (and incorrectly). While here, also include the layer index (K) in determining whether or not a connection is an NNC, and do this just once instead of once for each MULTREGT record. Cells (I,J,K) and (I,J,K+3) might be connected across pinched-out layers and for the purposes of MULTREGT that connection should be treated as an NNC.
bska
force-pushed
the
multregt-revise-nnc-identification
branch
from
8bbbf13
to
f32ff86
Compare
|
jenkins build this please |
|
I am curious: What did you do to make the number of NNCs match again? I recall that some tests were failing previously because the number of NNCs did change. |
Probably #3644. It's not completely clear to me, however. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR replaces the data members
nx,ny, andnzwith a copy of theGridDimsobject passed as an argument to the constructor. In turn, this enables usingGridDims::getIJK()to compute the cell's IJK tuple from its global Cartesian index instead of implementing the same calculation locally (and incorrectly).While here, also include the layer index (K) in determining whether or not a connection is an NNC, and do this just once instead of once for each MULTREGT record. Cells (I,J,K) and (I,J,K+3) might be connected across pinched-out layers and for the purposes of MULTREGT that connection should be treated as an NNC.