From 7b826d43b71a9daa74598f65399f7f23b85151ee Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:30:58 +0000 Subject: [PATCH 01/15] update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 0e05075456..3f5b8d4914 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0e05075456800f0c5abd7bfb1ce6f89b26dd7989 +Subproject commit 3f5b8d4914e5bb4e87e0a5f56d95db5cd5fc0bf5 From cea6fc69411248b50142291191fcfc9f0bd04d94 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:34:38 +0000 Subject: [PATCH 02/15] update hera.intel modulefiles for testing --- modulefiles/hera.intel/fv3 | 2 +- modulefiles/hera.intel/fv3_debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3 index 7b20135794..c9f5e76e7f 100644 --- a/modulefiles/hera.intel/fv3 +++ b/modulefiles/hera.intel/fv3 @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_27 +module load esmf/8_1_0_beta_snapshot_47 module load bacio/2.4.1 module load crtm/2.3.0 diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug index dd65fa1b95..8ee2ef433c 100644 --- a/modulefiles/hera.intel/fv3_debug +++ b/modulefiles/hera.intel/fv3_debug @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_27-debug +module load esmf/8_1_0_beta_snapshot_47-debug module load bacio/2.4.1 module load crtm/2.3.0 From 071275bcdb6e2d376aad395266803c10f6ab287e Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:37:54 +0000 Subject: [PATCH 03/15] Revert "update hera.intel modulefiles for testing" This reverts commit cea6fc69411248b50142291191fcfc9f0bd04d94. --- modulefiles/hera.intel/fv3 | 2 +- modulefiles/hera.intel/fv3_debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3 index c9f5e76e7f..7b20135794 100644 --- a/modulefiles/hera.intel/fv3 +++ b/modulefiles/hera.intel/fv3 @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_47 +module load esmf/8_1_0_beta_snapshot_27 module load bacio/2.4.1 module load crtm/2.3.0 diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug index 8ee2ef433c..dd65fa1b95 100644 --- a/modulefiles/hera.intel/fv3_debug +++ b/modulefiles/hera.intel/fv3_debug @@ -28,7 +28,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.1 -module load esmf/8_1_0_beta_snapshot_47-debug +module load esmf/8_1_0_beta_snapshot_27-debug module load bacio/2.4.1 module load crtm/2.3.0 From 4db2ff2378ab69fb71b7c91ca6490c8c960b1c75 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 27 Mar 2021 12:38:33 +0000 Subject: [PATCH 04/15] Revert "update FV3" This reverts commit 7b826d43b71a9daa74598f65399f7f23b85151ee. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 3f5b8d4914..0e05075456 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 3f5b8d4914e5bb4e87e0a5f56d95db5cd5fc0bf5 +Subproject commit 0e05075456800f0c5abd7bfb1ce6f89b26dd7989 From 52f688b606b42af75ff7b50484de03b5c1da26ca Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Tue, 1 Jun 2021 08:26:23 -0400 Subject: [PATCH 05/15] update CMEPS for escompPR --- .gitmodules | 6 ++++-- CMEPS-interface/CMEPS | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 30bac3386e..8e6854b912 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,8 +20,10 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - url = https://github.com/NOAA-EMC/CMEPS.git - branch = emc/develop + #url = https://github.com/NOAA-EMC/CMEPS.git + #branch = emc/develop + url = https://github.com/DeniseWorthen/CMEPS.git + branch = feature/escompPR [submodule "MOM6"] path = MOM6-interface/MOM6 url = https://github.com/NOAA-EMC/MOM6 diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 1513f5ccd3..94c588149c 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 1513f5ccd3642cea19ac90e9b343ccf4c06d367f +Subproject commit 94c588149cc3f3881339e31e0b89a99ea09b23b5 From e172ab56da4a2c29d205c1c0370fd86f842f1689 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 11 Jun 2021 13:49:46 -0400 Subject: [PATCH 06/15] update CMEPS --- CMEPS-interface/CMEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 94c588149c..94964bf3d2 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 94c588149cc3f3881339e31e0b89a99ea09b23b5 +Subproject commit 94964bf3d28e14fd400e8804cdf44a990dbbca29 From cb7787d6e4c34db69292ad6286f30ab85a1b37be Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 11 Jun 2021 13:51:24 -0600 Subject: [PATCH 07/15] remove ESMF > 8 statements from CMakeLists.txt --- CMEPS-interface/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt index bf2a924d8a..1ee3a47b23 100644 --- a/CMEPS-interface/CMakeLists.txt +++ b/CMEPS-interface/CMakeLists.txt @@ -64,13 +64,9 @@ list(APPEND _mediator_files CMEPS/mediator/med_phases_post_rof_mod.F90 CMEPS/mediator/med_phases_post_wav_mod.F90) -list(APPEND _mediator_defs ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR} - ESMF_VERSION_MINOR=${ESMF_VERSION_MINOR}) - ### Create target library and set PUBLIC interfaces on the library add_library(cmeps STATIC ${_nems_util_files} ${_mediator_files}) set_target_properties(cmeps PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod) -target_compile_definitions(cmeps PUBLIC "${_mediator_defs}") target_include_directories(cmeps PUBLIC $ $) target_link_libraries(cmeps PUBLIC esmf From b239304273b0c54d173bd1537016f6442161dfa6 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Thu, 24 Jun 2021 11:48:31 -0400 Subject: [PATCH 08/15] update CMEPS submodule --- CMEPS-interface/CMEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 94964bf3d2..cc6f2b953e 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 94964bf3d28e14fd400e8804cdf44a990dbbca29 +Subproject commit cc6f2b953e50f7b82efff2fea3b82377b2aaf75a From 56aec027f47563a76f37b3589db643039672fae0 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 21 Aug 2021 06:06:44 -0400 Subject: [PATCH 09/15] add new config settings to nems.configure --- tests/parm/nems.configure.cpld.IN | 3 +++ tests/parm/nems.configure.cpld_wave.IN | 3 +++ tests/parm/nems.configure.datm.IN | 3 +++ tests/parm/nems.configure.datm_cdeps.IN | 3 +++ tests/parm/nems.configure.hafs_atm_docn.IN | 3 +++ tests/parm/nems.configure.hafs_atm_ocn.IN | 3 +++ 6 files changed, 18 insertions(+) diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN index 2019093325..7302fa0547 100644 --- a/tests/parm/nems.configure.cpld.IN +++ b/tests/parm/nems.configure.cpld.IN @@ -102,4 +102,7 @@ ALLCOMP_attributes:: use_coldstart = @[use_coldstart] use_mommesh = @[use_mommesh] eps_imesh = @[eps_imesh] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 :: diff --git a/tests/parm/nems.configure.cpld_wave.IN b/tests/parm/nems.configure.cpld_wave.IN index b0d2756b2b..56baf0b670 100644 --- a/tests/parm/nems.configure.cpld_wave.IN +++ b/tests/parm/nems.configure.cpld_wave.IN @@ -116,4 +116,7 @@ ALLCOMP_attributes:: use_coldstart = @[use_coldstart] use_mommesh = @[use_mommesh] eps_imesh = @[eps_imesh] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 :: diff --git a/tests/parm/nems.configure.datm.IN b/tests/parm/nems.configure.datm.IN index ccf8bd03da..9cbf92f30c 100644 --- a/tests/parm/nems.configure.datm.IN +++ b/tests/parm/nems.configure.datm.IN @@ -106,4 +106,7 @@ ALLCOMP_attributes:: flux_convergence = @[flux_convergence] flux_max_iteration = @[flux_iteration] ocn_surface_flux_scheme = @[flux_scheme] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 :: diff --git a/tests/parm/nems.configure.datm_cdeps.IN b/tests/parm/nems.configure.datm_cdeps.IN index 791238413b..17f42b8dab 100644 --- a/tests/parm/nems.configure.datm_cdeps.IN +++ b/tests/parm/nems.configure.datm_cdeps.IN @@ -118,4 +118,7 @@ ALLCOMP_attributes:: orb_mode = fixed_year orb_mvelp = 1.e36 orb_obliq = 1.e36 + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 :: diff --git a/tests/parm/nems.configure.hafs_atm_docn.IN b/tests/parm/nems.configure.hafs_atm_docn.IN index 1c38776174..bc6032f093 100644 --- a/tests/parm/nems.configure.hafs_atm_docn.IN +++ b/tests/parm/nems.configure.hafs_atm_docn.IN @@ -90,6 +90,9 @@ ALLCOMP_attributes:: orb_obliq = 1.e36 mediator_read_restart = @[USE_COLDSTART] mediator_present = true + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 :: ATM_modelio:: diff --git a/tests/parm/nems.configure.hafs_atm_ocn.IN b/tests/parm/nems.configure.hafs_atm_ocn.IN index 5a64442462..980420fd30 100644 --- a/tests/parm/nems.configure.hafs_atm_ocn.IN +++ b/tests/parm/nems.configure.hafs_atm_ocn.IN @@ -111,6 +111,9 @@ ALLCOMP_attributes:: orb_obliq = 1.e36 mediator_read_restart = @[USE_COLDSTART] mediator_present = true + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 :: ATM_modelio:: From 0680141eb04792647b2f6f36a9c37c52e9e44ef4 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Sat, 21 Aug 2021 06:09:47 -0400 Subject: [PATCH 10/15] update esmf for testing cmeps --- modulefiles/ufs_common | 2 +- modulefiles/ufs_common_debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common index 6c2b90b02b..68c152a316 100644 --- a/modulefiles/ufs_common +++ b/modulefiles/ufs_common @@ -7,7 +7,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.2 -module load esmf/8_1_1 +module load esmf/8_2_0_beta_snapshot_14 module load fms/2020.04.03 module load bacio/2.4.1 diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug index d44d45fb04..07a379f9cd 100644 --- a/modulefiles/ufs_common_debug +++ b/modulefiles/ufs_common_debug @@ -7,7 +7,7 @@ module load png/1.6.35 module load hdf5/1.10.6 module load netcdf/4.7.4 module load pio/2.5.2 -module load esmf/8_1_1-debug +module load esmf/8_2_0_beta_snapshot_14-debug module load fms/2020.04.03 module load bacio/2.4.1 From e759a95727061133669a7b6b0285ebbe40d29d71 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Tue, 7 Sep 2021 18:06:09 -0400 Subject: [PATCH 11/15] update CMEPS w/ fix for dststatus_print --- CMEPS-interface/CMEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index be343d8ec8..233a89b7cd 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit be343d8ec84e3b940b1cabb0e2546c5393f9c602 +Subproject commit 233a89b7cde0215e23e4d20db14dca5ff6df8a5b From ef187d824c54bcc1a045c8497827d7adb51d5fae Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 8 Oct 2021 16:20:51 +0000 Subject: [PATCH 12/15] all cpld, hafs and cdeps related tests pass * coupler restart files pass comparison w/ alt check, all other files are b4b * several forecast files for hafs_regional pass w/ alt check From b0d35dcd2f3406c94edaab324c689819d44f1b92 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 8 Oct 2021 17:19:23 +0000 Subject: [PATCH 13/15] update CMEPS with addition of accum bundle refactor * all tests using CMEPS will change baseline because of change in the number and names of the accum fields in the mediator restart file. All common fields in the mediator restart file are B4B. All other restart files are B4B. --- CMEPS-interface/CMEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 233a89b7cd..c26a1b65a6 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 233a89b7cde0215e23e4d20db14dca5ff6df8a5b +Subproject commit c26a1b65a6d0d1934ecab0ddd72babdeb020e761 From f42b67015f594528846989967ffb47c12cbd9562 Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Wed, 13 Oct 2021 13:34:55 -0400 Subject: [PATCH 14/15] update CMEPS to include history refactor --- CMEPS-interface/CMEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index c26a1b65a6..aae1fe93c7 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit c26a1b65a6d0d1934ecab0ddd72babdeb020e761 +Subproject commit aae1fe93c71b9966c8be34889205816cfde1f4fc From 8b8c82b228e8d337e1f99b755cc87cde8fd23ded Mon Sep 17 00:00:00 2001 From: "denise.worthen" Date: Fri, 15 Oct 2021 15:39:25 -0600 Subject: [PATCH 15/15] update CMEPS with latest bugfixes for CISM --- CMEPS-interface/CMEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index aae1fe93c7..a0011cb402 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit aae1fe93c71b9966c8be34889205816cfde1f4fc +Subproject commit a0011cb4021b7b271145fa82f281c0b61da92add