Implement ecflow option for unit testing (#1)

* Time taken for full unit tests is 40% of of that without using ecflow
* Numerous changes in utest for ecflow as well as better handling of baseline runs
* Modify run_test.sh to handle any failure before run_test
* Modify rt.sh to use ECFLOW_SUITE instead of regtest
* Modify rt_utils.sh to use ECFLOW_SUITE instead of regtest
* In rt_utils.sh, modify ecflow_create_run_task: make the call to run_test a foreground job so that 'set -e' error handling works properly by getting the correct exit status (another way would be to use 'job id' and 'wait job id' following the call to run_test &)
* Modify some of fv3_conf/*_run.IN files to handle errors when restart file copies fail

tests/UnitTests_hera.intel.log

@@ -1,6 +1,13 @@
 
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200202/fv3_control_32bit
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_32bit_base
+Checking test 32bit_base fv3_control results ....
+ mkdir -p /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_32bit/RESTART
+ Moving atmos_4xdaily.tile1.nc ..... Moving atmos_4xdaily.tile2.nc ..... Moving atmos_4xdaily.tile3.nc ..... Moving atmos_4xdaily.tile4.nc ..... Moving atmos_4xdaily.tile5.nc ..... Moving atmos_4xdaily.tile6.nc ..... Moving phyf000.tile1.nc ..... Moving phyf000.tile2.nc ..... Moving phyf000.tile3.nc ..... Moving phyf000.tile4.nc ..... Moving phyf000.tile5.nc ..... Moving phyf000.tile6.nc ..... Moving phyf024.tile1.nc ..... Moving phyf024.tile2.nc ..... Moving phyf024.tile3.nc ..... Moving phyf024.tile4.nc ..... Moving phyf024.tile5.nc ..... Moving phyf024.tile6.nc ..... Moving dynf000.tile1.nc ..... Moving dynf000.tile2.nc ..... Moving dynf000.tile3.nc ..... Moving dynf000.tile4.nc ..... Moving dynf000.tile5.nc ..... Moving dynf000.tile6.nc ..... Moving dynf024.tile1.nc ..... Moving dynf024.tile2.nc ..... Moving dynf024.tile3.nc ..... Moving dynf024.tile4.nc ..... Moving dynf024.tile5.nc ..... Moving dynf024.tile6.nc ..... Moving RESTART/coupler.res ..... Moving RESTART/fv_core.res.nc ..... Moving RESTART/fv_core.res.tile1.nc ..... Moving RESTART/fv_core.res.tile2.nc ..... Moving RESTART/fv_core.res.tile3.nc ..... Moving RESTART/fv_core.res.tile4.nc ..... Moving RESTART/fv_core.res.tile5.nc ..... Moving RESTART/fv_core.res.tile6.nc ..... Moving RESTART/fv_srf_wnd.res.tile1.nc ..... Moving RESTART/fv_srf_wnd.res.tile2.nc ..... Moving RESTART/fv_srf_wnd.res.tile3.nc ..... Moving RESTART/fv_srf_wnd.res.tile4.nc ..... Moving RESTART/fv_srf_wnd.res.tile5.nc ..... Moving RESTART/fv_srf_wnd.res.tile6.nc ..... Moving RESTART/fv_tracer.res.tile1.nc ..... Moving RESTART/fv_tracer.res.tile2.nc ..... Moving RESTART/fv_tracer.res.tile3.nc ..... Moving RESTART/fv_tracer.res.tile4.nc ..... Moving RESTART/fv_tracer.res.tile5.nc ..... Moving RESTART/fv_tracer.res.tile6.nc ..... Moving RESTART/phy_data.tile1.nc ..... Moving RESTART/phy_data.tile2.nc ..... Moving RESTART/phy_data.tile3.nc ..... Moving RESTART/phy_data.tile4.nc ..... Moving RESTART/phy_data.tile5.nc ..... Moving RESTART/phy_data.tile6.nc ..... Moving RESTART/sfc_data.tile1.nc ..... Moving RESTART/sfc_data.tile2.nc ..... Moving RESTART/sfc_data.tile3.nc ..... Moving RESTART/sfc_data.tile4.nc ..... Moving RESTART/sfc_data.tile5.nc ..... Moving RESTART/sfc_data.tile6.nc .....Test 32bit_base fv3_control PASS
+
+
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_32bit
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_102505/fv3_control_32bit
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_32bit
 Checking test 32bit fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -67,8 +74,15 @@ Checking test 32bit fv3_control results ....
 Test 32bit fv3_control PASS
 
 
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200202/fv3_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_debug_base
+Checking test debug_base fv3_control results ....
+ mkdir -p /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_debug/RESTART
+ Moving atmos_4xdaily.tile1.nc ..... Moving atmos_4xdaily.tile2.nc ..... Moving atmos_4xdaily.tile3.nc ..... Moving atmos_4xdaily.tile4.nc ..... Moving atmos_4xdaily.tile5.nc ..... Moving atmos_4xdaily.tile6.nc ..... Moving phyf000.tile1.nc ..... Moving phyf000.tile2.nc ..... Moving phyf000.tile3.nc ..... Moving phyf000.tile4.nc ..... Moving phyf000.tile5.nc ..... Moving phyf000.tile6.nc ..... Moving phyf024.tile1.nc ..... Moving phyf024.tile2.nc ..... Moving phyf024.tile3.nc ..... Moving phyf024.tile4.nc ..... Moving phyf024.tile5.nc ..... Moving phyf024.tile6.nc ..... Moving dynf000.tile1.nc ..... Moving dynf000.tile2.nc ..... Moving dynf000.tile3.nc ..... Moving dynf000.tile4.nc ..... Moving dynf000.tile5.nc ..... Moving dynf000.tile6.nc ..... Moving dynf024.tile1.nc ..... Moving dynf024.tile2.nc ..... Moving dynf024.tile3.nc ..... Moving dynf024.tile4.nc ..... Moving dynf024.tile5.nc ..... Moving dynf024.tile6.nc ..... Moving RESTART/coupler.res ..... Moving RESTART/fv_core.res.nc ..... Moving RESTART/fv_core.res.tile1.nc ..... Moving RESTART/fv_core.res.tile2.nc ..... Moving RESTART/fv_core.res.tile3.nc ..... Moving RESTART/fv_core.res.tile4.nc ..... Moving RESTART/fv_core.res.tile5.nc ..... Moving RESTART/fv_core.res.tile6.nc ..... Moving RESTART/fv_srf_wnd.res.tile1.nc ..... Moving RESTART/fv_srf_wnd.res.tile2.nc ..... Moving RESTART/fv_srf_wnd.res.tile3.nc ..... Moving RESTART/fv_srf_wnd.res.tile4.nc ..... Moving RESTART/fv_srf_wnd.res.tile5.nc ..... Moving RESTART/fv_srf_wnd.res.tile6.nc ..... Moving RESTART/fv_tracer.res.tile1.nc ..... Moving RESTART/fv_tracer.res.tile2.nc ..... Moving RESTART/fv_tracer.res.tile3.nc ..... Moving RESTART/fv_tracer.res.tile4.nc ..... Moving RESTART/fv_tracer.res.tile5.nc ..... Moving RESTART/fv_tracer.res.tile6.nc ..... Moving RESTART/phy_data.tile1.nc ..... Moving RESTART/phy_data.tile2.nc ..... Moving RESTART/phy_data.tile3.nc ..... Moving RESTART/phy_data.tile4.nc ..... Moving RESTART/phy_data.tile5.nc ..... Moving RESTART/phy_data.tile6.nc ..... Moving RESTART/sfc_data.tile1.nc ..... Moving RESTART/sfc_data.tile2.nc ..... Moving RESTART/sfc_data.tile3.nc ..... Moving RESTART/sfc_data.tile4.nc ..... Moving RESTART/sfc_data.tile5.nc ..... Moving RESTART/sfc_data.tile6.nc .....Test debug_base fv3_control PASS
+
+
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_102505/fv3_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_debug
 Checking test debug fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -136,7 +150,7 @@ Test debug fv3_control PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_std
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_102505/fv3_control_decomp
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_decomp
 Checking test decomp fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -204,7 +218,7 @@ Test decomp fv3_control PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_std
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_102505/fv3_control_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_mpi
 Checking test mpi fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -272,7 +286,7 @@ Test mpi fv3_control PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_std
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_102505/fv3_control_restart
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_restart
 Checking test restart fv3_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -321,8 +335,15 @@ Checking test restart fv3_control results ....
 Test restart fv3_control PASS
 
 
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200202/fv3_control_std
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_std_base
+Checking test std_base fv3_control results ....
+ mkdir -p /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_std/RESTART
+ Moving atmos_4xdaily.tile1.nc ..... Moving atmos_4xdaily.tile2.nc ..... Moving atmos_4xdaily.tile3.nc ..... Moving atmos_4xdaily.tile4.nc ..... Moving atmos_4xdaily.tile5.nc ..... Moving atmos_4xdaily.tile6.nc ..... Moving phyf000.tile1.nc ..... Moving phyf000.tile2.nc ..... Moving phyf000.tile3.nc ..... Moving phyf000.tile4.nc ..... Moving phyf000.tile5.nc ..... Moving phyf000.tile6.nc ..... Moving phyf024.tile1.nc ..... Moving phyf024.tile2.nc ..... Moving phyf024.tile3.nc ..... Moving phyf024.tile4.nc ..... Moving phyf024.tile5.nc ..... Moving phyf024.tile6.nc ..... Moving dynf000.tile1.nc ..... Moving dynf000.tile2.nc ..... Moving dynf000.tile3.nc ..... Moving dynf000.tile4.nc ..... Moving dynf000.tile5.nc ..... Moving dynf000.tile6.nc ..... Moving dynf024.tile1.nc ..... Moving dynf024.tile2.nc ..... Moving dynf024.tile3.nc ..... Moving dynf024.tile4.nc ..... Moving dynf024.tile5.nc ..... Moving dynf024.tile6.nc ..... Moving RESTART/coupler.res ..... Moving RESTART/fv_core.res.nc ..... Moving RESTART/fv_core.res.tile1.nc ..... Moving RESTART/fv_core.res.tile2.nc ..... Moving RESTART/fv_core.res.tile3.nc ..... Moving RESTART/fv_core.res.tile4.nc ..... Moving RESTART/fv_core.res.tile5.nc ..... Moving RESTART/fv_core.res.tile6.nc ..... Moving RESTART/fv_srf_wnd.res.tile1.nc ..... Moving RESTART/fv_srf_wnd.res.tile2.nc ..... Moving RESTART/fv_srf_wnd.res.tile3.nc ..... Moving RESTART/fv_srf_wnd.res.tile4.nc ..... Moving RESTART/fv_srf_wnd.res.tile5.nc ..... Moving RESTART/fv_srf_wnd.res.tile6.nc ..... Moving RESTART/fv_tracer.res.tile1.nc ..... Moving RESTART/fv_tracer.res.tile2.nc ..... Moving RESTART/fv_tracer.res.tile3.nc ..... Moving RESTART/fv_tracer.res.tile4.nc ..... Moving RESTART/fv_tracer.res.tile5.nc ..... Moving RESTART/fv_tracer.res.tile6.nc ..... Moving RESTART/phy_data.tile1.nc ..... Moving RESTART/phy_data.tile2.nc ..... Moving RESTART/phy_data.tile3.nc ..... Moving RESTART/phy_data.tile4.nc ..... Moving RESTART/phy_data.tile5.nc ..... Moving RESTART/phy_data.tile6.nc ..... Moving RESTART/sfc_data.tile1.nc ..... Moving RESTART/sfc_data.tile2.nc ..... Moving RESTART/sfc_data.tile3.nc ..... Moving RESTART/sfc_data.tile4.nc ..... Moving RESTART/sfc_data.tile5.nc ..... Moving RESTART/sfc_data.tile6.nc .....Test std_base fv3_control PASS
+
+
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_std
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_102505/fv3_control_std
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_std
 Checking test std fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -390,7 +411,7 @@ Test std fv3_control PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_UT/UNIT_TEST/fv3_control_std
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_102505/fv3_control_thread
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_UT/ut_286527/fv3_control_thread
 Checking test thread fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -457,5 +478,5 @@ Checking test thread fv3_control results ....
 Test thread fv3_control PASS
 
 UNIT TEST WAS SUCCESSFUL
-Tue Mar  3 04:10:07 UTC 2020
-Elapsed time: 00h:50m:25s. Have a nice day!
+Tue Mar 17 19:38:21 UTC 2020
+Elapsed time: 00h:20m:04s. Have a nice day!

tests/fv3_conf/ccpp_control_run.IN

@@ -27,6 +27,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/ccpp_csawmg_run.IN

@@ -17,6 +17,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/ccpp_gfdlmp_run.IN

@@ -17,6 +17,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/ccpp_satmedmf_run.IN

@@ -27,6 +27,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/csawmg3shoc127_run.IN

@@ -16,6 +16,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/csawmg_run.IN

@@ -15,6 +15,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/csawmgshoc_run.IN

@@ -15,6 +15,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/fv3_run.IN

@@ -27,6 +27,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/gfdlmp_run.IN

@@ -16,6 +16,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/satmedmf_run.IN

@@ -27,6 +27,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/fv3_conf/thompson_run.IN

@@ -15,9 +15,10 @@ else
     rm -f INPUT/fv_tracer.res.*
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
-    for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/20161003.120000.*; do
+    for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
-      RFILE_NEW="${RFILE_OLD//20161003.120000./}"
+      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}
     done
   fi

tests/fv3_conf/wsm6_run.IN

@@ -15,6 +15,7 @@ else
     rm -f INPUT/phy_data.*c
     rm -f INPUT/srf_data.*
     for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
       RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
       cp $RFILE INPUT/${RFILE_NEW}

tests/rt.sh

@@ -490,12 +490,13 @@ fi
 if [[ $ECFLOW == true ]]; then
 
   ECFLOW_RUN=${PATHRT}/ecflow_run
+  ECFLOW_SUITE=regtest
   rm -rf ${ECFLOW_RUN}
-  mkdir -p ${ECFLOW_RUN}/regtest
+  mkdir -p ${ECFLOW_RUN}/${ECFLOW_SUITE}
   cp head.h tail.h ${ECFLOW_RUN}
-  > ${ECFLOW_RUN}/regtest.def
-  cat << EOF >> ${ECFLOW_RUN}/regtest.def
-suite regtest
+  > ${ECFLOW_RUN}/${ECFLOW_SUITE}.def
+  cat << EOF >> ${ECFLOW_RUN}/${ECFLOW_SUITE}.def
+suite ${ECFLOW_SUITE}
     edit ECF_HOME '${ECFLOW_RUN}'
     edit ECF_INCLUDE '${ECFLOW_RUN}'
     edit ECF_KILL_CMD kill -15 %ECF_RID% > %ECF_JOB%.kill 2>&1
@@ -707,7 +708,7 @@ if [[ $ROCOTO == true ]]; then
 fi
 
 if [[ $ECFLOW == true ]]; then
-  echo "endsuite" >> ${ECFLOW_RUN}/regtest.def
+  echo "endsuite" >> ${ECFLOW_RUN}/${ECFLOW_SUITE}.def
   # run ecflow workflow until done
   ecflow_run
 fi