Skip to content

Add preamble, convert to bash, and remove env #929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WalterKolczynski-NOAA merged 16 commits into from
Jul 29, 2022
Merged

Add preamble, convert to bash, and remove env #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
82bebd5
Add preamble, convert to bash, and remove env
WalterKolczynski-NOAA Jul 23, 2022
954ea2d
Remove ability to override preamble script
WalterKolczynski-NOAA Jul 26, 2022
3b9432b
Merge branch 'develop' of github.com:WalterKolczynski-NOAA/global-wor…
WalterKolczynski-NOAA Jul 27, 2022
62c4081
Replace remaining preamble script blocks
WalterKolczynski-NOAA Jul 27, 2022
ec8eb26
Abstract safe_copy into new file_utils script
WalterKolczynski-NOAA Jul 27, 2022
dfc957d
Change safe_copy to nb_copy
WalterKolczynski-NOAA Jul 27, 2022
dcb993c
Remove stray POSTAMBLE_SCRIPT
WalterKolczynski-NOAA Jul 27, 2022
0e4f2da
Fix a couple minor typos
WalterKolczynski-NOAA Jul 27, 2022
e9ec9ce
Add accidentally delete else back in
WalterKolczynski-NOAA Jul 28, 2022
c450107
Remove unneeded rundir cleanup in wave init
WalterKolczynski-NOAA Jul 28, 2022
b92f938
Remove wait in rocoto post script
WalterKolczynski-NOAA Jul 28, 2022
a1687c7
Enamble WW3 predet
WalterKolczynski-NOAA Jul 28, 2022
c61a673
Fix rc check in gocart postdet
WalterKolczynski-NOAA Jul 28, 2022
6349f5c
Merge branch 'develop' into feature/add_preamble
WalterKolczynski-NOAA Jul 28, 2022
6ca239d
Add preamble to new GDAS scripts
WalterKolczynski-NOAA Jul 28, 2022
c19cfe0
Removed unncessary DATA cleanup in job/rocoto scripts
WalterKolczynski-NOAA Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,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
14 changes: 11 additions & 3 deletions env/HERA.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/ksh -x
#! /usr/bin/env bash

if [ $# -ne 1 ]; then

Expand Down Expand Up @@ -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"
Comment thread
aerorahul marked this conversation as resolved.
fi
14 changes: 11 additions & 3 deletions env/ORION.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/ksh -x
#! /usr/bin/env bash

if [ $# -ne 1 ]; then

Expand Down Expand Up @@ -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
19 changes: 4 additions & 15 deletions jobs/JGDAS_ATMOS_ANALYSIS_DIAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
19 changes: 4 additions & 15 deletions jobs/JGDAS_ATMOS_CHGRES_FORENKF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
13 changes: 2 additions & 11 deletions jobs/JGDAS_ATMOS_GEMPAK
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -73,7 +71,6 @@ fi

export pgmout=OUTPUT.$$

env

if [ -f $DATA/poescrip ]; then
rm $DATA/poescript
Expand Down Expand Up @@ -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
############################################
Expand All @@ -126,4 +118,3 @@ if [ "$KEEPDATA" != "YES" ] ; then
rm -rf $DATA
fi

date
11 changes: 2 additions & 9 deletions jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -86,7 +84,6 @@ fi

export pgmout=OUTPUT.$$

env

########################################################
# Execute the script.
Expand All @@ -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
############################################
Expand All @@ -124,4 +118,3 @@ if [ "$KEEPDATA" != "YES" ] ; then
rm -rf $DATA
fi

date
19 changes: 4 additions & 15 deletions jobs/JGDAS_EFSOI
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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=$?
Expand All @@ -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
19 changes: 4 additions & 15 deletions jobs/JGDAS_EFSOI_ECEN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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=$?
Expand All @@ -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
20 changes: 4 additions & 16 deletions jobs/JGDAS_EFSOI_FCST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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=$?
Expand Down Expand Up @@ -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
20 changes: 4 additions & 16 deletions jobs/JGDAS_EFSOI_POST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -84,11 +82,6 @@ export LEVS=$((LEVS-1))

###############################################################
# Run relevant script
env
msg="HAS BEGUN on `hostname`"
postmsg "$jlogfile" "$msg"
$LOGSCRIPT


${ENKFPOSTSH:-$SCRgfs/exgdas_enkf_post.sh}
status=$?
Expand All @@ -106,16 +99,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
Loading