Refactoring of CField struct to include gridindexingtype and interp_method #1673
Conversation
This file contains hidden or 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
erikvansebille
changed the base branch from
croco_3D_velocities
to
analyticaladvection_in_jit
Codecov ReportAll modified and coverable lines are covered by tests ✅ Additional details and impacted files@@ Coverage Diff @@
## analyticaladvection_in_jit #1673 +/- ##
===========================================================
Coverage 86.22% 86.22%
===========================================================
Files 67 67
Lines 11827 11828 +1
===========================================================
+ Hits 10198 10199 +1
Misses 1629 1629
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
erikvansebille
commented
Aug 29, 2024
Comment on lines
1479
to
+1491
| gridindexingtype_mapping = {"nemo": 0, "mitgcm": 1, "mom5": 2, "pop": 3} | ||
| interp_method_mapping = { | ||
| "LINEAR": 0, | ||
| "NEAREST": 1, | ||
| "CGRID_VELOCITY": 2, | ||
| "CGRID_TRACER": 3, | ||
| "BGRID_VELOCITY": 4, | ||
| "BGRID_W_VELOCITY": 5, | ||
| "BGRID_TRACER": 6, | ||
| "LINEAR_INVDIST_LAND_TRACER": 7, | ||
| "PARTIALSLIP": 8, | ||
| "FREESLIP": 9, | ||
| } |
There was a problem hiding this comment.
This is still a bit ugly, because it mirrors the information from
https://github.com/OceanParcels/Parcels/blob/997e3f86399cf319341a3d3f4fb1c5dc339e2580/parcels/include/index_search.h#L22-L30
It would be cleaner to either
- Use the string here in the CField, instead of an integer. I tried using
c_char_p, but that didn't work (yet) - Somehow import the typedefs from
index_search.h(above) here
In any case, I think we want to avoid happing two places where these mappings between strings and integers occur...
|
Will be solved in v4 |
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.
Following #1612, where we need to provide the
gridindexingtypeon theCFieldstruct for technical reasons, it makes sense to also use it throughout the rest of the C-code. Hence, this PR refactors the code to not require thegridindexingtypeandinterp_methodwhen calling a Field evaluation in C, but get them from theCFielditself