Clean-up temporary rundirs - take 2.

.github/pull_request_template.md

@@ -33,6 +33,17 @@
 # Change characteristics
 - Is this a breaking change (a change in existing functionality)? YES/NO
 - Does this change require a documentation update? YES/NO
+- Does this change require an update to any of the following submodules? YES/NO
+ - [ ] UFS-weather-model
+ - [ ] UFS-UTILS
+ - [ ] GSI
+ - [ ] GSI-utils
+ - [ ] GSI-monitor
+ - [ ] GDAS
+ - [ ] EMC verif-global
+ - [ ] wxflow
+ - [ ] GFS-utils
+
 
 # How has this been tested?
 <!-- Please list any test you conducted, including the machine.

parm/config/gefs/config.base

@@ -98,7 +98,6 @@ export PSLOT="@PSLOT@"
 export EXPDIR="@EXPDIR@/${PSLOT}"
 export ROTDIR="@COMROOT@/${PSLOT}"
 
-export DATAROOT="${STMP}/RUNDIRS/${PSLOT}" # TODO: set via prod_envir in Ops
 export ARCDIR="${NOSCRUB}/archive/${PSLOT}"
 export ATARDIR="@ATARDIR@"
 

parm/config/gfs/config.base

@@ -128,7 +128,6 @@ export DUMP_SUFFIX=""
 if [[ "${PDY}${cyc}" -ge "2019092100" && "${PDY}${cyc}" -le "2019110700" ]]; then
  export DUMP_SUFFIX="p" # Use dumps from NCO GFS v15.3 parallel
 fi
-export DATAROOT="${STMP}/RUNDIRS/${PSLOT}" # TODO: set via prod_envir in Ops
 export ARCDIR="${NOSCRUB}/archive/${PSLOT}"
 export ATARDIR="@ATARDIR@"
 

scripts/exglobal_cleanup.sh

@@ -12,15 +12,11 @@ if [[ -d "${DATAfcst}" ]]; then rm -rf "${DATAfcst}"; fi
 #DATAefcs="${DATAROOT}/${RUN}efcs???${PDY:-}${cyc}"
 rm -rf "${DATAROOT}/${RUN}efcs"*"${PDY:-}${cyc}"
 
-# Search and delete files/directories from DATAROOT/ older than ${purge_every_days} days
-# purge_every_days should be a positive integer
-#purge_every_days=3
-
-# Find and delete files older than ${purge_every_days} days
-#find "${DATAROOT}/"* -type f -mtime "+${purge_every_days}" -exec rm -f {} \;
-
-# Find and delete directories older than ${purge_every_days} days
-#find "${DATAROOT}/"* -type d -mtime "+${purge_every_days}" -exec rm -rf {} \;
+# In XML, DATAROOT is defined as:
+#DATAROOT="${STMP}/RUNDIRS/${PSLOT}/${RUN}.${PDY}${cyc}"
+# cleanup is only executed after the entire cycle is successfully completed.
+# removing DATAROOT should be possible if that is the case.
+rm -rf "${DATAROOT}"
 
 echo "Cleanup ${DATAROOT} completed!"
 ###############################################################

ush/jjob_header.sh

@@ -39,7 +39,6 @@
 # [default: "YES"]
 # - $pid : Override the default process id
 # [default: $$]
-# 
 
 OPTIND=1
 while getopts "c:e:" option; do
@@ -99,7 +98,7 @@ for config in "${configs[@]:-''}"; do
  status=$?
  if (( status != 0 )); then
  echo "FATAL [${BASH_SOURCE[0]}]: Unable to load config config.${config}"
-  exit "${status}"
+  exit "${status}"
  fi
 done
 
@@ -111,5 +110,5 @@ source "${HOMEgfs}/env/${machine}.env" "${env_job}"
 status=$?
 if (( status != 0 )); then
  echo "FATAL [${BASH_SOURCE[0]}]: Error while sourcing machine environment ${machine}.env for job ${env_job}"
- exit "${status}"
+ exit "${status}"
 fi

workflow/rocoto/tasks.py

@@ -55,6 +55,8 @@ def __init__(self, app_config: AppConfig, cdump: str) -> None:
 
  self.n_tiles = 6 # TODO - this needs to be elsewhere
 
+ # DATAROOT is set by prod_envir in ops. Here, we use `STMP` to construct DATAROOT
+ dataroot_str = f"{self._base.get('STMP')}/RUNDIRS/{self._base.get('PSLOT')}/{self.cdump}.<cyclestr>@Y@m@d@H</cyclestr>"
  envar_dict = {'RUN_ENVIR': self._base.get('RUN_ENVIR', 'emc'),
  'HOMEgfs': self.HOMEgfs,
  'EXPDIR': self._base.get('EXPDIR'),
@@ -65,7 +67,7 @@ def __init__(self, app_config: AppConfig, cdump: str) -> None:
  'PDY': '<cyclestr>@Y@m@d</cyclestr>',
  'cyc': '<cyclestr>@H</cyclestr>',
  'COMROOT': self._base.get('COMROOT'),
- 'DATAROOT': self._base.get('DATAROOT')}
+ 'DATAROOT': dataroot_str}
 
  self.envars = self._set_envars(envar_dict)