Update NEMS and CMEPS, add CDEPS tests, fix bugs in the datm_bulk_gef…

…s test (#538) * Update NEMS component for CDEPS data atmosphere model. * Update CMEPS to revise land-sea masks used for cfsr and gefs data sources in CDEPS. * Update CMakeLists.txt to build the mom6_cice6_cdeps application. * Use a new ESMF configuration file to provide data stream input parameters. * Use new input forcing files that are CF-1.0 compliant in time axis. * Use new input mesh files that are generated from existing grid files. * Add 8 cdeps regression tests. * Fix bugs in the datm_bulk_gefs test.
ufs-community · May 5, 2021 · d7156ad · d7156ad
1 parent 554aedc
commit d7156ad
Show file tree

Hide file tree

Showing 31 changed files with 8,737 additions and 8,237 deletions.
diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -285,7 +285,7 @@ endif()
 
 if(NEMSdatm)
   add_dependencies(ufs datatm)
-  list(APPEND _ufs_defs_private FRONT_DATM=datm)
+  list(APPEND _ufs_defs_private FRONT_NEMS_DATM=datm)
   list(APPEND _ufs_libs_public datatm)
 endif()
 
@@ -315,6 +315,10 @@ endif()
 
 if(CDEPS)
   add_dependencies(ufs cdeps::datm)
+  list(APPEND _ufs_defs_private CDEPS-interface/CDEPS
+                                FRONT_CDEPS_DATM=atm_comp_nuopc)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR}/CDEPS-interface/CDEPS/datm)
+  target_link_libraries(ufs PUBLIC cdeps::datm)
 endif()
 
 target_compile_definitions(ufs PRIVATE "${_ufs_defs_private}")

diff --git a/NEMS b/NEMS
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -57,6 +57,14 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then
   MPB_datm_025="0 39"; APB_datm_025="0 39"
   OPB_datm_025="40 159"; IPB_datm_025="160 207"
 
+  TASKS_cdeps_100=40; TPN_cdeps_100=28
+  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
+  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
+
+  TASKS_cdeps_025=208; TPN_cdeps_025=28
+  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
+  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
+
 elif [[ $MACHINE_ID = orion.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=40 ; INPES_dflt=3 ; JNPES_dflt=8
@@ -100,6 +108,14 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   MPB_datm_025="0 39"; APB_datm_025="0 39"
   OPB_datm_025="40 159"; IPB_datm_025="160 207"
 
+  TASKS_cdeps_100=40; TPN_cdeps_100=40
+  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
+  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
+
+  TASKS_cdeps_025=208; TPN_cdeps_025=40
+  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
+  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
+
 elif [[ $MACHINE_ID = hera.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=40 ; INPES_dflt=3 ; JNPES_dflt=8
@@ -143,6 +159,14 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   MPB_datm_025="0 39"; APB_datm_025="0 39"
   OPB_datm_025="40 159"; IPB_datm_025="160 207"
 
+  TASKS_cdeps_100=40; TPN_cdeps_100=40
+  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
+  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
+
+  TASKS_cdeps_025=208; TPN_cdeps_025=40
+  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
+  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
+
 elif [[ $MACHINE_ID = linux.* ]]; then
 
   if [[ $CI_TEST = true ]]; then
@@ -197,6 +221,14 @@ elif [[ $MACHINE_ID = jet.* ]]; then
   MPB_datm_025="0 39"; APB_datm_025="0 39"
   OPB_datm_025="40 159"; IPB_datm_025="160 207"
 
+  TASKS_cdeps_100=40; TPN_cdeps_100=24
+  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
+  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
+
+  TASKS_cdeps_025=208; TPN_cdeps_025=24
+  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
+  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
+
 elif [[ $MACHINE_ID = gaea.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=36 ; INPES_dflt=3 ; JNPES_dflt=8
@@ -240,6 +272,14 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
   MPB_datm_025="0 39"; APB_datm_025="0 39"
   OPB_datm_025="40 159"; IPB_datm_025="160 207"
 
+  TASKS_cdeps_100=40; TPN_cdeps_100=36
+  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
+  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
+
+  TASKS_cdeps_025=208; TPN_cdeps_025=36
+  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
+  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
+
 elif [[ $MACHINE_ID = cheyenne.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=36 ; INPES_dflt=3 ; JNPES_dflt=8
@@ -283,6 +323,14 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   MPB_datm_025="0 39"; APB_datm_025="0 39"
   OPB_datm_025="40 159"; IPB_datm_025="160 207"
 
+  TASKS_cdeps_100=40; TPN_cdeps_100=36
+  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
+  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
+
+  TASKS_cdeps_025=208; TPN_cdeps_025=36
+  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
+  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
+
 elif [[ $MACHINE_ID = stampede.* ]]; then
 
   TASKS_dflt=150 ; TPN_dflt=48 ; INPES_dflt=3 ; JNPES_dflt=8
@@ -325,6 +373,14 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   MPB_datm_025="0 39"; APB_datm_025="0 39"
   OPB_datm_025="40 159"; IPB_datm_025="160 207"
 
+  TASKS_cdeps_100=40; TPN_cdeps_100=48
+  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
+  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
+
+  TASKS_cdeps_025=208; TPN_cdeps_025=48
+  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
+  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
+
 else
 
   echo "Unknown MACHINE_ID ${MACHINE_ID}"
@@ -343,7 +399,8 @@ export_fv3 ()
 {
 export FV3=true
 export S2S=false
-export DATM=false
+export DATM_NEMS=false
+export DATM_CDEPS=false
 export THRD=1
 export WLCLK=$WLCLK_dflt
 export INPES=$INPES_dflt
@@ -510,7 +567,8 @@ export_cpl ()
 {
 export FV3=true
 export S2S=true
-export DATM=false
+export DATM_NEMS=false
+export DATM_CDEPS=false
 
 export DAYS="1"
 export FHMAX="24"
@@ -655,8 +713,9 @@ export_datm ()
 {
 export FV3=false
 export S2S=false
+export DATM_NEMS=true
+export DATM_CDEPS=false
 export CPLWAV=.F.
-export DATM=true
 export DAYS=1
 export FHMAX=24
 export WLCLK=30
@@ -680,7 +739,7 @@ export NY_GLB=320
 # nems.configure
 export NEMS_CONFIGURE="nems.configure.datm.IN"
 export med_model="cmeps"
-export atm_model="datm"
+export atm_model="nems_datm"
 export ocn_model="mom6"
 export ice_model="cice6"
 export atm_petlist_bounds=$APB_datm_100
@@ -756,3 +815,114 @@ export CICE_HIST_AVG='.true.'
 export BL_SUFFIX=""
 export RT_SUFFIX=""
 }
+export_datm_cdeps ()
+{
+export FV3=false
+export S2S=false
+export DATM_NEMS=false
+export DATM_CDEPS=true
+export CPLWAV=.F.
+export DAYS=1
+export FHMAX=24
+export WLCLK=30
+export THRD=1
+export FHROT='0'
+export WARM_START=.F.
+
+# atm/ocn/ice resolution
+export IATM=1760
+export JATM=880
+export ATM_NX_GLB=$IATM
+export ATM_NY_GLB=$JATM
+export ATMRES='1760x880'
+export OCNRES='100'
+export ICERES='1.00'
+export NX_GLB=360
+export NY_GLB=320
+
+# nems.configure
+export NEMS_CONFIGURE="nems.configure.datm_cdeps.IN"
+export med_model="cmeps"
+export atm_model="datm"
+export ocn_model="mom6"
+export ice_model="cice6"
+export atm_petlist_bounds=$APB_cdeps_100
+export med_petlist_bounds=$MPB_cdeps_100
+export ocn_petlist_bounds=$OPB_cdeps_100
+export ice_petlist_bounds=$IPB_cdeps_100
+export TASKS=$TASKS_cdeps_100
+export TPN=$TPN_cdeps_100
+export NPROC_ICE='12'
+
+export ENS_NUM=1
+export SYEAR='2011'
+export SMONTH='10'
+export SDAY='01'
+export SHOUR='00'
+export CDATE=${SYEAR}${SMONTH}${SDAY}${SHOUR}
+
+export NFHOUT=6
+export FDIAG=6
+export DT_ATMOS='900'
+export DT_CICE=${DT_ATMOS}
+export DT_DYNAM_MOM6='1800'
+export DT_THERM_MOM6='3600'
+export CPL_SLOW=${DT_THERM_MOM6}
+export CPL_FAST=${DT_ATMOS}
+export coupling_interval_slow_sec=${CPL_SLOW}
+export coupling_interval_fast_sec=${CPL_FAST}
+
+export RESTART_N=${FHMAX}
+export CPLMODE='nems_orig_data'
+export cap_dbug_flag="0"
+export use_coldstart="false"
+export use_mommesh="false"
+export RUNTYPE='startup'
+export flux_convergence='0.0'
+export flux_iteration='2'
+export flux_scheme='0'
+
+export INPUT_NML=input.mom6.nml.IN
+export MODEL_CONFIGURE=datm_cdeps_configure.IN
+export FIELD_TABLE="field_table"
+export DIAG_TABLE="diag_table_template"
+
+# atm defaults
+export DATM_SRC="CFSR"
+export FILENAME_BASE='cfsr.'
+export mesh_file="cfsr_mesh.nc"
+export MESH_ATM="DATM_INPUT/${mesh_file}"
+export atm_datamode=${DATM_SRC}
+
+# MOM6 defaults; 1 degree
+export MOM_INPUT=MOM_input_template_100
+export MOM6_RESTART_SETTING='n'
+export MOM6_RIVER_RUNOFF='False'
+export FRUNOFF=""
+export CHLCLIM='"seawifs_1998-2006_smoothed_2X.nc"'
+# this must be set False for restart repro
+export MOM6_REPRO_LA='False'
+# since CPL_SLOW is set to DT_THERM, this should be always be false
+export MOM6_THERMO_SPAN='False'
+# no WW3
+export MOM6_USE_WAVES='False'
+export MOM6_ALLOW_LANDMASK_CHANGES='False'
+
+# CICE6 defaults; 1 degree
+export MESHOCN_ICE="mesh.mx${OCNRES}.nc"
+export CICEGRID="grid_cice_NEMS_mx${OCNRES}.nc"
+export CICEMASK="kmtu_cice_NEMS_mx${OCNRES}.nc"
+export RUNID='unknown'
+# set large; restart frequency now controlled by restart_n in nems.configure
+export DUMPFREQ='d'
+export DUMPFREQ_N=1000
+export USE_RESTART_TIME='.false.'
+export RESTART_EXT='.false.'
+# setting to true will allow Frazil FW and Salt to be
+# included in fluxes sent to ocean
+export FRAZIL_FWSALT='.true.'
+# default to write CICE average history files
+export CICE_HIST_AVG='.true.'
+export BL_SUFFIX=""
+export RT_SUFFIX=""
+}
diff --git a/tests/fv3_conf/cpld_datm_cdeps.IN b/tests/fv3_conf/cpld_datm_cdeps.IN
@@ -0,0 +1,39 @@
+mkdir INPUT DATM_INPUT RESTART history MOM6_OUTPUT
+
+# DATM fixed input
+ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/@[mesh_file] DATM_INPUT
+ln -s  @[INPUTDATA_ROOT]/DATM_CDEPS/@[DATM_SRC]/201110/*201110*nc DATM_INPUT
+
+# MOM6 fixed input
+ICERES="${OCNRES:0:1}.${OCNRES:1}"
+cp    @[INPUTDATA_ROOT]/MOM6_FIX/@[OCNRES]/* ./INPUT
+cp    @[INPUTDATA_ROOT]/MOM6_FIX_DATM/@[OCNRES]/* ./INPUT
+
+# CICE fixed input
+cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx@[OCNRES].nc .
+cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx@[OCNRES].nc .
+cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
+
+if [ $WARM_START = .F. ]; then
+# cold start
+ if [[ $OCNRES == '025' ]]; then
+  cp    @[INPUTDATA_ROOT]/MOM6_IC/@[OCNRES]/2011100100/MOM*.nc ./INPUT
+  cp    @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].cpc*.nc cice_model.res.nc
+ else
+  cp    @[INPUTDATA_ROOT]/MOM6_IC/@[OCNRES]/2011100100/MOM6_IC_TS*.nc ./INPUT/MOM6_IC_TS.nc
+  cp    @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].cpc*.nc cice_model.res.nc
+ fi
+else
+# warm start
+ cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/MOM.res.2011-10-01-12*.nc ./INPUT/MOM.res.nc
+
+# CMEPS restart and pointer files
+ RFILE="DATM_${DATM_SRC}.cpl.r.2011-10-01-43200.nc"
+ cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/${RFILE} .
+ ls -1 ${RFILE}>rpointer.cpl
+
+# CICE restart and pointer files
+ cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/iced.2011-10-01-43200.nc ./INPUT
+ RFILE="iced.2011-10-01-43200.nc"
+ ls -1 "./INPUT/"${RFILE}>ice.restart_file
+fi
diff --git a/tests/parm/datm.streams.IN b/tests/parm/datm.streams.IN
@@ -0,0 +1,15 @@
+stream_info:               @[FILENAME_BASE]01
+taxmode01:                 cycle
+mapalgo01:                 bilinear
+tInterpAlgo01:             linear
+readMode01:                single
+dtlimit01:                 1.5
+stream_offset01:           0
+yearFirst01:               2011
+yearLast01:                2011
+yearAlign01:               2011
+stream_vectors01:          "u:v"
+stream_mesh_file01:        @[MESH_ATM]
+stream_lev_dimname01:      null
+stream_data_files01:       "DATM_INPUT/@[FILENAME_BASE]201110.nc"
+stream_data_variables01:  "slmsksfc Sa_mask" "DSWRF Faxa_swdn" "DLWRF Faxa_lwdn" "vbdsf_ave Faxa_swvdr" "vddsf_ave Faxa_swvdf" "nbdsf_ave Faxa_swndr" "nddsf_ave Faxa_swndf" "u10m Sa_u10m" "v10m Sa_v10m" "hgt_hyblev1 Sa_z" "psurf Sa_pslv" "tmp_hyblev1 Sa_tbot" "spfh_hyblev1 Sa_shum" "ugrd_hyblev1 Sa_u" "vgrd_hyblev1 Sa_v" "q2m Sa_q2m" "t2m Sa_t2m" "pres_hyblev1 Sa_pbot" "precp Faxa_rain" "fprecp Faxa_snow"
diff --git a/tests/parm/datm_cdeps_configure.IN b/tests/parm/datm_cdeps_configure.IN
@@ -0,0 +1,20 @@
+print_esmf:              .true.
+total_member:            1
+PE_MEMBER01:             @[TASKS]
+start_year:              @[SYEAR]
+start_month:             @[SMONTH]
+start_day:               @[SDAY]
+start_hour:              @[SHOUR]
+start_minute:            0
+start_second:            0
+nhours_fcst:             @[FHMAX]
+RUN_CONTINUE:            .false.
+ENS_SPS:                 .false.
+dt_atmos:                @[DT_ATMOS]
+atm_coupling_interval_sec:  @[coupling_interval_fast_sec]
+calendar:                'julian'
+fhrot:                   @[FHROT]
+nfhout:                  @[NFHOUT]
+nfhmax_hf:               -1
+nfhout_hf:               3
+nsout:                   -1
diff --git a/tests/parm/datm_in b/tests/parm/datm_in
@@ -0,0 +1,14 @@
+&datm_nml
+  datamode = "@[atm_datamode]"
+  factorfn_data = "null"
+  factorfn_mesh = "null"
+  flds_co2 = .false.
+  flds_presaero = .false.
+  flds_wiso = .false.
+  iradsw = 1
+  model_maskfile = "@[MESH_ATM]"
+  model_meshfile = "@[MESH_ATM]"
+  nx_global = @[ATM_NX_GLB]
+  ny_global = @[ATM_NY_GLB]
+  restfilm = "null"
+/