ufs-community · zach1221 · Aug 27, 2024 · May 30, 2024 · Jun 3, 2024 · Jun 17, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -32,8 +32,8 @@
   branch = emc/develop
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
-  url = https://github.com/NOAA-EMC/CDEPS
-  branch = develop
+  url = https://github.com/NickSzapiro-NOAA/CDEPS
+  branch = simplify_datm
 [submodule "GOCART"]
   path = GOCART
   url = https://github.com/GEOS-ESM/GOCART

diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS
diff --git a/CDEPS-interface/cdeps_files.cmake b/CDEPS-interface/cdeps_files.cmake
@@ -41,14 +41,11 @@ list(APPEND cdeps_dshr_files
 
 list(APPEND cdeps_datm_files
   CDEPS/datm/atm_comp_nuopc.F90
-  CDEPS/datm/datm_datamode_cfsr_mod.F90
   CDEPS/datm/datm_datamode_clmncep_mod.F90
   CDEPS/datm/datm_datamode_core2_mod.F90
   CDEPS/datm/datm_datamode_cplhist_mod.F90
   CDEPS/datm/datm_datamode_era5_mod.F90
   CDEPS/datm/datm_datamode_gefs_mod.F90
-  CDEPS/datm/datm_datamode_gfs_mod.F90
-  CDEPS/datm/datm_datamode_gfs_hafs_mod.F90
   CDEPS/datm/datm_datamode_jra_mod.F90
   CDEPS/datm/datm_datamode_simple_mod.F90
 )

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1328,10 +1328,10 @@ export_datm_cdeps ()
   export INPUT_NML=input.mom6.nml.IN
   export DIAG_TABLE=diag_table_template
   export DATM_SRC=CFSR
-  export FILENAME_BASE=cfsr.
-  export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
-  export atm_datamode=${DATM_SRC}
-  export stream_files=INPUT/${FILENAME_BASE}201110.nc
+  export FILEBASE_DATM=cfsr
+  export MESH_ATM=${FILEBASE_DATM}_mesh.nc
+  export atm_datamode=GEFS
+  export stream_files=INPUT/${FILEBASE_DATM}.201110.nc
   export EXPORT_ALL=.false.
   export STREAM_OFFSET=0
 

diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/parm/datm.streams.IN b/tests/parm/datm.streams.IN
@@ -1,4 +1,4 @@
-stream_info:               @[FILENAME_BASE]01
+stream_info:               @[FILEBASE_DATM].01
 taxmode01:                 limit
 mapalgo01:                 bilinear
 tInterpAlgo01:             linear

diff --git a/tests/test_changes.list b/tests/test_changes.list
@@ -1 +0,0 @@
-cpld_control_sfs intel

diff --git a/tests/tests/datm_cdeps_3072x1536_cfsr b/tests/tests/datm_cdeps_3072x1536_cfsr
@@ -12,15 +12,15 @@ export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=CFSR3072x1536
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export WLCLK=15
 export IATM=3072
 export JATM=1536
 export ATM_NX_GLB=$IATM
 export ATM_NY_GLB=$JATM
 export ATMRES=${IATM}x${JATM}
 export MESH_ATM=gfs_mesh.nc
-export atm_datamode=GFS
+export atm_datamode=GEFS
 export RESTART_N=12
 export stream_files="INPUT/cfsr.2011100100_3072x1536.nc INPUT/cfsr.2011100106_3072x1536.nc INPUT/cfsr.2011100112_3072x1536.nc INPUT/cfsr.2011100118_3072x1536.nc INPUT/cfsr.2011100200_3072x1536.nc INPUT/cfsr.2011100206_3072x1536.nc"
 export eps_imesh=2.5e-1

diff --git a/tests/tests/datm_cdeps_bulk_cfsr b/tests/tests/datm_cdeps_bulk_cfsr
@@ -12,7 +12,7 @@ export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=CFSR
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export IATM=1760
 export JATM=880
 export RESTART_N=12

diff --git a/tests/tests/datm_cdeps_bulk_gefs b/tests/tests/datm_cdeps_bulk_gefs
@@ -19,9 +19,9 @@ export ATM_NX_GLB=$IATM
 export ATM_NY_GLB=$JATM
 export ATMRES=${IATM}x${JATM}
 export DATM_SRC=GEFS_NEW
-export FILENAME_BASE=gefs.
-export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
-export stream_files="INPUT/${FILENAME_BASE}201110.nc"
+export FILEBASE_DATM=gefs
+export MESH_ATM=${FILEBASE_DATM}_mesh.nc
+export stream_files="INPUT/${FILEBASE_DATM}.201110.nc"
 export STREAM_OFFSET=-21600
 
 export RESTART_N=12

diff --git a/tests/tests/datm_cdeps_ciceC_cfsr b/tests/tests/datm_cdeps_ciceC_cfsr
@@ -12,7 +12,7 @@ export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=CFSR
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export IATM=1760
 export JATM=880
 export RESTART_N=12

diff --git a/tests/tests/datm_cdeps_control_cfsr b/tests/tests/datm_cdeps_control_cfsr
@@ -12,7 +12,7 @@ export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=CFSR
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export IATM=1760
 export JATM=880
 export RESTART_N=12

diff --git a/tests/tests/datm_cdeps_control_cfsr_faster b/tests/tests/datm_cdeps_control_cfsr_faster
@@ -12,7 +12,7 @@ export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=CFSR
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export IATM=1760
 export JATM=880
 export RESTART_N=12

diff --git a/tests/tests/datm_cdeps_control_gefs b/tests/tests/datm_cdeps_control_gefs
@@ -20,9 +20,9 @@ export ATM_NX_GLB=$IATM
 export ATM_NY_GLB=$JATM
 export ATMRES=${IATM}x${JATM}
 export DATM_SRC=GEFS_NEW
-export FILENAME_BASE=gefs.
-export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
-export stream_files="INPUT/${FILENAME_BASE}201110.nc"
+export FILEBASE_DATM=gefs
+export MESH_ATM=${FILEBASE_DATM}_mesh.nc
+export stream_files="INPUT/${FILEBASE_DATM}.201110.nc"
 export STREAM_OFFSET=-21600
 export RESTART_N=12
 export eps_imesh=2.5e-1

diff --git a/tests/tests/datm_cdeps_debug_cfsr b/tests/tests/datm_cdeps_debug_cfsr
@@ -12,7 +12,7 @@ export LIST_FILES="RESTART/20111001.060000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=CFSR
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export IATM=1760
 export JATM=880
 export DAYS=0.25

diff --git a/tests/tests/datm_cdeps_gfs b/tests/tests/datm_cdeps_gfs
@@ -12,7 +12,7 @@ export LIST_FILES="RESTART/20210323.060000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=GFS
-export FILENAME_BASE=gfs.
+export FILEBASE_DATM=gfs
 export SYEAR=2021
 export SMONTH=03
 export SDAY=22
@@ -23,8 +23,8 @@ export JATM=1536
 export ATM_NX_GLB=$IATM
 export ATM_NY_GLB=$JATM
 export ATMRES=${IATM}x${JATM}
-export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
-export atm_datamode=GFS
+export MESH_ATM=${FILEBASE_DATM}_mesh.nc
+export atm_datamode=GEFS
 export CICE_KTHERM=2
 export CICE_TFREEZE_OPTION=mushy
 export RESTART_N=12

diff --git a/tests/tests/datm_cdeps_iau_gefs b/tests/tests/datm_cdeps_iau_gefs
@@ -22,9 +22,9 @@ export ATM_NX_GLB=$IATM
 export ATM_NY_GLB=$JATM
 export ATMRES=${IATM}x${JATM}
 export DATM_SRC=GEFS_NEW
-export FILENAME_BASE=gefs.
-export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
-export stream_files="INPUT/${FILENAME_BASE}201110.nc"
+export FILEBASE_DATM=gefs
+export MESH_ATM=${FILEBASE_DATM}_mesh.nc
+export stream_files="INPUT/${FILEBASE_DATM}.201110.nc"
 export STREAM_OFFSET=-21600
 export RESTART_N=12
 export eps_imesh=2.5e-1

diff --git a/tests/tests/datm_cdeps_multiple_files_cfsr b/tests/tests/datm_cdeps_multiple_files_cfsr
@@ -10,7 +10,7 @@ export LIST_FILES="RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc"
 
 export_datm_cdeps
 export DATM_SRC=CFSR
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export IATM=1760
 export JATM=880
 export RESTART_N=12

diff --git a/tests/tests/datm_cdeps_mx025_cfsr b/tests/tests/datm_cdeps_mx025_cfsr
@@ -15,7 +15,7 @@ export LIST_FILES="RESTART/20111001.120000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=CFSR
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export IATM=1760
 export JATM=880
 export DAYS=0.5

diff --git a/tests/tests/datm_cdeps_mx025_gefs b/tests/tests/datm_cdeps_mx025_gefs
@@ -27,9 +27,9 @@ export ATM_NX_GLB=$IATM
 export ATM_NY_GLB=$JATM
 export ATMRES=${IATM}x${JATM}
 export DATM_SRC=GEFS_NEW
-export FILENAME_BASE=gefs.
-export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
-export stream_files="INPUT/${FILENAME_BASE}201110.nc"
+export FILEBASE_DATM=gefs
+export MESH_ATM=${FILEBASE_DATM}_mesh.nc
+export stream_files="INPUT/${FILEBASE_DATM}.201110.nc"
 export STREAM_OFFSET=-21600
 
 ATM_compute_tasks=${ATM_compute_tasks_cdeps_025}

diff --git a/tests/tests/datm_cdeps_restart_cfsr b/tests/tests/datm_cdeps_restart_cfsr
@@ -12,7 +12,7 @@ export LIST_FILES="RESTART/20111002.000000.MOM.res.nc \
 
 export_datm_cdeps
 export DATM_SRC=CFSR
-export FILENAME_BASE=cfsr.
+export FILEBASE_DATM=cfsr
 export IATM=1760
 export JATM=880
 export FHMAX=24

diff --git a/tests/tests/datm_cdeps_stochy_gefs b/tests/tests/datm_cdeps_stochy_gefs
@@ -20,9 +20,9 @@ export ATM_NX_GLB=$IATM
 export ATM_NY_GLB=$JATM
 export ATMRES=${IATM}x${JATM}
 export DATM_SRC=GEFS_NEW
-export FILENAME_BASE=gefs.
-export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
-export stream_files="INPUT/${FILENAME_BASE}201110.nc"
+export FILEBASE_DATM=gefs
+export MESH_ATM=${FILEBASE_DATM}_mesh.nc
+export stream_files="INPUT/${FILEBASE_DATM}.201110.nc"
 export STREAM_OFFSET=-21600
 export RESTART_N=12
 export eps_imesh=2.5e-1