Skip to content

Commit

Permalink
Update CMEPS (NOAA-EMC#345)
Browse files Browse the repository at this point in the history 
* Update CMEPS for recent changes, including addition of new run "post" run phases to eliminate redundant mapping, multiple ice sheet capability and ocn->land ice dynamic mapping
* Add a new test fv3_gfs_v16_RRTMGP_c192L127

Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
  • Loading branch information
@DeniseWorthen @junwang-noaa
DeniseWorthen and junwang-noaa committed Jan 12, 2021
1 parent e7bcc2d commit 6daad90
Show file tree
Hide file tree
Showing 19 changed files with 2,112 additions and 1,209 deletions.
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 46 files
+15 −3 .github/pull_request_template.md
+48 −0 CMakeLists.txt
+1 −5 cime_config/buildnml
+189 −9 cime_config/namelist_definition_drv.xml
+26 −20 cime_config/runseq/runseq_D.py
+0 −82 cime_config/runseq/runseq_NEMS.py
+2 −3 cime_config/runseq/runseq_TG.py
+91 −65 cime_config/runseq/runseq_general.py
+12 −64 cime_config/testdefs/testlist_drv.xml
+47 −0 cmake/FindESMF.cmake
+103 −0 cmake/FindPIO.cmake
+104 −0 cmake/LibCheck.cmake
+333 −0 cmake/LibFind.cmake
+39 −0 mediator/CMakeLists.txt
+15 −4 mediator/Makefile
+57 −87 mediator/esmFlds.F90
+420 −337 mediator/esmFldsExchange_cesm_mod.F90
+34 −22 mediator/esmFldsExchange_hafs_mod.F90
+17 −15 mediator/esmFldsExchange_nems_mod.F90
+14 −0 mediator/fd_cesm.yaml
+482 −265 mediator/med.F90
+291 −180 mediator/med_diag_mod.F90
+83 −126 mediator/med_fraction_mod.F90
+3 −27 mediator/med_internalstate_mod.F90
+201 −155 mediator/med_io_mod.F90
+3 −6 mediator/med_map_mod.F90
+21 −15 mediator/med_merge_mod.F90
+117 −5 mediator/med_methods_mod.F90
+36 −13 mediator/med_phases_aofluxes_mod.F90
+1 −1 mediator/med_phases_history_mod.F90
+1 −1 mediator/med_phases_ocnalb_mod.F90
+103 −0 mediator/med_phases_post_atm_mod.F90
+569 −0 mediator/med_phases_post_glc_mod.F90
+104 −0 mediator/med_phases_post_ice_mod.F90
+152 −0 mediator/med_phases_post_lnd_mod.F90
+93 −0 mediator/med_phases_post_ocn_mod.F90
+96 −0 mediator/med_phases_post_rof_mod.F90
+79 −0 mediator/med_phases_post_wav_mod.F90
+120 −136 mediator/med_phases_prep_atm_mod.F90
+864 −621 mediator/med_phases_prep_glc_mod.F90
+84 −132 mediator/med_phases_prep_ice_mod.F90
+62 −406 mediator/med_phases_prep_lnd_mod.F90
+46 −175 mediator/med_phases_prep_ocn_mod.F90
+215 −193 mediator/med_phases_prep_rof_mod.F90
+3 −7 mediator/med_phases_profile_mod.F90
+7 −0 nems/util/CMakeLists.txt
9 changes: 8 additions & 1 deletion CMEPS-interface/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,14 @@ list(APPEND _mediator_files
CMEPS/mediator/med_fraction_mod.F90
CMEPS/mediator/med_phases_aofluxes_mod.F90
CMEPS/mediator/med_io_mod.F90
CMEPS/mediator/med_diag_mod.F90)
CMEPS/mediator/med_diag_mod.F90
CMEPS/mediator/med_phases_post_atm_mod.F90
CMEPS/mediator/med_phases_post_ice_mod.F90
CMEPS/mediator/med_phases_post_ocn_mod.F90
CMEPS/mediator/med_phases_post_lnd_mod.F90
CMEPS/mediator/med_phases_post_glc_mod.F90
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}
Expand Down
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 1 files
+1 −1 ccpp/physics
50 changes: 25 additions & 25 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Thu Jan 7 14:10:30 MST 2021
Mon Jan 11 11:12:01 MST 2021
Start Regression test


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfdlmp_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfdlmp_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfdlmp_prod
Checking test 001 fv3_ccpp_gfdlmp results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -51,7 +51,7 @@ Test 001 fv3_ccpp_gfdlmp PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v15p2_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v15p2_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v15p2_prod
Checking test 002 fv3_ccpp_gfs_v15p2 results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -119,7 +119,7 @@ Test 002 fv3_ccpp_gfs_v15p2 PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v16beta_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v16beta_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v16beta_prod
Checking test 003 fv3_ccpp_gfs_v16beta results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -199,7 +199,7 @@ Test 003 fv3_ccpp_gfs_v16beta PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v16beta_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v16beta_restart_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v16beta_restart_prod
Checking test 004 fv3_ccpp_gfs_v16beta_restart results ....
Comparing phyf048.tile1.nc .........OK
Comparing phyf048.tile2.nc .........OK
Expand Down Expand Up @@ -249,7 +249,7 @@ Test 004 fv3_ccpp_gfs_v16beta_restart PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v16beta_stochy_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v16beta_stochy_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v16beta_stochy_prod
Checking test 005 fv3_ccpp_gfs_v16beta_stochy results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -317,7 +317,7 @@ Test 005 fv3_ccpp_gfs_v16beta_stochy PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v16beta_flake_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v16beta_flake_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v16beta_flake_prod
Checking test 006 fv3_ccpp_gfs_v16beta_flake results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -385,7 +385,7 @@ Test 006 fv3_ccpp_gfs_v16beta_flake PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v15p2_RRTMGP_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v15p2_RRTMGP_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v15p2_RRTMGP_prod
Checking test 007 fv3_ccpp_gfs_v15p2_RRTMGP results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -453,7 +453,7 @@ Test 007 fv3_ccpp_gfs_v15p2_RRTMGP PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v16beta_RRTMGP_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v16beta_RRTMGP_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v16beta_RRTMGP_prod
Checking test 008 fv3_ccpp_gfs_v16beta_RRTMGP results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -521,7 +521,7 @@ Test 008 fv3_ccpp_gfs_v16beta_RRTMGP PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gsd_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gsd_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gsd_prod
Checking test 009 fv3_ccpp_gsd results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -613,7 +613,7 @@ Test 009 fv3_ccpp_gsd PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_thompson_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_thompson_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_thompson_prod
Checking test 010 fv3_ccpp_thompson results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -681,7 +681,7 @@ Test 010 fv3_ccpp_thompson PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_thompson_no_aero_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_thompson_no_aero_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_thompson_no_aero_prod
Checking test 011 fv3_ccpp_thompson_no_aero results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -749,7 +749,7 @@ Test 011 fv3_ccpp_thompson_no_aero PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_rrfs_v1beta_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_rrfs_v1beta_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_rrfs_v1beta_prod
Checking test 012 fv3_ccpp_rrfs_v1beta results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -817,7 +817,7 @@ Test 012 fv3_ccpp_rrfs_v1beta PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/HAFS_v0_HWRF_thompson_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
Checking test 013 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -885,7 +885,7 @@ Test 013 fv3_ccpp_HAFS_v0_hwrf_thompson PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/ESG_HAFS_v0_HWRF_thompson_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
Checking test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
Comparing atmos_4xdaily.nc .........OK
Comparing phyf000.nc .........OK
Expand All @@ -903,7 +903,7 @@ Test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_control_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_control_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_control_debug_prod
Checking test 015 fv3_ccpp_control_debug results ....
Comparing phyf000.tile1.nc .........OK
Comparing phyf000.tile2.nc .........OK
Expand Down Expand Up @@ -933,7 +933,7 @@ Test 015 fv3_ccpp_control_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v15p2_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v15p2_debug_prod
Checking test 016 fv3_ccpp_gfs_v15p2_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1001,7 +1001,7 @@ Test 016 fv3_ccpp_gfs_v15p2_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v16beta_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v16beta_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v16beta_debug_prod
Checking test 017 fv3_ccpp_gfs_v16beta_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1069,7 +1069,7 @@ Test 017 fv3_ccpp_gfs_v16beta_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v15p2_RRTMGP_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
Checking test 018 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1137,7 +1137,7 @@ Test 018 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_gfs_v16beta_RRTMGP_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_gfs_v16beta_RRTMGP_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_gfs_v16beta_RRTMGP_debug_prod
Checking test 019 fv3_ccpp_gfs_v16beta_RRTMGP_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1205,7 +1205,7 @@ Test 019 fv3_ccpp_gfs_v16beta_RRTMGP_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/fv3_multigases_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_multigases_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_multigases_prod
Checking test 020 fv3_ccpp_multigases results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1279,7 +1279,7 @@ Test 020 fv3_ccpp_multigases PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/HAFS_v0_HWRF_thompson_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
Checking test 021 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1347,7 +1347,7 @@ Test 021 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210106/GNU/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_62180/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_13499/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
Checking test 022 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
Comparing atmos_4xdaily.nc .........OK
Comparing phyf000.nc .........OK
Expand All @@ -1365,5 +1365,5 @@ Test 022 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS


REGRESSION TEST WAS SUCCESSFUL
Thu Jan 7 14:28:33 MST 2021
Elapsed time: 00h:18m:04s. Have a nice day!
Mon Jan 11 11:29:36 MST 2021
Elapsed time: 00h:17m:35s. Have a nice day!
Loading

0 comments on commit 6daad90

Please sign in to comment.