Merge branch 'develop' into feature/dev-wcoss2

* develop: Initial commit of directory comparison tools (#934) Add preamble, convert to bash, and remove env (#929) minimal intervention to create a data-atmosphere xml (#936) Remove Cray, Dell, WCOSS1 from module-setup.sh.inc (#943) bring GDASApp jjobs and exscripts to global-workflow (#941)
NOAA-EMC · Aug 1, 2022 · 2c24858 · 2c24858
2 parents 829459d + 145b67f
commit 2c24858
Show file tree

Hide file tree

Showing 263 changed files with 3,523 additions and 2,315 deletions.
diff --git a/.gitignore b/.gitignore
@@ -146,12 +146,6 @@ jobs/JGFS_ATMOS_WAFS_BLENDING_0P25
 jobs/JGFS_ATMOS_WAFS_GCIP
 jobs/JGFS_ATMOS_WAFS_GRIB2
 jobs/JGFS_ATMOS_WAFS_GRIB2_0P25
-jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_POST
-jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_PREP
-jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_RUN
-jobs/JGDAS_GLOBAL_ATMOS_ENSANAL_POST
-jobs/JGDAS_GLOBAL_ATMOS_ENSANAL_PREP
-jobs/JGDAS_GLOBAL_ATMOS_ENSANAL_RUN
 # scripts symlinks
 scripts/exemcsfc_global_sfc_prep.sh
 scripts/exgdas_atmos_gldas.sh
@@ -196,6 +190,7 @@ ush/radmon_verf_bcoef.sh
 ush/radmon_verf_bcor.sh
 ush/radmon_verf_time.sh
 ush/ufsda
+ush/rstprod.sh
 ush/wafs_blending.sh
 ush/wafs_grib2.regrid.sh
 ush/wafs_intdsk.sh
diff --git a/env/HERA.env b/env/HERA.env
@@ -1,4 +1,4 @@
-#!/bin/ksh -x
+#! /usr/bin/env bash
 
 if [ $# -ne 1 ]; then
 
@@ -261,9 +261,17 @@ elif [ $step = "postsnd" ]; then
 
 elif [ $step = "awips" ]; then
 
-     echo "WARNING: $step is not enabled on $machine!"
+    nth_max=$(($npe_node_max / $npe_node_awips))
+
+    export NTHREADS_AWIPS=${nth_awips:-2}
+    [[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max
+    export APRUN_AWIPSCFP="$launcher -n $npe_awips --multi-prog"
 
 elif [ $step = "gempak" ]; then
 
-     echo "WARNING: $step is not enabled on $machine!"
+    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 --multi-prog"
 fi
diff --git a/env/ORION.env b/env/ORION.env
@@ -1,4 +1,4 @@
-#!/bin/ksh -x
+#! /usr/bin/env bash
 
 if [ $# -ne 1 ]; then
 
@@ -259,9 +259,17 @@ elif [ $step = "postsnd" ]; then
 
 elif [ $step = "awips" ]; then
 
-     echo "WARNING: $step is not enabled on $machine!"
+    nth_max=$(($npe_node_max / $npe_node_awips))
+
+    export NTHREADS_AWIPS=${nth_awips:-2}
+    [[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max
+    export APRUN_AWIPSCFP="$launcher -n $npe_awips --multi-prog"
 
 elif [ $step = "gempak" ]; then
 
-     echo "WARNING: $step is not enabled on $machine!"
+    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 --multi-prog"
 fi
diff --git a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG b/jobs/JGDAS_ATMOS_ANALYSIS_DIAG
@@ -1,10 +1,8 @@
-#!/bin/bash
-set -x
+#! /usr/bin/env bash
 
-export RUN_ENVIR=${RUN_ENVIR:-"nco"}
-export PS4='$SECONDS + '
-date
+source "$HOMEgfs/ush/preamble.sh"
 
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
 
 #############################
 # Source relevant config files
@@ -112,11 +110,6 @@ fi
 
 ###############################################################
 # Run relevant script
-env
-echo "HAS BEGUN on $(hostname)"
-$LOGSCRIPT
-
-
 ${ANALDIAGSH:-$SCRgfs/exglobal_diag.sh}
 status=$?
 [[ $status -ne 0 ]] && exit $status
@@ -133,15 +126,11 @@ if [ -e "$pgmout" ] ; then
   cat $pgmout
 fi
 
-
-echo "ENDED NORMALLY."
-
-
 ##########################################
 # Remove the Temporary working directory
 ##########################################
 cd $DATAROOT
 [[ $KEEPDATA = "NO" ]] && rm -rf $DATA
 
-date
+
 exit 0
diff --git a/jobs/JGDAS_ATMOS_CHGRES_FORENKF b/jobs/JGDAS_ATMOS_CHGRES_FORENKF
@@ -1,10 +1,8 @@
-#!/bin/bash
-set -x
+#! /usr/bin/env bash
 
-export RUN_ENVIR=${RUN_ENVIR:-"nco"}
-export PS4='$SECONDS + '
-date
+source "$HOMEgfs/ush/preamble.sh"
 
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
 
 #############################
 # Source relevant config files
@@ -97,11 +95,6 @@ export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
 
 ###############################################################
 # Run relevant script
-env
-echo "HAS BEGUN on $(hostname)"
-$LOGSCRIPT
-
-
 ${CHGRESFCSTSH:-$SCRgfs/exgdas_atmos_chgres_forenkf.sh}
 status=$?
 [[ $status -ne 0 ]] && exit $status
@@ -118,15 +111,11 @@ if [ -e "$pgmout" ] ; then
   cat $pgmout
 fi
 
-
-echo "ENDED NORMALLY."
-
-
 ##########################################
 # Remove the Temporary working directory
 ##########################################
 cd $DATAROOT
 [[ $KEEPDATA = "NO" ]] && rm -rf $DATA
 
-date
+
 exit 0
diff --git a/jobs/JGDAS_ATMOS_GEMPAK b/jobs/JGDAS_ATMOS_GEMPAK
@@ -1,8 +1,6 @@
-#!/bin/sh
+#! /usr/bin/env bash
 
-set -xa
-export PS4='$SECONDS + '
-date
+source "$HOMEgfs/ush/preamble.sh"
 
 ############################################
 # GDAS GEMPAK PRODUCT GENERATION
@@ -73,7 +71,6 @@ fi
 
 export pgmout=OUTPUT.$$
 
-env
 
 if [ -f $DATA/poescrip ]; then
    rm $DATA/poescript
@@ -107,11 +104,6 @@ APRUNCFP=$(eval echo $APRUN_GEMPAKCFP)
 $APRUNCFP $DATA/poescript
 export err=$?; err_chk
 
-########################################################
-
-msg="JOB $job HAS COMPLETED NORMALLY!"
-postmsg $jlogfile "$msg"
-
 ############################################
 # print exec I/O output
 ############################################
@@ -126,4 +118,3 @@ if [ "$KEEPDATA" != "YES" ] ; then
   rm -rf $DATA
 fi
 
-date
diff --git a/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC b/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
@@ -1,8 +1,6 @@
-#!/bin/sh
+#! /usr/bin/env bash
 
-set -xa
-export PS4='$SECONDS + '
-date
+source "$HOMEgfs/ush/preamble.sh"
 
 ############################################
 # GDAS GEMPAK META NCDC PRODUCT GENERATION
@@ -86,7 +84,6 @@ fi
 
 export pgmout=OUTPUT.$$
 
-env
 
 ########################################################
 # Execute the script.
@@ -107,9 +104,6 @@ $SRCgfs/exgdas_atmos_gempak_gif_ncdc.sh
 export err=$?; err_chk
 ########################################################
 
-msg="JOB $job HAS COMPLETED NORMALLY!"
-postmsg $jlogfile "$msg"
-
 ############################################
 # print exec I/O output
 ############################################
@@ -124,4 +118,3 @@ if [ "$KEEPDATA" != "YES" ] ; then
   rm -rf $DATA
 fi
 
-date
diff --git a/jobs/JGDAS_EFSOI b/jobs/JGDAS_EFSOI
@@ -1,10 +1,8 @@
-#!/bin/ksh
-set -x
+#! /usr/bin/env bash
 
-export RUN_ENVIR=${RUN_ENVIR:-"nco"}
-export PS4='$SECONDS + '
-date
+source "$HOMEgfs/ush/preamble.sh"
 
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
 
 #############################
 # Source relevant config files
@@ -97,10 +95,6 @@ mkdir -p $OSENSE_SAVE_DIR
 
 ###############################################################
 # Run relevant exglobal script
-env
-msg="HAS BEGUN on `hostname`"
-postmsg "$jlogfile" "$msg"
-$LOGSCRIPT
 
 ${EFSOIUPDSH:-$SCRgfs/exgdas_efsoi.sh}
 status=$?
@@ -117,17 +111,12 @@ if [ -e "$pgmout" ] ; then
   cat $pgmout
 fi
 
-
-msg="ENDED NORMALLY."
-postmsg "$jlogfile" "$msg"
-
-
 ##########################################
 # Remove the Temporary working directory
 ##########################################
 cd $DATAROOT
 
 [[ $KEEPDATA = "NO" ]] && rm -rf $DATA
 
-date
+
 exit 0
diff --git a/jobs/JGDAS_EFSOI_ECEN b/jobs/JGDAS_EFSOI_ECEN
@@ -1,10 +1,8 @@
-#!/bin/ksh
-set -x
+#! /usr/bin/env bash
 
-export RUN_ENVIR=${RUN_ENVIR:-"nco"}
-export PS4='$SECONDS + '
-date
+source "$HOMEgfs/ush/preamble.sh"
 
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
 
 #############################
 # Source relevant config files
@@ -106,11 +104,6 @@ export COMIN_GES_ENS="$ROTDIR/enkf$CDUMP.$gPDY/$gcyc/$COMPONENT"
 
 ###############################################################
 # Run relevant script
-env
-msg="HAS BEGUN on `hostname`"
-postmsg "$jlogfile" "$msg"
-$LOGSCRIPT
-
 
 ${ENKFRECENSH:-$SCRgfs/exgdas_enkf_ecen.sh}
 status=$?
@@ -129,15 +122,11 @@ if [ -e "$pgmout" ] ; then
 fi
 
 
-msg="ENDED NORMALLY."
-postmsg "$jlogfile" "$msg"
-
-
 ##########################################
 # Remove the Temporary working directory
 ##########################################
 cd $DATAROOT
 [[ $KEEPDATA = "NO" ]] && rm -rf $DATA
 
-date
+
 exit 0
diff --git a/jobs/JGDAS_EFSOI_FCST b/jobs/JGDAS_EFSOI_FCST
@@ -1,10 +1,8 @@
-#!/bin/ksh
-set -x
+#! /usr/bin/env bash
 
-export RUN_ENVIR=${RUN_ENVIR:-"nco"}
-export PS4='$SECONDS + '
-date
+source "$HOMEgfs/ush/preamble.sh"
 
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
 
 #############################
 # Source relevant config files
@@ -93,11 +91,6 @@ export ENSBEG=$((ENSEND - NMEM_EFCSGRP + 1))
 
 ###############################################################
 # Run relevant script
-env
-msg="HAS BEGUN on `hostname`"
-postmsg "$jlogfile" "$msg"
-$LOGSCRIPT
-
 
 ${ENKFFCSTSH:-$SCRgfs/exgdas_enkf_fcst.sh}
 status=$?
@@ -129,16 +122,11 @@ if [ -e "$pgmout" ] ; then
   cat $pgmout
 fi
 
-
-msg="ENDED NORMALLY."
-postmsg "$jlogfile" "$msg"
-
-
 ##########################################
 # Remove the Temporary working directory
 ##########################################
 cd $DATAROOT
 [[ $KEEPDATA = "NO" ]] && rm -rf $DATA
 
-date
+
 exit 0