Update CMEPS for postphases, ice sheets and glc->ocn dynamic mapping #28
Conversation
…water_option Update TFREEZE_SALTWATER_OPTION value for MOM6
cleanup and changes to be consistent with nems
restore cmake subdir and CMakeLists.txt that were removed from emc/develop in case they conflicted w/ ufs-weather build; testing with these files shows they have no impact (all cpld * datm tests pass)
changes to enable ocn->glc coupling at multiple levels This PR uses dynamic masking in the prep_phases_glc_mod in order to enable sending ocn data to glc. The ocean data is at multiple levels but with associated differences in the ocn bathymetry. Are changes expected to change answers? bit for bit Any User Interface Changes (namelist or namelist defaults changes)? Yes - added new nuopc_config variables ocn2glc_coupling and ocn2glc_levels (colon delimited string of ocean levels) Testing: CESM testlist_drv.xml machines and compilers: cheyenne/intel details (e.g. failed tests): compared to cmeps baselines dec06 and created new baseline dec19 CESM: repository to check out: https://github.com/ESCOMP/CESM.git branch: nuopc_dev_development hash: 1c90e71
|
I've merged in the latest escomp/master and verified that this PR is b4b w/ all current cpld and datm baselines. It is ready for review and merge. Orion logs here |
|
I need to resolve an issue w/ med_io_mod.F90 so I'm going to put this on hold for a day or so. |
*this mod was supposed to have been replaced in previous update to emc/develop but was found to still be the "performance" version which has caused issues in cesm testing. skip-ci
* the same issue found in prep_ice for the datm (scalar_id=0) was found in cesm using the gnu compiler. this commit implements an alternate fix suggested by escomp for the case when the netsw_cday is not obtained from the atm, yielding a scalar_id=0 *this commit also produces b4b results against the current baselines for both the cpld and datm
|
I have resolved two issues (see last two commit notes). I've tested both on cheyenne and no baselines change. I consider this PR now ready for review and merge. |
| @@ -16,18 +16,26 @@ Any User Interface Changes (namelist or namelist defaults changes)? | |||
| - [ ] No | |||
|
|
|||
| Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): | |||
There was a problem hiding this comment.
Do we want to change UFS-s2s to UFS coupled testing in the future since the UFS tests covers both weather and s2s?
There was a problem hiding this comment.
Good point. I'll make a note; she said she has an upcoming PR also so she could do it then.
| @@ -0,0 +1,47 @@ | |||
|
|
|||
| if (DEFINED ENV{ESMFMKFILE}) | |||
There was a problem hiding this comment.
UFS has FindESMF.cmake FindNetCDF.cmake FindPIO.cmake under CMakeModules/Modules, I assume ufs does not use the cmake here from CMEPS. Are these cmake related files used in CIME?
There was a problem hiding this comment.
Yes. There has been some confusion on my part for what is required for cime vs our build but I believe this to be good for both sides.
|
That was already included in an earlier commit for the packed field bundles. That loads all the fields into the undistributed dimension of a single field. That single field can then be mapped one time and then unpacked back into all the individual fields. |
|
@binli2337 can you please review and approve? Thanks. |
Description of changes
Specific notes
Changes have been tested in both ufs-cpld and ufs-datm and are B4B with current baselines: Hera Log
Additional run phases need to be added to the run sequences.
This PR is dependent on the merge of the latest changes to ESCOMP/master ESCOMP PR #148