Refactor MOAB mapping infrastructure to support more map types and specific area reads. #7495
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
iulian787
force-pushed
the
iulian787/load_map_areas
branch
from
1c85bfc to
890f1c2
Compare
vijaysm
requested changes
Jul 14, 2025
driver-moab/main/component_mod.F90
Outdated
| !tagname = 'mdl2drv'//C_NULL_CHAR | ||
| !ierr = iMOAB_SetDoubleTagStorage(mbccid , tagname, lsize , comp(1)%mbGridType, comp(1)%mdl2drv) | ||
| !if (ierr .ne. 0) then | ||
| ! call shr_sys_abort(subname//' cannot set new mdl2drv values for moab like those for mct ') |
There was a problem hiding this comment.
If these are all commented out, delete them. They serve no value.
driver-moab/main/component_mod.F90
Outdated
| fact = factors(i,1) ! mdl2drv tag | ||
| ! do nt use what we computed; use the values from mct driver | ||
| fact = comp(1)%mdl2drv(i) | ||
| ! fact = comp(1)%mdl2drv(i) |
driver-moab/main/prep_ocn_mod.F90
Outdated
| call moab_map_init_rcfile(mbrxid, mboxid, mbintxro, type_grid, & | ||
| 'seq_maps.rc', 'rof2ocn_liq_rmapname:', 'rof2ocn_liq_rmaptype:',samegrid_ro, & | ||
| wgtIdr2o_conservative, 'mapper_Rr2o_liq moab initialization',esmf_map_flag) | ||
| arearead, wgtIdr2o_conservative, 'mapper_Rr2o_liq moab initialization',esmf_map_flag) |
There was a problem hiding this comment.
@rljacob The code in https://github.com/E3SM-Project/E3SM/blob/master/driver-moab/main/component_mod.F90#L585 is confusing. Is the ROF aream essentially overwritten by rof2ocn_ice_rmapname ? Why is area loaded from both rof2ocn_liq_rmapname and rof2ocn_ice_rmapname?
Do we need to also modify the moab_map_init_rcfile call for rof2ocn_ice_rmapname?
|
@vijaysm were you able to merge / cherry-pick changes from vijaysm/add-more-read-maps ? |
change the MOAB api, and read areas from map files if directed so
to get to 0 differences with MOABCOMP we had to set correction factors from MCT; reverse that, because we are using now the same sources for aream and area, that are needed for correction factors
no functional difference change from iMOAB_FromMappingFile to iMOAB_LoadMapFile and from iMOAB_WriteMappingWeightsFile to iMOAB_WriteMapFile
change the MOAB api, and read areas from map files if directed so
to get to 0 differences with MOABCOMP we had to set correction factors from MCT; reverse that, because we are using now the same sources for aream and area, that are needed for correction factors
no functional difference change from iMOAB_FromMappingFile to iMOAB_LoadMapFile and from iMOAB_WriteMappingWeightsFile to iMOAB_WriteMapFile
if moab coupler instance active, create mct grid too, in debug mode
iulian787
force-pushed
the
iulian787/load_map_areas
branch
from
1f9fb29 to
3b6ef9e
Compare
…s not the case - leading to MCT-MOAB differences
rljacob
added
Coupler
vijaysm
approved these changes
Jul 25, 2025
rljacob
changed the title
rljacob
added a commit
that referenced
this pull request
Jul 25, 2025
Refactor MOAB mapping infrastructure to support more map types and specific area reads. Restructure the MOAB mapping system to use distinct weight identifiers for scalar and flux mappings across all component interactions. Also allow specifying which areas to read from the map for setting aream in the coupler. No longer need to copy MCT area correction factors mdl2drv/drv2mdl to MOAB. Now that areams are set correctly, can calculate them with MOAB data. Key changes: Replace single conservative weight IDs with separate scalar/flux IDs Add proper area reading controls for different map types Reorganize map initialization order and communication graph setup Clean up commented code and improve error messages Add support for vector mappings in atmosphere-ocean interactions Enhance ROF-to-ocean mapping with liquid/ice/flood distinctions Improve map file loading logic with better area handling Components affected: ATM-OCN: scalar_o2a/flux_o2a, bilinear_a2o/flux_a2o/vector_a2o ICE-ATM: scalar_i2a/flux_i2a LND-ATM: scalar_l2a/flux_l2a, scalar_a2l/flux_a2l ROF-OCN: flux_r2o_liq/flux_r2o_ice/flux_r2o ROF-ICE: scalar_r2i General cleanup of mdl2drv/drv2mdl area correction logic
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.
Refactor MOAB mapping infrastructure to support more map types and specific area reads.
Restructure the MOAB mapping system to use distinct weight identifiers
for scalar and flux mappings across all component interactions. Also allow specifying which areas to read from the map
for setting aream in the coupler.
No longer need to copy MCT area correction factors mdl2drv/drv2mdl to MOAB. Now that areams are set
correctly, can calculate them with MOAB data.
Key changes:
Components affected:
This is in coordination with
https://bitbucket.org/fathomteam/moab/pull-requests/745 from MOAB