ufs-community · junwang-noaa · Nov 19, 2020 · Oct 30, 2020 · Oct 31, 2020 · Nov 1, 2020
diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -21,7 +21,7 @@ module load intel/18.1.163
 module rm NetCDF-intel-sandybridge/4.2
 module load xt-lsfhpc/9.1.3
 module load craype-haswell
-module load python/2.7.14
+module load python/3.6.3
 module load cmake/3.16.2
 module load gcc/5.3.0
 #

diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
@@ -9,8 +9,7 @@ module-whatis "loads UFS Model prerequisites on Venus and Mars"
 module load ips/18.0.1.163
 module load impi/18.0.1
 module load lsf/10.1
-# module load python/3.6.3
-module load python/2.7.14
+module load python/3.6.3
 
 module load cmake/3.16.2
 setenv CMAKE_C_COMPILER mpiicc

diff --git a/modulefiles/wcoss_dell_p3/fv3_debug b/modulefiles/wcoss_dell_p3/fv3_debug
@@ -9,8 +9,7 @@ module-whatis "loads UFS Model prerequisites on Venus and Mars"
 module load ips/18.0.1.163
 module load impi/18.0.1
 module load lsf/10.1
-# module load python/3.6.3
-module load python/2.7.14
+module load python/3.6.3
 
 module load cmake/3.16.2
 setenv CMAKE_C_COMPILER mpiicc

diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.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/compare_ncfile.py b/tests/compare_ncfile.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+import sys 
+import numpy as np
+from netCDF4 import Dataset
+
+with Dataset(sys.argv[1]) as nc1, Dataset(sys.argv[2]) as nc2:
+  if nc1.variables.keys()!=nc2.variables.keys():
+    print("Variables are different")
+    sys.exit(1)
+
+  for varname in nc1.variables.keys():
+    diff = nc2[varname][:]-nc1[varname][:]
+    if (np.abs(diff)).max() != 0:
+      print(varname,"is different")
+      sys.exit(1)
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -11,7 +11,7 @@ RUN     | fv3_ccpp_restart
 RUN     | fv3_ccpp_read_inc                                                                                                              | standard    |                | fv3         |
 RUN     | fv3_ccpp_wrtGauss_netcdf_esmf                                                                                                  | standard    |                | fv3         |
 RUN     | fv3_ccpp_wrtGauss_netcdf                                                                                                       | standard    |                | fv3         |
-#RUN     | fv3_ccpp_wrtGauss_netcdf_parallel                                                                                              | standard    |                | fv3         |
+RUN     | fv3_ccpp_wrtGauss_netcdf_parallel                                                                                              | standard    |                | fv3         |
 RUN     | fv3_ccpp_wrtGlatlon_netcdf                                                                                                     | standard    |                | fv3         |
 RUN     | fv3_ccpp_wrtGauss_nemsio                                                                                                       | standard    |                | fv3         |
 RUN     | fv3_ccpp_wrtGauss_nemsio_c192                                                                                                  | standard    |                | fv3         |
@@ -61,7 +61,7 @@ COMPILE | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regiona
 RUN     | fv3_ccpp_regional_control                                                                                                      | standard    |                | fv3         |
 RUN     | fv3_ccpp_regional_restart                                                                                                      | standard    |                | fv3         | fv3_ccpp_regional_control
 RUN     | fv3_ccpp_regional_quilt                                                                                                        | standard    |                | fv3         |
-#RUN     | fv3_ccpp_regional_quilt_netcdf_parallel                                                                                        | standard    |                | fv3         |
+RUN     | fv3_ccpp_regional_quilt_netcdf_parallel                                                                                        | standard    |                | fv3         |
 RUN     | fv3_ccpp_regional_c768                                                                                                         | standard    | wcoss_dell_p3  | fv3         |
 RUN     | fv3_ccpp_regional_c768                                                                                                         | standard    | hera.intel     | fv3         |
 RUN     | fv3_ccpp_regional_c768                                                                                                         | standard    | gaea.intel     | fv3         |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -56,6 +56,19 @@ rt_single() {
   fi
 }
 
+rt_35d() {
+  local sy=$(echo ${DATE_35D} | cut -c 1-4)
+  local sm=$(echo ${DATE_35D} | cut -c 5-6)
+  local new_test_name="tests/${TEST_NAME}_${DATE_35D}"
+  rm -f $new_test_name
+  cp tests/$TEST_NAME $new_test_name
+
+  sed -i -e "s/\(export SYEAR\)/\1=\"$sy\"/" $new_test_name
+  sed -i -e "s/\(export SMONTH\)/\1=\"$sm\"/" $new_test_name
+
+  TEST_NAME=${new_test_name#tests/}
+}
+
 rt_trap() {
   [[ ${ROCOTO:-false} == true ]] && rocoto_kill
   [[ ${ECFLOW:-false} == true ]] && ecflow_kill
@@ -105,7 +118,7 @@ if [[ $MACHINE_ID = wcoss_cray ]]; then
   module use $PATHTR/modulefiles/${MACHINE_ID}
   module load fv3
 
-  module load python/2.7.14
+  module load python/3.6.3
 
   module use /usrx/local/emc_rocoto/modulefiles
   module load rocoto/1.3.0rc2
@@ -114,8 +127,9 @@ if [[ $MACHINE_ID = wcoss_cray ]]; then
   ROCOTOCOMPLETE=$(which rocotocomplete)
   ROCOTO_SCHEDULER=lsfcray
 
-  module load ecflow/intel/4.7.1
-  ECFLOW_START=${ECF_ROOT}/intel/bin/ecflow_start.sh
+  module use /gpfs/hps/nco/ops/nwtest/modulefiles
+  module load ecflow/intel/4.17.0.1
+  ECFLOW_START=${ECF_ROOT}/bin/ecflow_start.sh
   ECF_PORT=$(grep $USER /usrx/local/sys/ecflow/assigned_ports.txt | awk '{print $2}')
 
   DISKNM=/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT
@@ -142,7 +156,7 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
   module use $PATHTR/modulefiles/${MACHINE_ID}
   module load fv3
 
-  module load python/2.7.14
+  module load python/3.6.3
 
   module use /usrx/local/dev/emc_rocoto/modulefiles
   module load ruby/2.5.1 rocoto/1.3.0rc2
@@ -152,8 +166,8 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
   ROCOTO_SCHEDULER=lsf
 
   module load ips/18.0.1.163
-  module load ecflow/4.7.1
-  ECFLOW_START=${ECF_ROOT}/intel/bin/ecflow_start.sh
+  module load ecflow/4.17.0
+  ECFLOW_START=${ECF_ROOT}/bin/ecflow_start.sh
   ECF_PORT=$(grep $USER /usrx/local/sys/ecflow/assigned_ports.txt | awk '{print $2}')
 
   DISKNM=/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT
@@ -203,9 +217,9 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   ROCOTOCOMPLETE=$(which rocotocomplete)
   ROCOTO_SCHEDULER=slurm
 
-  export PATH=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin:$PATH
-  export PYTHONPATH=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/lib/python2.7/site-packages
-  ECFLOW_START=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin/ecflow_start.sh
+  export PATH=/scratch2/NCEPDEV/stmp3/Minsuk.Ji/opt/miniconda3/bin:$PATH
+  export PYTHONPATH=/scratch2/NCEPDEV/stmp3/Minsuk.Ji/opt/miniconda3/lib/python3.8/site-packages
+  ECFLOW_START=/scratch2/NCEPDEV/stmp3/Minsuk.Ji/opt/miniconda3/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
 
   QUEUE=batch
@@ -234,10 +248,11 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   ROCOTORUN=$(which rocotorun)
   ROCOTOSTAT=$(which rocotostat)
   ROCOTOCOMPLETE=$(which rocotocomplete)
-  export PATH=/work/noaa/fv3-cam/djovic/ecflow/bin:$PATH
-  export PYTHONPATH=/work/noaa/fv3-cam/djovic/ecflow/lib/python2.7/site-packages
-  ECFLOW_START=/work/noaa/fv3-cam/djovic/ecflow/bin/ecflow_start.sh
+  export PATH=/work/noaa/stmp/jminsuk/opt/miniconda3/bin:$PATH
+  export PYTHONPATH=/work/noaa/stmp/jminsuk/opt/miniconda3/lib/python3.8/site-packages
+  ECFLOW_START=/work/noaa/stmp/jminsuk/opt/miniconda3/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
+
   QUEUE=batch
   COMPILE_QUEUE=batch
 #  ACCNR= # detected in detect_machine.sh
@@ -268,6 +283,7 @@ elif [[ $MACHINE_ID = jet.* ]]; then
   export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/ecFlow-5.3.1/lib/python2.7/site-packages
   ECFLOW_START=/lfs4/HFIP/hfv3gfs/software/ecFlow-5.3.1/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
+
   QUEUE=batch
   COMPILE_QUEUE=batch
   ACCNR=hfv3gfs
@@ -290,6 +306,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   export PYTHONPATH=/glade/p/ral/jntp/tools/ecFlow-5.3.1/lib/python2.7/site-packages
   ECFLOW_START=/glade/p/ral/jntp/tools/ecFlow-5.3.1/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
+
   QUEUE=regular
   COMPILE_QUEUE=regular
   PARTITION=
@@ -340,6 +357,7 @@ ROCOTO=false
 ECFLOW=false
 KEEP_RUNDIR=false
 SINGLE_NAME=''
+TEST_35D=false
 
 TESTS_FILE='rt.conf'
 
@@ -399,6 +417,10 @@ if [[ $SINGLE_NAME != '' ]]; then
   rt_single
 fi
 
+if [[ $TESTS_FILE =~ '35d' ]]; then
+  TEST_35D=true
+fi
+
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201106/${RT_COMPILER^^}}
 else
@@ -636,11 +658,16 @@ EOF
     MACHINES=$( echo $line | cut -d'|' -f4)
     CB=$(       echo $line | cut -d'|' -f5)
     DEP_RUN=$(  echo $line | cut -d'|' -f6 | sed -e 's/^ *//' -e 's/ *$//')
+    DATE_35D=$( echo $line | cut -d'|' -f7 | sed -e 's/^ *//' -e 's/ *$//')
+
     [[ -e "tests/$TEST_NAME" ]] || die "run test file tests/$TEST_NAME does not exist"
     [[ $SET_ID != ' ' && $SET != *${SET_ID}* ]] && continue
     [[ $MACHINES != ' ' && $MACHINES != *${MACHINE_ID}* ]] && continue
     [[ $CREATE_BASELINE == true && $CB != *fv3* ]] && continue
 
+    # 35 day tests
+    [[ $TEST_35D == true ]] && rt_35d
+
     # skip all *_appbuild runs if rocoto or ecFlow is used. FIXME
     if [[ ${ROCOTO} == true && ${ECFLOW} == true ]]; then
       if [[ ${TEST_NAME} == *_appbuild ]]; then
@@ -748,6 +775,7 @@ else
   rm -f fv3_*.x fv3_*.exe modules.fv3_*
   [[ ${KEEP_RUNDIR} == false ]] && rm -rf ${RUNDIR_ROOT}
   [[ ${ROCOTO} == true ]] && rm -f ${ROCOTO_XML} ${ROCOTO_DB} *_lock.db
+  [[ ${TEST_35D} == true ]] && rm -f tests/cpld_bmark*_20*
 fi
 
 date >> ${REGRESSIONTEST_LOG}

diff --git a/tests/rt_35d.conf b/tests/rt_35d.conf
@@ -0,0 +1,19 @@
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y  |   | hera.intel orion.intel | fv3 | |
+RUN     | cpld_bmark_35d |   |             | fv3 |  | 2012010100
+RUN     | cpld_bmark_35d |   |             | fv3 |  | 2012040100
+RUN     | cpld_bmark_35d |   |             | fv3 |  | 2012070100
+RUN     | cpld_bmark_35d |   |             | fv3 |  | 2012100100
+RUN     | cpld_bmark_35d |   |             | fv3 |  | 2013010100
+RUN     | cpld_bmark_35d |   |             | fv3 |  | 2013040100
+RUN     | cpld_bmark_35d |   |             | fv3 |  | 2013070100
+RUN     | cpld_bmark_35d |   |             | fv3 |  | 2013100100
+
+COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y WW3=Y  |   | hera.intel orion.intel | fv3 | |
+RUN     | cpld_bmark_wave_35d |   |             | fv3 |  | 2012010100
+RUN     | cpld_bmark_wave_35d |   |             | fv3 |  | 2012040100
+RUN     | cpld_bmark_wave_35d |   |             | fv3 |  | 2012070100
+RUN     | cpld_bmark_wave_35d |   |             | fv3 |  | 2012100100
+RUN     | cpld_bmark_wave_35d |   |             | fv3 |  | 2013010100
+RUN     | cpld_bmark_wave_35d |   |             | fv3 |  | 2013040100
+RUN     | cpld_bmark_wave_35d |   |             | fv3 |  | 2013070100
+RUN     | cpld_bmark_wave_35d |   |             | fv3 |  | 2013100100
diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -270,8 +270,16 @@ check_results() {
         d=$( cmp ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i | wc -l )
 
         if [[ $d -ne 0 ]] ; then
-          echo ".......NOT OK" >> ${REGRESSIONTEST_LOG}
-          echo ".......NOT OK"
+          if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ wcoss_dell_p3 || ${MACHINE_ID} =~ wcoss_cray ]]; then
+            printf ".......ALT CHECK.." >> ${REGRESSIONTEST_LOG}
+            printf ".......ALT CHECK.."
+            d=$( ${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i 2>/dev/null | wc -l )
+          fi
+        fi
+
+        if [[ $d -ne 0 ]]; then
+          echo "....NOT OK" >> ${REGRESSIONTEST_LOG}
+          echo "....NOT OK"
           test_status='FAIL'
         else
           echo "....OK" >> ${REGRESSIONTEST_LOG}

diff --git a/tests/tests/cpld_2threads b/tests/tests/cpld_2threads
@@ -51,8 +51,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_bmark b/tests/tests/cpld_bmark
@@ -53,8 +53,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc"
-                   #RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
+                   RESTART/iced.2013-04-02-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_bmark_wave b/tests/tests/cpld_bmark_wave
@@ -56,8 +56,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2013-04-02-00000.nc"
-                   #RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
+                   RESTART/iced.2013-04-02-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_ca b/tests/tests/cpld_ca
@@ -51,8 +51,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_control b/tests/tests/cpld_control
@@ -51,8 +51,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_control_12h b/tests/tests/cpld_control_12h
@@ -51,8 +51,8 @@ export LIST_FILES="phyf012.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-03-43200.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"
+                   RESTART/iced.2016-10-03-43200.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_control_c192 b/tests/tests/cpld_control_c192
@@ -50,8 +50,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_control_c384 b/tests/tests/cpld_control_c384
@@ -53,8 +53,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2016-10-04-00000.nc"
-                  #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_control_mx025 b/tests/tests/cpld_control_mx025
@@ -53,8 +53,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2016-10-04-00000.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_control_mx025_12h b/tests/tests/cpld_control_mx025_12h
@@ -53,8 +53,8 @@ export LIST_FILES="phyf012.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2016-10-03-43200.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"
+                   RESTART/iced.2016-10-03-43200.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_controlfrac_c384 b/tests/tests/cpld_controlfrac_c384
@@ -53,8 +53,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2016-10-04-00000.nc"
-                  #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_debug b/tests/tests/cpld_debug
@@ -51,8 +51,8 @@ export LIST_FILES="phyf006.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-03-21600.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc"
+                   RESTART/iced.2016-10-03-21600.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc"
 
 export_fv3
 export_cpl

diff --git a/tests/tests/cpld_decomp b/tests/tests/cpld_decomp
@@ -51,8 +51,8 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2016-10-04-00000.nc"
-                   #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
 
 export_fv3
 export_cpl