Update make_ics to use umbrella data and make_lbcs to use COMOUT inst…

…ead of nwges
NOAA-EMC · Oct 28, 2024 · 8a73f0b · 8a73f0b
1 parent 60b709d
commit 8a73f0b
Show file tree

Hide file tree

Showing 17 changed files with 126 additions and 123 deletions.
diff --git a/jobs/JRRFS_BLEND_ICS b/jobs/JRRFS_BLEND_ICS
@@ -59,25 +59,21 @@ on the RRFS initial conditions.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
+export outid=${outid:-"LL$job"}
+export jobid=${jobid:-taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
-export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics"
+export umbrella_data="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/${mem_num}/ics"
 
 export DATA=${DATAROOT}/${jobid}
-mkdir -p $DATA
-
-mkdir -p ${DATA}/tmp_ICS
-cd ${DATA}/tmp_ICS
-
-mkdir -p "${NWGES_DIR}"
+mkdir -p $DATA $umbrella_data
+cd ${DATA}
 
 #-----------------------------------------------------------------------
 # Execute the script.
 #-----------------------------------------------------------------------
 
-export pgmout="${DATA}/tmp_ICS/OUTPUT.$$"
+export pgmout="${DATA}/OUTPUT.$$"
 env
 
 $HOMErrfs/scripts/exrrfs_blend_ics.sh
@@ -88,6 +84,7 @@ if [ -e "$pgmout" ]; then
 fi
 
 if [ "${KEEPDATA}" = "NO" ]; then
+  cd ${DATAROOT}
   rm -rf ${DATA}
 fi
 

diff --git a/jobs/JRRFS_FSM b/jobs/JRRFS_FSM
@@ -13,7 +13,8 @@ export EXECrrfs=${EXECrrfs:-${HOMErrfs}/exec}
 export FIXrrfs=${FIXrrfs:-${HOMErrfs}/fix}
 
 export DATAROOT="${DATAROOT:-${DATAROOT_dfv}}"
-export DATA=${DATA:-${DATAROOT}/${jobid}}
+export umbrella_data=${DATAROOT}/${RUN}_${PDY}${cyc}
+export DATA=${DATA:-${umbrella_data}/${jobid}}
 
 mkdir -p ${DATA}
 cd ${DATA}

diff --git a/jobs/JRRFS_MAKE_ICS b/jobs/JRRFS_MAKE_ICS
@@ -134,33 +134,29 @@ extrn_mdl_fns_on_disk_str="( "$( printf "\"%s\" " "${fns_on_disk[@]}" )")"
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
+export outid=${outid:-"LL$job"}
+export jobid=${jobid:-taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
 if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-  export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics"
+  export umbrella_data="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/${mem_num}/ics"
 else
-  export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/ics"
+  export umbrella_data="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/ics"
 fi
 
 export DATA=${DATAROOT}/${jobid}
-mkdir -p $DATA
-
-mkdir -p ${DATA}/tmp_ICS
-cd ${DATA}/tmp_ICS
-
-mkdir -p "${NWGES_DIR}"
+mkdir -p $DATA $umbrella_data
+cd ${DATA}
 
 export use_user_staged_extrn_files="${USE_USER_STAGED_EXTRN_FILES}"
 export extrn_mdl_source_dir="${extrn_mdl_sysdir}"
-export extrn_mdl_staging_dir="${DATA}/tmp_ICS"
+export extrn_mdl_staging_dir="${DATA}"
 
 #-----------------------------------------------------------------------
 # Execute the script.
 #-----------------------------------------------------------------------
 
-export pgmout="${DATA}/tmp_ICS/OUTPUT.$$"
+export pgmout="${DATA}/OUTPUT.$$"
 env
 
 ${HOMErrfs}/scripts/exrrfs_make_ics.sh \
@@ -172,6 +168,7 @@ if [ -e "$pgmout" ]; then
 fi
 
 if [ "${KEEPDATA}" = "NO" ]; then
+  cd ${DATAROOT}
   rm -rf ${DATA}
 fi
 

diff --git a/jobs/JRRFS_MAKE_LBCS b/jobs/JRRFS_MAKE_LBCS
@@ -173,32 +173,37 @@ extrn_mdl_fns_on_disk_str2="( "$( printf "\"%s\" " "${fns_on_disk2[@]}" )")"
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
+export outid=${outid:-"LL$job"}
+export jobid=${jobid:-taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
-if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-  export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/lbcs"
-else
-  export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/lbcs"
-fi
 
 export DATA=${DATAROOT}/${jobid}
 mkdir -p $DATA
+cd ${DATA}
 
-mkdir -p ${DATA}/tmp_LBCS_${bcgrp}
-cd ${DATA}/tmp_LBCS_${bcgrp}
+export use_user_staged_extrn_files="${USE_USER_STAGED_EXTRN_FILES}"
+export extrn_mdl_staging_dir="${DATA}"
 
-mkdir -p "${NWGES_DIR}"
+#-----------------------------------------------------------------------
+# Define COM directories
+#-----------------------------------------------------------------------
+# Send data to COMOUT since the LBCs jobs share data with other jobs
+# outside of the current cycle
 
-export use_user_staged_extrn_files="${USE_USER_STAGED_EXTRN_FILES}"
-export extrn_mdl_staging_dir="${DATA}/tmp_LBCS_${bcgrp}"
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}/${mem_num}/lbcs)}"
+else
+  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}/lbcs)}"
+fi
+
+mkdir -p "${COMOUT}"
 
 #-----------------------------------------------------------------------
 # Execute the script.
 #-----------------------------------------------------------------------
 
-export pgmout="${DATA}/tmp_LBCS_${bcgrp}/OUTPUT.$$"
+export pgmout="${DATA}/OUTPUT.$$"
 env
 
 ${HOMErrfs}/scripts/exrrfs_make_lbcs.sh \
@@ -212,6 +217,7 @@ if [ -e "$pgmout" ]; then
 fi
 
 if [ "${KEEPDATA}" = "NO" ]; then
+  cd ${DATAROOT}
   rm -rf ${DATA}
 fi
 

diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml
@@ -42,7 +42,6 @@ Workflow task names.
 <!ENTITY ANALYSIS_GSI_TN         "{{ analysis_gsi }}">
 <!ENTITY ANALYSIS_GSIDIAG_TN     "{{ analysis_gsidiag }}">
 <!ENTITY UPDATE_LBC_SOIL_TN      "{{ update_lbc_soil }}">
-<!ENTITY OBSERVER_GSI_ENSMEAN_TN "{{ observer_gsi_ensmean }}">
 <!ENTITY OBSERVER_GSI_TN         "{{ observer_gsi }}">
 <!ENTITY PREP_CYC_SPINUP_TN      "{{ prep_cyc_spinup }}">
 <!ENTITY PREP_CYC_PROD_TN        "{{ prep_cyc_prod }}">
@@ -68,6 +67,7 @@ Workflow task names.
 <!ENTITY RUN   "{{ run }}">
 <!ENTITY RUNE  "enk{{ run }}">
 <!ENTITY envir "{{ envir }}">
+<!ENTITY WGF "{{ wgf }}">
 
 <!--
 Flags that determine whether to run the specific tasks.
@@ -855,6 +855,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
     <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
@@ -1176,6 +1177,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>HH</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>spinup</cyclestr></value></envar>
     <envar><name>CYCLE_SUBTYPE</name><value><cyclestr>ensinit</cyclestr></value></envar>
@@ -1376,7 +1378,7 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 ************************************************************************
 -->
-  <task name="&OBSERVER_GSI_ENSMEAN_TN;_spinup" cycledefs="spinupcyc" maxtries="{{ maxtries_analysis_gsi }}">
+  <task name="&OBSERVER_GSI_TN;_spinup_ensmean" cycledefs="spinupcyc" maxtries="{{ maxtries_analysis_gsi }}">
 
     &RSRV_ANALYSIS;
     &WALL_LIMIT_ANALYSIS;
@@ -1386,11 +1388,11 @@ MODULES_RUN_TASK_FP script.
     &NATIVE_ANALYSIS_GSI;
     <walltime>&WALLTIME_ANALYSIS_GSI;</walltime>
     &NODESIZE_ALL;
-    <jobname>&TAG;_&OBSERVER_GSI_ENSMEAN_TN;_spinup</jobname>
-    <join><cyclestr>&LOGDIR;/&OBSERVER_GSI_ENSMEAN_TN;_spinup_&TAG;_@Y@m@[email protected]</cyclestr></join>
+    <jobname>&TAG;_&OBSERVER_GSI_TN;_spinup_ensmean</jobname>
+    <join><cyclestr>&LOGDIR;/&OBSERVER_GSI_TN;_spinup_ensmean_&TAG;_@Y@m@[email protected]</cyclestr></join>
 
     <envar><name>GLOBAL_VAR_DEFNS_FP</name><value>&GLOBAL_VAR_DEFNS_FP;</value></envar>
-    <envar><name>taskid</name><value><cyclestr>&RUN;_&OBSERVER_GSI_ENSMEAN_TN;_spinup_&envir;_@H</cyclestr></value></envar>
+    <envar><name>taskid</name><value><cyclestr>&RUN;_&OBSERVER_GSI_TN;_spinup_ensmean_&envir;_@H</cyclestr></value></envar>
     <envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
     <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
@@ -1452,6 +1454,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
+    <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GSI_TYPE</name><value><cyclestr>OBSERVER</cyclestr></value></envar>
     <envar><name>MEM_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>spinup</cyclestr></value></envar>
@@ -1461,7 +1464,7 @@ MODULES_RUN_TASK_FP script.
 
     <dependency>
        <and>
-         <taskdep task="&OBSERVER_GSI_ENSMEAN_TN;_spinup"/>
+         <taskdep task="&OBSERVER_GSI_TN;_spinup_ensmean"/>
        </and>
     </dependency>
 
@@ -1957,6 +1960,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>spinup</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
@@ -2356,7 +2360,7 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 ************************************************************************
 -->
-  <task name="&OBSERVER_GSI_ENSMEAN_TN;" cycledefs="prodcyc,prodcyc_long" maxtries="{{ maxtries_analysis_gsi }}">
+  <task name="&OBSERVER_GSI_TN;_ensmean" cycledefs="prodcyc,prodcyc_long" maxtries="{{ maxtries_analysis_gsi }}">
 
     &RSRV_ANALYSIS;
     &WALL_LIMIT_ANALYSIS;
@@ -2366,11 +2370,11 @@ MODULES_RUN_TASK_FP script.
     &NATIVE_ANALYSIS_GSI;
     <walltime>&WALLTIME_ANALYSIS_GSI;</walltime>
     &NODESIZE_ALL;
-    <jobname>&TAG;_&OBSERVER_GSI_ENSMEAN_TN;</jobname>
-    <join><cyclestr>&LOGDIR;/&OBSERVER_GSI_ENSMEAN_TN;_&TAG;_@Y@m@[email protected]</cyclestr></join>
+    <jobname>&TAG;_&OBSERVER_GSI_TN;_ensmean</jobname>
+    <join><cyclestr>&LOGDIR;/&OBSERVER_GSI_TN;_ensmean_&TAG;_@Y@m@[email protected]</cyclestr></join>
 
     <envar><name>GLOBAL_VAR_DEFNS_FP</name><value>&GLOBAL_VAR_DEFNS_FP;</value></envar>
-    <envar><name>taskid</name><value><cyclestr>&RUN;_&OBSERVER_GSI_ENSMEAN_TN;_&envir;_@H</cyclestr></value></envar>
+    <envar><name>taskid</name><value><cyclestr>&RUN;_&OBSERVER_GSI_TN;_ensmean_&envir;_@H</cyclestr></value></envar>
     <envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
     <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
@@ -2443,7 +2447,7 @@ MODULES_RUN_TASK_FP script.
 
     <dependency>
        <and>
-         <taskdep task="&OBSERVER_GSI_ENSMEAN_TN;"/>
+         <taskdep task="&OBSERVER_GSI_TN;_ensmean"/>
        </and>
     </dependency>
 
@@ -3030,6 +3034,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>prod</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
@@ -3110,6 +3115,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>prod</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>

diff --git a/parm/FV3LAM_wflow_firewx.xml b/parm/FV3LAM_wflow_firewx.xml
@@ -38,6 +38,7 @@ Workflow task names.
 <!ENTITY NET                  "{{ net }}">
 <!ENTITY RUN                  "{{ run }}">
 <!ENTITY envir                "{{ envir }}">
+<!ENTITY WGF                  "{{ wgf }}">
 
 <!--
 Flags that specify whether to run the preprocessing tasks.
@@ -336,6 +337,7 @@ MODULES_RUN_TASK_FP script.
       <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
       <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
       <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+      <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
       <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
       <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
       <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
@@ -381,6 +383,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>RESTART_HRS</name><value><cyclestr>0</cyclestr></value></envar>

diff --git a/parm/FV3LAM_wflow_nonDA.xml b/parm/FV3LAM_wflow_nonDA.xml
@@ -38,6 +38,7 @@ Workflow task names.
 <!ENTITY NET                  "{{ net }}">
 <!ENTITY RUN                  "{{ run }}">
 <!ENTITY envir                "{{ envir }}">
+<!ENTITY WGF                  "{{ wgf }}">
 
 <!--
 Flags that specify whether to run the preprocessing tasks.
@@ -346,6 +347,7 @@ MODULES_RUN_TASK_FP script.
       <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
       <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
       <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+      <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
       <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
       <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
       <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
@@ -397,6 +399,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>RESTART_HRS</name><value><cyclestr>0</cyclestr></value></envar>

diff --git a/scripts/exrrfs_blend_ics.sh b/scripts/exrrfs_blend_ics.sh
@@ -53,7 +53,7 @@ on the RRFS initial conditions.
 #
 #-----------------------------------------------------------------------
 #
-extrn_mdl_staging_dir="${DATA}/tmp_ICS"
+extrn_mdl_staging_dir="${umbrella_data}"
 extrn_mdl_var_defns_fp="${extrn_mdl_staging_dir}/${EXTRN_MDL_ICS_VAR_DEFNS_FN}"
 . ${extrn_mdl_var_defns_fp}
 #
@@ -179,7 +179,6 @@ if [[ $DO_ENS_BLENDING == "TRUE" ]]; then
      # Required NETCDF files - RRFS
      cpreq -p ${GESROOT}/${RUN}.${yyyymmdd_m1}/${hh_m1}/${mem_num}/forecast/RESTART/${yyyymmdd}.${hh}0000.fv_core.res.tile1.nc ./fv_core.res.tile1.nc
      cpreq -p ${GESROOT}/${RUN}.${yyyymmdd_m1}/${hh_m1}/${mem_num}/forecast/RESTART/${yyyymmdd}.${hh}0000.fv_tracer.res.tile1.nc ./fv_tracer.res.tile1.nc
-     #cpreq -p ${NWGES_BASEDIR}/${cdate_crnt_fhr_m1}${SLASH_ENSMEM_SUBDIR}/fcst_fv3lam/RESTART/${yyyymmdd}.${hh}0000.fv_core.res.nc ./fv_core.res.nc
 
      # Shortcut the file names/arguments.
      Lx=$ENS_BLENDING_LENGTHSCALE
@@ -218,26 +217,18 @@ fi
 #
 if [[ $DO_ENS_BLENDING = "FALSE" || ($DO_ENS_BLENDING = "TRUE" && -f $run_ensinit ) ]]; then
   mv out.atm.tile${TILE_RGNL}.nc \
-        ${DATA}/gfs_data.tile${TILE_RGNL}.halo${NH0}.nc
+        ${umbrella_data}/gfs_data.tile${TILE_RGNL}.halo${NH0}.nc
 
   mv out.sfc.tile${TILE_RGNL}.nc \
-        ${DATA}/sfc_data.tile${TILE_RGNL}.halo${NH0}.nc
+        ${umbrella_data}/sfc_data.tile${TILE_RGNL}.halo${NH0}.nc
 
-  mv gfs_ctrl.nc ${DATA}
+  mv gfs_ctrl.nc ${umbrella_data}
 
-  mv gfs.bndy.nc ${DATA}/gfs_bndy.tile${TILE_RGNL}.000.nc
+  mv gfs.bndy.nc ${umbrella_data}/gfs_bndy.tile${TILE_RGNL}.000.nc
 fi
-#
-#-----------------------------------------------------------------------
-#
-# copy results to nwges for longer time disk storage.
-#
-#-----------------------------------------------------------------------
-#
-cp ${DATA}/*.nc ${NWGES_DIR}/.
 
 if [ $DO_ENS_BLENDING = "TRUE" ] && [ -f $run_blending ] && [ ! -f $run_ensinit ]; then
-  cp ${DATA}/coupler.res ${NWGES_DIR}/.
+  cp ${DATA}/coupler.res ${umbrella_data}/.
 fi
 #
 #-----------------------------------------------------------------------