Update CMEPS for postphases, ice sheets and glc->ocn dynamic mapping #28
This pull request is big! We’re only showing the most recent 250 commits.
Commits on Jun 26, 2020
Commits on Jul 1, 2020
Commits on Jul 5, 2020
Commits on Jul 6, 2020
Commits on Jul 7, 2020
-
Merge pull request NOAA-EMC#72 from alperaltuntas/change_tfreeze_salt…
…water_option Update TFREEZE_SALTWATER_OPTION value for MOM6
-
Merge pull request NOAA-EMC#75 from ESCOMP/mvertens/nems_changes
cleanup and changes to be consistent with nems
Commits on Jul 20, 2020
Commits on Jul 21, 2020
Commits on Jul 22, 2020
Commits on Jul 24, 2020
Commits on Jul 27, 2020
Commits on Jul 28, 2020
-
Merge pull request NOAA-EMC#81 from ESCOMP/update_hafs
more update for HAFS app
Commits on Jul 29, 2020
Commits on Aug 2, 2020
Commits on Aug 12, 2020
Commits on Aug 14, 2020
-
-
-
-
remove error codes on LOGMSG write remote chk_error on return codes from LOGMSG writes
-
-
-
Commits on Aug 15, 2020
-
Merge pull request NOAA-EMC#94 from DeniseWorthen/feature/updcmeps
Feature/updcmeps Fixes minor bug when using FB_diagnose in prep_ocn Adds reading dbug_flag from configuration file Code clean-up: Removes return code for LogWrites and associated chkerr calls
Commits on Aug 18, 2020
Commits on Sep 3, 2020
Commits on Sep 4, 2020
-
Merge pull request NOAA-EMC#99 from danrosen25/fix/esmfversion
Fix CPP ESMF_VERSION_MAJOR and ESMF_VERSION_MINOR definitions.
Commits on Sep 12, 2020
Commits on Sep 13, 2020
-
-
combine fields exchange for nems orig/data; make corresponding
changes in prep_ocn
-
remove nems_data prep_ocn; make nems prep_ocn work for all nems modes
regression tests fail comparison of mediator restart files but all other files reproduce. cprnc not working on orion, so will run on hera to try to determine cause
Commits on Sep 18, 2020
Commits on Sep 21, 2020
-
-
-
Merge pull request NOAA-EMC#103 from DeniseWorthen/feature/prepocn_cl…
…eanup NEMS prep ocn cleanup
Commits on Sep 25, 2020
-
Merge pull request NOAA-EMC#104 from ESCOMP/fix_coupling_mode
Minor fix for CIME interface
Commits on Sep 28, 2020
Commits on Sep 30, 2020
Commits on Oct 1, 2020
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Merge pull request NOAA-EMC#109 from jedwards4b/add_cmake_and_github_…
…actions cmake and action without dir changes
-
-
-
Commits on Oct 4, 2020
Commits on Oct 6, 2020
Commits on Oct 7, 2020
-
Merge pull request NOAA-EMC#110 from ESCOMP/mvertens/bugfix_fractions
changes for bugfix fractions This fixes a substantial bug in that the ice/ocean mask was mapped from the ocean mesh to the atm mesh using conservative mapping with a normtype of DSTFRAC rather than a normtype of DSTAREA. The result was that the land fraction on the atm mesh was always just 0/1 and the ocean fraction in non-polar regions was 0/1 on the coasts. This PR fixes this. Also, as part of this PR a clean up of med_map_mod.F90 was done for generating the maps that were needed by med_fraction_mod.F90.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Commits on Oct 8, 2020
Commits on Oct 9, 2020
Commits on Oct 13, 2020
Commits on Oct 14, 2020
Commits on Oct 15, 2020
-
Merge pull request NOAA-EMC#107 from ESCOMP/jedwards/newdiags
new water and energy budget diagnostics
Commits on Oct 16, 2020
-
Merge pull request NOAA-EMC#114 from hafs-community/feature/hafs
Clean up esmFldsExchange_hafs_mod.F90 file
Commits on Oct 19, 2020
Commits on Oct 23, 2020
-
-
-
-
-
-
Merge pull request NOAA-EMC#117 from jedwards4b/diags_optional_in_con…
…figfile Diags optional in configfile
Commits on Oct 26, 2020
Commits on Oct 27, 2020
Commits on Oct 28, 2020
-
Merge pull request NOAA-EMC#120 from ESCOMP/mvertens/fix_rofflooc
fixes for how river runoff is sent to ocean
-
Merge pull request NOAA-EMC#119 from jedwards4b/remove_alb_xcompset
remove albedo from the X compset
Commits on Oct 29, 2020
-
Merge pull request NOAA-EMC#121 from ESCOMP/feature/hafs_cdeps_fixed
Modifications for HAFS+CDEPS integration
Commits on Oct 30, 2020
-
-
Merge pull request NOAA-EMC#123 from jedwards4b/gnu_compiler_fix
original code failed with rc2 error using gnu compiler
Commits on Oct 31, 2020
Commits on Nov 1, 2020
Commits on Nov 2, 2020
-
Merge pull request NOAA-EMC#122 from ESCOMP/mvertens/perf
performance upgrades - primarily creation of packed fields for regridding
Commits on Nov 4, 2020
-
Merge pull request NOAA-EMC#125 from ESCOMP/mvertens/fix_restart_bug
backing out changes to med_io_mod.F90 should fix restart problem
-
Commits on Nov 6, 2020
Commits on Nov 10, 2020
-
Merge pull request ESCOMP#129 from ESCOMP/mvertens/fix_preplnd_bug
fixed bugs in med_phases_prep_lnd and med_phases_diag_mod
Commits on Nov 13, 2020
Commits on Nov 14, 2020
Commits on Nov 15, 2020
Commits on Nov 16, 2020
-
Merge pull request NOAA-EMC#99 from danrosen25/fix/esmfversion
Fix CPP ESMF_VERSION_MAJOR and ESMF_VERSION_MINOR definitions.
Commits on Nov 17, 2020
-
-
Merge pull request ESCOMP#135 from jedwards4b/remerge_esmf_versioning
Merge pull request NOAA-EMC#99 from danrosen25/fix/esmfversion
-
Merge pull request ESCOMP#134 from ESCOMP/mvertens/fixpreplnd
fix med_phases_prep_lnd problem introduced in PR#129 Description of changes This undoes the med_phases_prep_lnd changes introduced in PR#129 Specific notes Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Are changes expected to change answers? bit for bit - with nov03 baseline - but not with nov06 baseline different at roundoff level more substantial Any User Interface Changes (namelist or namelist defaults changes)? Yes No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): (required) CIME_DRIVER=nuopc scripts_regression_tests.py machines: details (e.g. failed tests): (required) CESM testlist_drv.xml machines and compilers: cheyenne, intel details (e.g. failed tests): all of the tests are now bfb with the nov03 baseline but not with the nov06 baseline new nov15 baseline created (optional) CESM prealpha test machines and compilers details (e.g. failed tests): Testing performed if application target is UFS-S2S: (required) UFS-S2S testing description: details (e.g. failed tests): Hashes used for testing: CESM: repository to check out: https://github.com/ESCOMP/CESM.git branch: nuopc_dev hash: f9f8324 UFS-S2S, then umbrella repostiory to check out and associated hash: repository to check out: branch: hash:
Commits on Nov 21, 2020
-
Call GLC at the end of the day rather than the start
Previously, CISM was being called at the start of December 31, with data from December 31 of the previous year through December 30 of the current year. The desired behavior is for CISM to be called at the end of December 31, with data from January 1 of the current year through December 31 of the current year. This commit fixes that behavior.
Commits on Nov 24, 2020
-
Merge pull request ESCOMP#138 from ESCOMP/mvertens/fixglc_runseq
Call GLC at the end of the day rather than the start Note that @mvertens will do more testing in an upcoming PR ### Description of changes Previously, CISM was being called at the start of December 31, with data from December 31 of the previous year through December 30 of the current year. The desired behavior is for CISM to be called at the end of December 31, with data from January 1 of the current year through December 31 of the current year. This commit fixes that behavior. ### Specific notes Contributors other than yourself, if any: @mvertens CMEPS Issues Fixed (include github issue #): none Are changes expected to change answers? - [ ] bit for bit - [ ] different at roundoff level - [x] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [x] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [ ] (required) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: - details (e.g. failed tests): - [ ] (required) CESM testlist_drv.xml - machines and compilers: - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): Testing performed if application target is UFS-S2S: - [ ] (required) UFS-S2S testing - description: - details (e.g. failed tests): Hashes used for testing: - [ ] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - branch: nuopc_dev - hash: - [ ] UFS-S2S, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash:
Commits on Nov 25, 2020
Commits on Nov 26, 2020
Commits on Nov 27, 2020
Commits on Nov 28, 2020
-
Merge pull request ESCOMP#139 from ESCOMP/mvertens/fixprepglc
Validation fixes for running with evolving CISM ### Description of changes Validation fixes for running with evolving CISM ### Specific notes 1. CMEPS changes that were introduced as part of the validation of the compset I1850Clm50SpG -which contains an evolving ice sheet. 2. This work also needed to be accompanied by associated CISM changes that are in the nuopc_dev hash listed below. 3. Also validated using the CTSM master code base. As a result all baseline comparisons that contain CLM will fail. 4. A new reworked testlist_drv.xml that contains a test fo rI1850CLM50SpG and also removes all SMS tests that had duplicate ERS tests. Contributors other than yourself, if any: @billsacks CMEPS Issues Fixes: ESCOMP#128 Are changes expected to change answers? - [x] bit for bit (all compsets not containing CTSM) - [ ] different at roundoff level - [x] more substantial (all compsets containing CTSM) Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [x] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [ ] (required) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: - details (e.g. failed tests): - [x] (required) CESM testlist_drv.xml - machines and compilers: cheyenne intel - details (e.g. failed tests): two sets of baselines were created cmeps_baselines/nov24 contains output for the original testlist_drv.xml cmeps_baselines/nov24newtests contains output for the new testlist_drv.xml and should be used for future comparisons - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): Testing performed if application target is UFS-S2S: - [ ] (required) UFS-S2S testing - description: - details (e.g. failed tests): Hashes used for testing: - [x] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - branch: nuopc_dev - hash: 23cb395 - [ ] UFS-S2S, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash:
Commits on Nov 30, 2020
Commits on Dec 1, 2020
-
Merge pull request ESCOMP#140 from ESCOMP/mvertens/icesheets
new multiple ice sheet functionality Description of changes Permit GLC (CISM, XGLC) to send multiple ice sheets on different meshes Specific notes This PR does the following: Adds new capability to CISM and CMEPS in order for CISM to send multiple ice sheet data on different meshes to the mediator. Simplifies the addmrg call in esmFldsExchange_cesm.F90, esmFldsExchange_nems.F90 and esmFldsExchange_hafs.F90 so that the integer index is not longer in the merge calls. This was needed due to the addition of new ice sheet functionality - but should have been this way from the beginning. As an example for nems: old: call addmrg(fldListTo(compatm)%flds, trim(fldname), mrg_from1=compice, mrg_fld1=trim(fldname), mrg_type1='copy') new: call addmrg(fldListTo(compatm)%flds, trim(fldname), mrg_from=compice, mrg_fld=trim(fldname), mrg_type='copy') As an example for cesm: old: call addmrg(fldListTo(compatm)%flds , 'Sx_'//trim(suffix(n)), & mrg_from1=complnd, mrg_fld1='Sl_'//trim(suffix(n)), mrg_type1='merge', mrg_fracname1='lfrac', & mrg_from2=compice, mrg_fld2='Si_'//trim(suffix(n)), mrg_type2='merge', mrg_fracname2='ifrac', & mrg_from3=compmed, mrg_fld3='So_'//trim(suffix(n)), mrg_type3='merge', mrg_fracname3='ofrac') new: call addmrg(fldListTo(compatm)%flds , 'Sx_'//trim(suffix(n)), & mrg_from=complnd, mrg_fld='Sl_'//trim(suffix(n)), mrg_type='merge', mrg_fracname='lfrac') call addmrg(fldListTo(compatm)%flds , 'Sx_'//trim(suffix(n)), & mrg_from=compice, mrg_fld='Si_'//trim(suffix(n)), mrg_type='merge', mrg_fracname='ifrac') call addmrg(fldListTo(compatm)%flds , 'Sx_'//trim(suffix(n)), & mrg_from=compmed, mrg_fld='So_'//trim(suffix(n)), mrg_type='merge', mrg_fracname='ofrac') Based on feedback from @billsacks - new wrappers were added to getting pointer data for a field in an ESMF field bundle and ESMF field. The new wrapper has the following syntax: old: call ESMF_FieldBundleGet(is_local%wrap%FBImp(complnd,complnd) , fieldname='Sl_lfrin', field=lfield, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return call ESMF_FieldGet(lfield, farrayPtr=Sl_lfrin, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return new: call fldbun_getdata1d(is_local%wrap%FBImp(complnd,complnd) , 'Sl_lfrin', Sl_lfrin, rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return This PR needed new branches to be created for cime and cism. These are contained in the nuopc_dev hash below - but separate PRs willneed to be done to bring these to master. Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Resolves ESCOMP#131 Are changes expected to change answers? bit for bit different at roundoff level more substantial Any User Interface Changes (namelist or namelist defaults changes)? Yes No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): (required) CIME_DRIVER=nuopc scripts_regression_tests.py machines: details (e.g. failed tests): (required) CESM testlist_drv.xml machines and compilers: cheyenne/intel details (e.g. failed tests): compared to nuopc_dev hash db0d278 (cmeps baseline nov24newtests) and generated new baselines nov28. All tests were bfb except 1 roundoff level field in the X compset tests. (optional) CESM prealpha test machines and compilers details (e.g. failed tests): Testing performed if application target is UFS-S2S: (required) UFS-S2S testing description: verified that all RTs pass for ufs-model (fe5a943) substituting this branch for CMEPS. details (e.g. failed tests): Hashes used for testing: CESM: repository to check out: https://github.com/ESCOMP/CESM.git branch: nuopc_dev hash: 22a7a27 UFS-S2S, then umbrella repostiory to check out and associated hash: repository to check out: branch: fe5a943 hash:
Commits on Dec 2, 2020
Commits on Dec 3, 2020
Commits on Dec 4, 2020
Commits on Dec 5, 2020
Commits on Dec 6, 2020
Commits on Dec 8, 2020
-
Merge pull request ESCOMP#146 from ESCOMP/mvertens/postphases
Introduction of new post phases for performance updates Description of changes Introduction of new post phases for performance updates Specific notes This PR introduces new post phases for each component in order to remove duplicate mappings that were done in the prep phases. Code Changes: mapping has been moved from prep phases and put into the relevant post phases - EXCEPT for cases where updated ice fraction is needed in the mapping med_merge_mod.F90 has been modified to zero out fields in the appropriate place (this should have been done this way in the initial implementation) med_fraction_set is now a method that is called from med_phases_post_ice med_phases_prep_ocn_map is no longer needed, med_phases_prep_ocn_merge and med_phases_prep_accum_fast have been unified into med_phases_prep_ocn_accum Run Sequence Changes: the auto generated runsequences in CIME have been modified to account for this the following should be the new run sequence for UFS CMEPS warm run sequence runSeq:: @3600 MED med_phases_prep_ocn_avg MED -> OCN :remapMethod=redist OCN @900 MED med_phases_prep_atm MED med_phases_prep_ice MED -> ATM :remapMethod=redist MED -> ICE :remapMethod=redist ATM ICE ATM -> MED :remapMethod=redist MED med_phases_post_atm ICE -> MED :remapMethod=redist MED med_phases_post_ice MED med_phases_prep_ocn_accum @ OCN -> MED :remapMethod=redist MED med_phases_post_ocn MED med_phases_restart_write MED med_phases_profile @ :: Contributors other than yourself, if any: None CMEPS Issues Fixes: ESCOMP#145, ESCOMP#141 Are changes expected to change answers? bit for bit The results are bfb EXCEPT for the following mediator history differences due to the introduction of post phases: AtmImp_ocn_xxx lndExp_Sg_ice_covered_elevN and lndExp_Sg_topo_elevN in ERS_Vnuopc_Ld5.T31_g37_gl20.I1850Clm50SpG different at roundoff level more substantial Any User Interface Changes (namelist or namelist defaults changes)? Yes - the run sequence is different No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py machines: details (e.g. failed tests): (required) CESM testlist_drv.xml machines and compilers: cheyenne/intel details (e.g. failed tests): compared to baseline nov28newrunseq/ and generated new baselines dec06 (optional) CESM prealpha test machines and compilers details (e.g. failed tests): Testing performed if application target is UFS-S2S: (required) UFS-S2S testing description: details (e.g. failed tests): Hashes used for testing: CESM: repository to check out: https://github.com/ESCOMP/CESM.git branch: nuopc_dev hash: 2b951f2 This has contains branches for CDEPS and CIME (in addition to CMEPS) that need to have PRs to master. UFS-S2S, then umbrella repostiory to check out and associated hash: repository to check out: branch: hash:
Commits on Dec 14, 2020
Commits on Dec 16, 2020
Commits on Dec 17, 2020
Commits on Dec 19, 2020
Commits on Dec 21, 2020
Commits on Dec 22, 2020
Commits on Dec 23, 2020
-
Merge remote-tracking branch 'escomp/mvertens/ocn2glc_coupling' into …
…feature/updcmeps
-
Commits on Dec 30, 2020
-
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)
Commits on Jan 5, 2021
-
Merge pull request ESCOMP#148 from ESCOMP/mvertens/ocn2glc_coupling
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
Commits on Jan 6, 2021
Commits on Jan 7, 2021
-
update med_io_mod for version currently in cmeps/master
*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
-
alternate fix for scalar_id=0 case
* 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
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.