Assign machine- and RUN-specific resources

env/AWSPW.env

@@ -3,11 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "atmanlvar atmanlfv3inc atmensanlletkf atmensanlfv3inc aeroanlrun snowanl"
-    echo "anal sfcanl fcst post metp"
-    echo "eobs eupd ecen efcs epos"
-    echo "postsnd awips gempak"
     exit 1
 
 fi
@@ -26,13 +21,11 @@ ulimit -a
 
 if [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
-    if [[ "${CDUMP}" =~ "gfs" ]]; then
-        nprocs="npe_${step}_gfs"
-        ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
-    else
-        nprocs="npe_${step}"
-        ppn="npe_node_${step}"
-    fi
+    ppn="npe_node_${step}_${RUN}"
+    [[ -z "${!ppn+0}" ]] && ppn="npe_node_${step}"
+    nprocs="npe_${step}_${RUN}"
+    [[ -z ${!nprocs+0} ]] && nprocs="npe_${step}"
+
     (( nnodes = (${!nprocs}+${!ppn}-1)/${!ppn} ))
     (( ntasks = nnodes*${!ppn} ))
     # With ESMF threading, the model wants to use the full node
@@ -109,21 +102,6 @@ elif [[ "${step}" = "awips" ]]; then
     [[ ${NTHREADS_AWIPS} -gt ${nth_max} ]] && export NTHREADS_AWIPS=${nth_max}
     export APRUN_AWIPSCFP="${launcher} -n ${npe_awips} ${mpmd_opt}"
 
-elif [[ "${step}" = "gempak" ]]; then
-
-    export CFP_MP="YES"
-
-    if [[ ${CDUMP} == "gfs" ]]; then
-        npe_gempak=${npe_gempak_gfs}
-        npe_node_gempak=${npe_node_gempak_gfs}
-    fi
-
-    nth_max=$((npe_node_max / npe_node_gempak))
-
-    export NTHREADS_GEMPAK=${nth_gempak:-1}
-    [[ ${NTHREADS_GEMPAK} -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max}
-    export APRUN="${launcher} -n ${npe_gempak} ${mpmd_opt}"
-
 
 elif [[ "${step}" = "fit2obs" ]]; then
 

env/CONTAINER.env

@@ -3,11 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "atmanlvar atmanlfv3inc atmensanlletkf atmensanlfv3inc aeroanlrun snowanl"
-    echo "anal sfcanl fcst post metp"
-    echo "eobs eupd ecen efcs epos"
-    echo "postsnd awips gempak"
     exit 1
 
 fi

env/GAEA.env

@@ -3,8 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "fcst atmos_products"
     exit 1
 
 fi
@@ -19,13 +17,11 @@ ulimit -a
 
 if [[ "${step}" = "fcst" ]]; then
 
-    if [[ "${CDUMP}" =~ "gfs" ]]; then
-        nprocs="npe_${step}_gfs"
-        ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
-    else
-        nprocs="npe_${step}"
-        ppn="npe_node_${step}"
-    fi
+    ppn="npe_node_${step}_${RUN}"
+    [[ -z "${!ppn+0}" ]] && ppn="npe_node_${step}"
+    nprocs="npe_${step}_${RUN}"
+    [[ -z ${!nprocs+0} ]] && nprocs="npe_${step}"
+
     (( nnodes = (${!nprocs}+${!ppn}-1)/${!ppn} ))
     (( ntasks = nnodes*${!ppn} ))
     # With ESMF threading, the model wants to use the full node

env/HERA.env

@@ -3,11 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "atmanlvar atmanlfv3inc atmensanlletkf atmensanlfv3inc aeroanlrun snowanl"
-    echo "anal sfcanl fcst post metp"
-    echo "eobs eupd ecen efcs epos"
-    echo "postsnd awips gempak"
     exit 1
 
 fi
@@ -219,13 +214,11 @@ elif [[ "${step}" = "eupd" ]]; then
 
 elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
-    if [[ "${CDUMP}" =~ "gfs" ]]; then
-        nprocs="npe_${step}_gfs"
-        ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
-    else
-        nprocs="npe_${step}"
-        ppn="npe_node_${step}"
-    fi
+    ppn="npe_node_${step}_${RUN}"
+    [[ -z "${!ppn+0}" ]] && ppn="npe_node_${step}"
+    nprocs="npe_${step}_${RUN}"
+    [[ -z ${!nprocs+0} ]] && nprocs="npe_${step}"
+
     (( nnodes = (${!nprocs}+${!ppn}-1)/${!ppn} ))
     (( ntasks = nnodes*${!ppn} ))
     # With ESMF threading, the model wants to use the full node
@@ -314,10 +307,6 @@ elif [[ "${step}" = "gempak" ]]; then
 
     export CFP_MP="YES"
 
-    if [[ ${CDUMP} == "gfs" ]]; then
-        npe_node_gempak=${npe_node_gempak_gfs}
-    fi
-
     nth_max=$((npe_node_max / npe_node_gempak))
 
     export NTHREADS_GEMPAK=${nth_gempak:-1}

env/HERCULES.env

@@ -3,9 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "fcst post"
-    echo "Note: Hercules is only set up to run in forecast-only mode"
     exit 1
 
 fi
@@ -211,13 +208,12 @@ case ${step} in
  "fcst" | "efcs")
 
     export OMP_STACKSIZE=512M
-    if [[ "${CDUMP}" =~ "gfs" ]]; then
-        nprocs="npe_${step}_gfs"
-        ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
-    else
-        nprocs="npe_${step}"
-        ppn="npe_node_${step}"
-    fi
+
+    ppn="npe_node_${step}_${RUN}"
+    [[ -z "${!ppn+0}" ]] && ppn="npe_node_${step}"
+    nprocs="npe_${step}_${RUN}"
+    [[ -z ${!nprocs+0} ]] && nprocs="npe_${step}"
+
     (( nnodes = (${!nprocs}+${!ppn}-1)/${!ppn} ))
     (( ntasks = nnodes*${!ppn} ))
     # With ESMF threading, the model wants to use the full node
@@ -312,18 +308,7 @@ case ${step} in
  ;;
  "gempak")
 
-    export CFP_MP="YES"
-
-    if [[ ${CDUMP} == "gfs" ]]; then
-        npe_gempak=${npe_gempak_gfs}
-        npe_node_gempak=${npe_node_gempak_gfs}
-    fi
-
-    nth_max=$((npe_node_max / npe_node_gempak))
-
-    export NTHREADS_GEMPAK=${nth_gempak:-1}
-    [[ ${NTHREADS_GEMPAK} -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max}
-    export APRUN="${launcher} -n ${npe_gempak} ${mpmd_opt}"
+    echo "WARNING: ${step} is not enabled on ${machine}!"
 
  ;;
  "fit2obs")

env/JET.env

@@ -3,11 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "atmanlvar atmanlfv3inc atmensanlletkf atmensanlfv3inc aeroanlrun snowanl"
-    echo "anal sfcanl fcst post metp"
-    echo "eobs eupd ecen efcs epos"
-    echo "postsnd awips gempak"
     exit 1
 
 fi
@@ -192,13 +187,11 @@ elif [[ "${step}" = "eupd" ]]; then
 
 elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
-    if [[ "${CDUMP}" =~ "gfs" ]]; then
-        nprocs="npe_${step}_gfs"
-        ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
-    else
-        nprocs="npe_${step}"
-        ppn="npe_node_${step}"
-    fi
+    ppn="npe_node_${step}_${RUN}"
+    [[ -z "${!ppn+0}" ]] && ppn="npe_node_${step}"
+    nprocs="npe_${step}_${RUN}"
+    [[ -z ${!nprocs+0} ]] && nprocs="npe_${step}"
+
     (( nnodes = (${!nprocs}+${!ppn}-1)/${!ppn} ))
     (( ntasks = nnodes*${!ppn} ))
     # With ESMF threading, the model wants to use the full node

env/ORION.env

@@ -3,11 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "atmanlvar atmanlfv3inc atmensanlletkf atmensanlfv3inc aeroanlrun snowanl"
-    echo "anal sfcanl fcst post metp"
-    echo "eobs eupd ecen efcs epos"
-    echo "postsnd awips gempak"
     exit 1
 
 fi
@@ -226,14 +221,11 @@ elif [[ "${step}" = "eupd" ]]; then
 
 elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
-    export OMP_STACKSIZE=512M
-    if [[ "${CDUMP}" =~ "gfs" ]]; then
-        nprocs="npe_${step}_gfs"
-        ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
-    else
-        nprocs="npe_${step}"
-        ppn="npe_node_${step}"
-    fi
+    ppn="npe_node_${step}_${RUN}"
+    [[ -z "${!ppn+0}" ]] && ppn="npe_node_${step}"
+    nprocs="npe_${step}_${RUN}"
+    [[ -z ${!nprocs+0} ]] && nprocs="npe_${step}"
+
     (( nnodes = (${!nprocs}+${!ppn}-1)/${!ppn} ))
     (( ntasks = nnodes*${!ppn} ))
     # With ESMF threading, the model wants to use the full node
@@ -319,18 +311,7 @@ elif [[ "${step}" = "awips" ]]; then
 
 elif [[ "${step}" = "gempak" ]]; then
 
-    export CFP_MP="YES"
-
-    if [[ ${CDUMP} == "gfs" ]]; then
-        npe_gempak=${npe_gempak_gfs}
-        npe_node_gempak=${npe_node_gempak_gfs}
-    fi
-
-    nth_max=$((npe_node_max / npe_node_gempak))
-
-    export NTHREADS_GEMPAK=${nth_gempak:-1}
-    [[ ${NTHREADS_GEMPAK} -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max}
-    export APRUN="${launcher} -n ${npe_gempak} ${mpmd_opt}"
+    echo "WARNING: ${step} is not enabled on ${machine}!"
 
 elif [[ "${step}" = "fit2obs" ]]; then
 

env/S4.env

@@ -3,11 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "atmanlvar atmanlfv3inc atmensanlletkf atmensanlfv3inc aeroanlrun snowanl"
-    echo "anal sfcanl fcst post metp"
-    echo "eobs eupd ecen efcs epos"
-    echo "postsnd awips gempak"
     exit 1
 
 fi
@@ -179,13 +174,11 @@ elif [[ "${step}" = "eupd" ]]; then
 
 elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
-    if [[ "${CDUMP}" =~ "gfs" ]]; then
-        nprocs="npe_${step}_gfs"
-        ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
-    else
-        nprocs="npe_${step}"
-        ppn="npe_node_${step}"
-    fi
+    ppn="npe_node_${step}_${RUN}"
+    [[ -z "${!ppn+0}" ]] && ppn="npe_node_${step}"
+    nprocs="npe_${step}_${RUN}"
+    [[ -z ${!nprocs+0} ]] && nprocs="npe_${step}"
+
     (( nnodes = (${!nprocs}+${!ppn}-1)/${!ppn} ))
     (( ntasks = nnodes*${!ppn} ))
     # With ESMF threading, the model wants to use the full node
@@ -198,6 +191,7 @@ elif [[ "${step}" = "upp" ]]; then
 
     export NTHREADS_UPP=${nth_upp:-1}
     [[ ${NTHREADS_UPP} -gt ${nth_max} ]] && export NTHREADS_UPP=${nth_max}
+    export OMP_NUM_THREADS="${NTHREADS_UPP}"
     export APRUN_UPP="${launcher} -n ${npe_upp}"
 
 elif [[ "${step}" = "atmos_products" ]]; then

env/WCOSS2.env

@@ -3,11 +3,6 @@
 if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
-    echo "argument can be any one of the following:"
-    echo "atmanlvar atmanlfv3inc atmensanlletkf atmensanlfv3inc aeroanlrun snowanl"
-    echo "anal sfcanl fcst post metp"
-    echo "eobs eupd ecen esfc efcs epos"
-    echo "postsnd awips gempak"
     exit 1
 
 fi
@@ -38,7 +33,6 @@ elif [[ "${step}" = "prep_emissions" ]]; then
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll"  ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
     export USE_CFP="YES"
-    if [[ "${step}" = "waveprep" ]] && [[ "${CDUMP}" = "gfs" ]]; then export NTASKS=${NTASKS_gfs} ; fi
     export wavempexec="${launcher} -np"
     export wave_mpmd=${mpmd_opt}
 
@@ -182,13 +176,11 @@ elif [[ "${step}" = "eupd" ]]; then
 
 elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
-    if [[ "${CDUMP}" =~ "gfs" ]]; then
-        nprocs="npe_${step}_gfs"
-        ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
-    else
-        nprocs="npe_${step}"
-        ppn="npe_node_${step}"
-    fi
+    ppn="npe_node_${step}_${RUN}"
+    [[ -z "${!ppn+0}" ]] && ppn="npe_node_${step}"
+    nprocs="npe_${step}_${RUN}"
+    [[ -z ${!nprocs+0} ]] && nprocs="npe_${step}"
+
     (( nnodes = (${!nprocs}+${!ppn}-1)/${!ppn} ))
     (( ntasks = nnodes*${!ppn} ))
     # With ESMF threading, the model wants to use the full node
@@ -291,11 +283,6 @@ elif [[ "${step}" = "awips" ]]; then
 
 elif [[ "${step}" = "gempak" ]]; then
 
-    if [[ ${CDUMP} == "gfs" ]]; then
-        npe_gempak=${npe_gempak_gfs}
-        npe_node_gempak=${npe_node_gempak_gfs}
-    fi
-
     nth_max=$((npe_node_max / npe_node_gempak))
 
     export NTHREADS_GEMPAK=${nth_gempak:-1}

modulefiles/module_gwsetup.hercules.lua

@@ -3,7 +3,7 @@ Load environment to run GFS workflow ci scripts on Hercules
 ]])
 
 load(pathJoin("contrib","0.1"))
-load(pathJoin("rocoto","1.3.5"))
+load(pathJoin("rocoto","1.3.7"))
 
 prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
 

parm/config/gefs/config.resources

@@ -202,7 +202,7 @@ case ${step} in
         declare -x "wtime_${step}_gfs"="06:00:00"
         ;;
       *)
-        echo "FATAL ERROR: Resources not defined for job ${job} at resolution ${CASE}"
+        echo "FATAL ERROR: Resources not defined for job ${step} at resolution ${CASE}"
         exit 4
         ;;
     esac

parm/config/gfs/config.anal

@@ -19,12 +19,8 @@ if [[ "${CDUMP}" = "gfs" ]] ; then
   export DIAG_TARBALL="YES"
 fi
 
-export npe_gsi=${npe_anal}
-
-if [[ "${CDUMP}" == "gfs" ]] ; then
-  export npe_gsi=${npe_anal_gfs}
-  export nth_anal=${nth_anal_gfs}
-fi
+npe_var="npe_anal_${RUN/enkf}"
+export npe_gsi="${!npe_var}"
 
 # Set parameters specific to L127
 if [[ ${LEVS} = "128" ]]; then