move map mesh migrate out of flood block #7559
Merged
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
map mesh migrate foro r2o maps should happen always, even if flood is not present
rljacob
added
MOAB
vijaysm
requested changes
Jul 30, 2025
driver-moab/main/prep_ocn_mod.F90
Outdated
| 'seq_maps.rc', 'rof2ocn_ice_rmapname:', 'rof2ocn_ice_rmaptype:',samegrid_ro, & | ||
| 'mapper_Rr2o_ice initialization', esmf_map_flag, no_match ) | ||
| ! us the same one for mapper_Rr2o_ice and mapper_Fr2o | ||
| #ifdef HAVE_MOAB |
There was a problem hiding this comment.
We should remove all HAVE_MOAB checks under driver-moab sources. Not for this PR - but it just occurred to me.
driver-moab/main/prep_ocn_mod.F90
Outdated
| ! with ids rof(1)%cplcompid, rmapid (rmapid is 100*src+tgt) | ||
| ! this will be used in send/receive mappers | ||
| type_grid = 3 ! this is type of grid | ||
| ierr = iMOAB_MigrateMapMesh ( mbrxid, mbintxro, mpicom_CPLID, mpigrp_CPLID, & |
There was a problem hiding this comment.
This should technically be within if (.not. compute_maps_online_r2o) then block. Even though r2o is always read from a file, the style should be consistent with the rest of the components.
also, remove #ifdef HAVE_MOAB #endif in this file
vijaysm
reviewed
Jul 31, 2025
| #endif | ||
| endif | ||
|
|
||
| context_id = rmapid ! ocn(1)%cplcompid*100+rof(1)%cplcompid |
There was a problem hiding this comment.
context_id statement should be within the if block as well. Anyway, I'll approve. We will refactor when we clean up the sources.
vijaysm
approved these changes
Jul 31, 2025
rljacob
added a commit
that referenced
this pull request
Aug 1, 2025
move map mesh migrate out of flood block map mesh migrate for r2o maps should happen always, even if flood is not present.
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.
move map mesh migrate out of flood block.
map mesh migrate for r2o maps should happen always, even if flood is not present.