Skip to content

Commit

Permalink
Update CMEPS for HAFS integration; add datm and coupled-model tests o…
Browse files Browse the repository at this point in the history 
…n Gaea (#401)


* Add HAFS support in NOAA-EMC/CMEPS 
* Add coupled and datm tests for Gaea.intel

Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov>
  • Loading branch information
@DeniseWorthen @junwang-noaa
3 people committed Feb 4, 2021
1 parent e3983a0 commit 13053c1
Show file tree
Hide file tree
Showing 15 changed files with 2,053 additions and 746 deletions.
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 41 files
+3 −3 .github/pull_request_template.md
+16 −6 .github/workflows/extbuild.yml
+0 −4 .gitmodules
+2 −2 CMakeLists.txt
+16 −7 Makefile
+10 −5 cime_config/buildnml
+16 −8 cime_config/config_component.xml
+3 −1 cime_config/config_component_cesm.xml
+9 −100 cime_config/namelist_definition_drv.xml
+3 −23 cime_config/testdefs/testlist_drv.xml
+0 −1 doc/source/field_naming_convention.rst
+1 −1 mediator/CMakeLists.txt
+5 −5 mediator/Makefile
+17 −2 mediator/esmFlds.F90
+440 −49 mediator/esmFldsExchange_hafs_mod.F90
+0 −485 mediator/fd_hafs.yaml
+40 −0 mediator/fd_nems.yaml
+26 −10 mediator/med.F90
+140 −94 mediator/med_fraction_mod.F90
+60 −10 mediator/med_map_mod.F90
+15 −6 mediator/med_methods_mod.F90
+0 −1 mediator/med_phases_prep_ice_mod.F90
+15 −31 mediator/med_phases_prep_lnd_mod.F90
+22 −8 mediator/med_phases_prep_rof_mod.F90
+0 −2 mediator/med_utils_mod.F90
+0 −1 nems/lib/genf90
+0 −0 util/CMakeLists.txt
+6 −3 util/Makefile
+0 −0 util/dtypes.h
+0 −0 util/genf90.pl
+0 −0 util/glc_elevclass_mod.F90
+0 −0 util/perf_mod.F90
+0 −0 util/shr_abort_mod.F90
+0 −0 util/shr_const_mod.F90
+0 −0 util/shr_flux_mod.F90
+0 −0 util/shr_kind_mod.F90
+0 −0 util/shr_log_mod.F90
+0 −0 util/shr_mem_mod.F90
+0 −0 util/shr_mpi_mod.F90
+0 −0 util/shr_pio_mod.F90
+0 −0 util/shr_sys_mod.F90
22 changes: 11 additions & 11 deletions CMEPS-interface/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ else()
endif()

list(APPEND _nems_util_files
CMEPS/nems/util/shr_abort_mod.F90
CMEPS/nems/util/shr_log_mod.F90
CMEPS/nems/util/shr_pio_mod.F90
CMEPS/nems/util/shr_sys_mod.F90
CMEPS/nems/util/shr_flux_mod.F90
CMEPS/nems/util/shr_mpi_mod.F90
CMEPS/nems/util/glc_elevclass_mod.F90
CMEPS/nems/util/shr_mem_mod.F90
CMEPS/nems/util/shr_kind_mod.F90
CMEPS/nems/util/perf_mod.F90
CMEPS/nems/util/shr_const_mod.F90)
CMEPS/util/shr_abort_mod.F90
CMEPS/util/shr_log_mod.F90
CMEPS/util/shr_pio_mod.F90
CMEPS/util/shr_sys_mod.F90
CMEPS/util/shr_flux_mod.F90
CMEPS/util/shr_mpi_mod.F90
CMEPS/util/glc_elevclass_mod.F90
CMEPS/util/shr_mem_mod.F90
CMEPS/util/shr_kind_mod.F90
CMEPS/util/perf_mod.F90
CMEPS/util/shr_const_mod.F90)

list(APPEND _mediator_files
CMEPS/mediator/med_phases_restart_mod.F90
Expand Down
1 change: 1 addition & 0 deletions modulefiles/orion.intel/fv3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ setenv CMAKE_C_COMPILER mpiicc
setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
setenv CMAKE_Platform orion.intel
module load python/3.7.5

module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack

Expand Down
1 change: 1 addition & 0 deletions modulefiles/orion.intel/fv3_debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ setenv CMAKE_C_COMPILER mpiicc
setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
setenv CMAKE_Platform orion.intel
module load python/3.7.5

module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack

Expand Down
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 28 17:09:14 MST 2021
Wed Feb 3 07:58:47 MST 2021
Start Regression test


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210128/GNU/fv3_gfdlmp_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfdlmp_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_gfs_v15p2_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v15p2_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_gfs_v16_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v16_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/fv3_ccpp_gfs_v16_prod
Checking test 003 fv3_ccpp_gfs_v16 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_v16 PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210128/GNU/fv3_gfs_v16_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v16_restart_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/fv3_ccpp_gfs_v16_restart_prod
Checking test 004 fv3_ccpp_gfs_v16_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_v16_restart PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210128/GNU/fv3_gfs_v16_stochy_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v16_stochy_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/fv3_ccpp_gfs_v16_stochy_prod
Checking test 005 fv3_ccpp_gfs_v16_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_v16_stochy PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210128/GNU/fv3_gfs_v16_flake_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v16_flake_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/fv3_ccpp_gfs_v16_flake_prod
Checking test 006 fv3_ccpp_gfs_v16_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_v16_flake PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210128/GNU/fv3_gfs_v15p2_RRTMGP_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v15p2_RRTMGP_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_gfs_v16_RRTMGP_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v16_RRTMGP_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/fv3_ccpp_gfs_v16_RRTMGP_prod
Checking test 008 fv3_ccpp_gfs_v16_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_v16_RRTMGP PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210128/GNU/fv3_gsd_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gsd_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_thompson_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_thompson_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_thompson_no_aero_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_thompson_no_aero_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_rrfs_v1beta_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_rrfs_v1beta_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/HAFS_v0_HWRF_thompson_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/ESG_HAFS_v0_HWRF_thompson_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_control_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_control_debug_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v15p2_debug_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_gfs_v16_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v16_debug_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/fv3_ccpp_gfs_v16_debug_prod
Checking test 017 fv3_ccpp_gfs_v16_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_v16_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210128/GNU/fv3_gfs_v15p2_RRTMGP_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/fv3_gfs_v16_RRTMGP_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
Checking test 019 fv3_ccpp_gfs_v16_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_v16_RRTMGP_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210128/GNU/fv3_multigases_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_multigases_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/HAFS_v0_HWRF_thompson_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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-20210128/GNU/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
working dir = /glade/scratch/heinzell/FV3_RT/rt_49955/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
working dir = /glade/scratch/worthen/FV3_RT/rt_19651/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 28 17:27:16 MST 2021
Elapsed time: 00h:18m:02s. Have a nice day!
Wed Feb 3 08:16:48 MST 2021
Elapsed time: 00h:18m:01s. Have a nice day!
Loading

0 comments on commit 13053c1

Please sign in to comment.