ufs-community · junwang-noaa · Oct 18, 2021 · Sep 29, 2021 · Sep 30, 2021 · Sep 30, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -34,10 +34,6 @@
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE
   branch = emc/develop
-[submodule "DATM"]
-  path = DATM
-  url = https://github.com/NOAA-EMC/NEMSdatm
-  branch = develop
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
   url = https://github.com/NOAA-EMC/CDEPS

diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS
diff --git a/DATM b/DATM
diff --git a/doc/UsersGuide/source/InputsOutputs.rst b/doc/UsersGuide/source/InputsOutputs.rst
@@ -1140,6 +1140,10 @@ For the coupled NG_GODAS application, a sample *nems.configure* is shown below :
 	  mesh_atm  = DATM_INPUT/cfsr_mesh.nc
 	  diro = "."
 	  logfile = atm.log
+          stop_n = 24
+          stop_option = nhours
+          stop_ymd = -999
+          write_restart_at_endofrun = .true.
 	::
 
 	# OCN #

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/ci/repo_check.sh b/tests/ci/repo_check.sh
@@ -13,8 +13,8 @@ result() {
 }
 
 # Declare variables
-declare -A base fv3 mom6 cice ww3 stoch gocart nems cmeps datm cdeps cmake
-submodules="fv3 mom6 cice ww3 stoch gocart nems cmeps datm cdeps cmake"
+declare -A base fv3 mom6 cice ww3 stoch gocart nems cmeps cdeps cmake
+submodules="fv3 mom6 cice ww3 stoch gocart nems cmeps cdeps cmake"
 comment=''
 ownerID=$1
 
@@ -55,14 +55,14 @@ cmeps[repo]='https://github.com/NOAA-EMC/CMEPS'
 cmeps[branch]='emc/develop'
 cmeps[dir]='CMEPS-interface/CMEPS'
 
-datm[repo]='https://github.com/NOAA-EMC/NEMSdatm'
-datm[branch]='develop'
-datm[dir]='DATM'
-
 cdeps[repo]='https://github.com/NOAA-EMC/CDEPS'
 cdeps[branch]='develop'
 cdeps[dir]='CDEPS-interface/CDEPS'
 
+hycom[repo]='https://github.com/NOAA-EMC/HYCOM-src'
+hycom[branch]='develop'
+hycom[dir]='HYCOM-interface/HYCOM'
+
 cmake[repo]='https://github.com/NOAA-EMC/CMakeModules'
 cmake[branch]='develop'
 cmake[dir]='CMakeModules'

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -47,14 +47,6 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=28
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=28
-  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"
@@ -95,14 +87,6 @@ elif [[ $MACHINE_ID = wcoss2 ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=128
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=128
-  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=128
   MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
   OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
@@ -143,14 +127,6 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=40
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=40
-  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"
@@ -191,14 +167,6 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=40
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=40
-  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"
@@ -254,14 +222,6 @@ elif [[ $MACHINE_ID = jet.* ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=24
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=24
-  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"
@@ -302,14 +262,6 @@ elif [[ $MACHINE_ID = s4.* ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=32
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=32
-  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=32
   MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
   OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
@@ -350,14 +302,6 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=36
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=36
-  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"
@@ -398,14 +342,6 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=36
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=36
-  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"
@@ -445,14 +381,6 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
   OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
 
-  TASKS_datm_100=120; TPN_datm_100=48
-  MPB_datm_100="16 77"; APB_datm_100="0 15"
-  OPB_datm_100="78 107"; IPB_datm_100="108 119"
-
-  TASKS_datm_025=208; TPN_datm_025=48
-  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"
@@ -481,7 +409,6 @@ export_fv3 ()
 export FV3=true
 export S2S=false
 export HAFS=false
-export DATM_NEMS=false
 export DATM_CDEPS=false
 export DOCN_CDEPS=false
 export THRD=1
@@ -713,7 +640,6 @@ export_cpl ()
 export FV3=true
 export S2S=true
 export HAFS=false
-export DATM_NEMS=false
 export DATM_CDEPS=false
 export DOCN_CDEPS=false
 
@@ -933,134 +859,11 @@ export_35d_run ()
 export CNTL_DIR=""
 export LIST_FILES=""
 }
-export_datm ()
-{
-export FV3=false
-export S2S=false
-export HAFS=false
-export DATM_NEMS=true
-export DATM_CDEPS=false
-export DOCN_CDEPS=false
-export CPLWAV=.false.
-export DAYS=1
-export FHMAX=24
-export THRD=1
-export FHROT=0
-export WARM_START=.false.
-
-# atm/ocn/ice resolution
-# GEFS
-export DATM_SRC=GEFS
-export FILENAME_BASE=gefs.
-export IATM=1536
-export JATM=768
-export ATMRES=C96
-export OCNRES=100
-export ICERES=1.00
-export WAVRES=1.00
-export NX_GLB=360
-export NY_GLB=320
-
-# nems.configure
-export NEMS_CONFIGURE=nems.configure.datm.IN
-export med_model=cmeps
-export atm_model=nems_datm
-export ocn_model=mom6
-export ice_model=cice6
-export atm_petlist_bounds=$APB_datm_100
-export med_petlist_bounds=$MPB_datm_100
-export ocn_petlist_bounds=$OPB_datm_100
-export ice_petlist_bounds=$IPB_datm_100
-export TASKS=$TASKS_datm_100
-export TPN=$TPN_datm_100
-export NPROC_ICE=12
-# SlenderX2
-export CICE_DECOMP=slenderX2
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-export ENS_NUM=1
-export SYEAR=2011
-export SMONTH=10
-export SDAY=01
-export SHOUR=00
-export SECS=`expr $SHOUR \* 3600`
-export CDATE=${SYEAR}${SMONTH}${SDAY}${SHOUR}
-
-export NFHOUT=6
-export DT_ATMOS=900
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6=1800
-export DT_THERM_MOM6=3600
-export coupling_interval_slow_sec=${DT_THERM_MOM6}
-export coupling_interval_fast_sec=${DT_ATMOS}
-
-export RESTART_N=${FHMAX}
-export CPLMODE=nems_orig_data
-export cap_dbug_flag=0
-export use_coldstart=false
-export use_mommesh=true
-export RUNTYPE=startup
-export CICERUNTYPE=initial
-export eps_imesh=1.0e-1
-export flux_convergence=0.0
-export flux_iteration=2
-export flux_scheme=0
-
-export INPUT_NML=input.mom6.nml.IN
-export MODEL_CONFIGURE=datm_configure.IN
-export FIELD_TABLE=field_table
-export DIAG_TABLE=diag_table_template
-
-# 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
-# MOM6 IAU
-export MOM_IAU=False
-export MOM_IAU_HRS=6
-export MOM6_USE_LI2016=False
-# MOM6 stochastics
-export DO_OCN_SPPT=False
-export PERT_EPBL=False
-export OCN_SPPT=-999.
-export EPBL=-999.
-# since coupling_interval_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.
-# default non-mushy thermo
-export KTHERM=1
-export TFREEZE_OPTION=linear_salt
-export BL_SUFFIX=""
-export RT_SUFFIX=""
-}
 export_datm_cdeps ()
 {
 export FV3=false
 export S2S=false
 export HAFS=false
-export DATM_NEMS=false
 export DATM_CDEPS=true
 export DOCN_CDEPS=false
 export CPLWAV=.false.
@@ -1189,7 +992,6 @@ export FV3=false
 export S2S=false
 export HAFS=true
 export DATM_CDEPS=true
-export DATM_NEMS=false
 export DOCN_CDEPS=false
 export THRD=1
 export INPES=$INPES_dflt
@@ -1225,7 +1027,6 @@ export_hafs_regional ()
 export FV3=true
 export S2S=false
 export HAFS=true
-export DATM_NEMS=false
 export DATM_CDEPS=false
 export DOCN_CDEPS=false
 export THRD=1
+110 −29		cime_config/stream_cdeps.py
+29 −29		cime_config/streams.xsd
+4 −13		datm/atm_comp_nuopc.F90
+24 −22		datm/cime_config/buildnml
+2 −2		datm/cime_config/stream_definition_datm.xml
+23 −0		datm/cime_config/user_nl_datm_streams
+26 −20		dice/cime_config/buildnml
+23 −0		dice/cime_config/user_nl_dice_streams
+2 −10		dice/ice_comp_nuopc.F90
+25 −25		dlnd/cime_config/buildnml
+23 −0		dlnd/cime_config/user_nl_dlnd_streams
+5 −7		dlnd/lnd_comp_nuopc.F90
+24 −23		docn/cime_config/buildnml
+23 −0		docn/cime_config/user_nl_docn_streams
+3 −12		docn/ocn_comp_nuopc.F90
+25 −22		drof/cime_config/buildnml
+23 −0		drof/cime_config/user_nl_drof_streams
+3 −11		drof/rof_comp_nuopc.F90
+97 −3		dshr/dshr_mod.F90
+25 −23		dwav/cime_config/buildnml
+23 −0		dwav/cime_config/user_nl_dwav_streams
+4 −7		dwav/wav_comp_nuopc.F90
+49 −1		streams/dshr_strdata_mod.F90
+83 −33		streams/dshr_stream_mod.F90