Skip to content

Commit 2c24858

Browse files
KateFriedman-NOAAKateFriedman-NOAA
committed
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)
2 parents 829459d + 145b67f commit 2c24858

File tree

263 files changed

+3523
-2315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+3523
-2315
lines changed

‎.gitignore‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@ jobs/JGFS_ATMOS_WAFS_BLENDING_0P25
146146
jobs/JGFS_ATMOS_WAFS_GCIP
147147
jobs/JGFS_ATMOS_WAFS_GRIB2
148148
jobs/JGFS_ATMOS_WAFS_GRIB2_0P25
149-
jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_POST
150-
jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_PREP
151-
jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_RUN
152-
jobs/JGDAS_GLOBAL_ATMOS_ENSANAL_POST
153-
jobs/JGDAS_GLOBAL_ATMOS_ENSANAL_PREP
154-
jobs/JGDAS_GLOBAL_ATMOS_ENSANAL_RUN
155149
# scripts symlinks
156150
scripts/exemcsfc_global_sfc_prep.sh
157151
scripts/exgdas_atmos_gldas.sh
@@ -196,6 +190,7 @@ ush/radmon_verf_bcoef.sh
196190
ush/radmon_verf_bcor.sh
197191
ush/radmon_verf_time.sh
198192
ush/ufsda
193+
ush/rstprod.sh
199194
ush/wafs_blending.sh
200195
ush/wafs_grib2.regrid.sh
201196
ush/wafs_intdsk.sh

‎env/HERA.env‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/ksh -x
1+
#! /usr/bin/env bash
22

33
if [ $# -ne 1 ]; then
44

@@ -261,9 +261,17 @@ elif [ $step = "postsnd" ]; then
261261

262262
elif [ $step = "awips" ]; then
263263

264-
echo "WARNING: $step is not enabled on $machine!"
264+
nth_max=$(($npe_node_max / $npe_node_awips))
265+
266+
export NTHREADS_AWIPS=${nth_awips:-2}
267+
[[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max
268+
export APRUN_AWIPSCFP="$launcher -n $npe_awips --multi-prog"
265269

266270
elif [ $step = "gempak" ]; then
267271

268-
echo "WARNING: $step is not enabled on $machine!"
272+
nth_max=$(($npe_node_max / $npe_node_gempak))
273+
274+
export NTHREADS_GEMPAK=${nth_gempak:-1}
275+
[[ $NTHREADS_GEMPAK -gt $nth_max ]] && export NTHREADS_GEMPAK=$nth_max
276+
export APRUN="$launcher -n $npe_gempak --multi-prog"
269277
fi

‎env/ORION.env‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/ksh -x
1+
#! /usr/bin/env bash
22

33
if [ $# -ne 1 ]; then
44

@@ -259,9 +259,17 @@ elif [ $step = "postsnd" ]; then
259259

260260
elif [ $step = "awips" ]; then
261261

262-
echo "WARNING: $step is not enabled on $machine!"
262+
nth_max=$(($npe_node_max / $npe_node_awips))
263+
264+
export NTHREADS_AWIPS=${nth_awips:-2}
265+
[[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max
266+
export APRUN_AWIPSCFP="$launcher -n $npe_awips --multi-prog"
263267

264268
elif [ $step = "gempak" ]; then
265269

266-
echo "WARNING: $step is not enabled on $machine!"
270+
nth_max=$(($npe_node_max / $npe_node_gempak))
271+
272+
export NTHREADS_GEMPAK=${nth_gempak:-1}
273+
[[ $NTHREADS_GEMPAK -gt $nth_max ]] && export NTHREADS_GEMPAK=$nth_max
274+
export APRUN="$launcher -n $npe_gempak --multi-prog"
267275
fi

‎jobs/JGDAS_ATMOS_ANALYSIS_DIAG‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#!/bin/bash
2-
set -x
1+
#! /usr/bin/env bash
32

4-
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
5-
export PS4='$SECONDS + '
6-
date
3+
source "$HOMEgfs/ush/preamble.sh"
74

5+
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
86

97
#############################
108
# Source relevant config files
@@ -112,11 +110,6 @@ fi
112110

113111
###############################################################
114112
# Run relevant script
115-
env
116-
echo "HAS BEGUN on $(hostname)"
117-
$LOGSCRIPT
118-
119-
120113
${ANALDIAGSH:-$SCRgfs/exglobal_diag.sh}
121114
status=$?
122115
[[ $status -ne 0 ]] && exit $status
@@ -133,15 +126,11 @@ if [ -e "$pgmout" ] ; then
133126
cat $pgmout
134127
fi
135128

136-
137-
echo "ENDED NORMALLY."
138-
139-
140129
##########################################
141130
# Remove the Temporary working directory
142131
##########################################
143132
cd $DATAROOT
144133
[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
145134

146-
date
135+
147136
exit 0

‎jobs/JGDAS_ATMOS_CHGRES_FORENKF‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#!/bin/bash
2-
set -x
1+
#! /usr/bin/env bash
32

4-
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
5-
export PS4='$SECONDS + '
6-
date
3+
source "$HOMEgfs/ush/preamble.sh"
74

5+
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
86

97
#############################
108
# Source relevant config files
@@ -97,11 +95,6 @@ export COMIN_GES_ENS="$ROTDIR/enkfgdas.$gPDY/$gcyc/$COMPONENT"
9795

9896
###############################################################
9997
# Run relevant script
100-
env
101-
echo "HAS BEGUN on $(hostname)"
102-
$LOGSCRIPT
103-
104-
10598
${CHGRESFCSTSH:-$SCRgfs/exgdas_atmos_chgres_forenkf.sh}
10699
status=$?
107100
[[ $status -ne 0 ]] && exit $status
@@ -118,15 +111,11 @@ if [ -e "$pgmout" ] ; then
118111
cat $pgmout
119112
fi
120113

121-
122-
echo "ENDED NORMALLY."
123-
124-
125114
##########################################
126115
# Remove the Temporary working directory
127116
##########################################
128117
cd $DATAROOT
129118
[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
130119

131-
date
120+
132121
exit 0

‎jobs/JGDAS_ATMOS_GEMPAK‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#!/bin/sh
1+
#! /usr/bin/env bash
22

3-
set -xa
4-
export PS4='$SECONDS + '
5-
date
3+
source "$HOMEgfs/ush/preamble.sh"
64

75
############################################
86
# GDAS GEMPAK PRODUCT GENERATION
@@ -73,7 +71,6 @@ fi
7371

7472
export pgmout=OUTPUT.$$
7573

76-
env
7774

7875
if [ -f $DATA/poescrip ]; then
7976
rm $DATA/poescript
@@ -107,11 +104,6 @@ APRUNCFP=$(eval echo $APRUN_GEMPAKCFP)
107104
$APRUNCFP $DATA/poescript
108105
export err=$?; err_chk
109106

110-
########################################################
111-
112-
msg="JOB $job HAS COMPLETED NORMALLY!"
113-
postmsg $jlogfile "$msg"
114-
115107
############################################
116108
# print exec I/O output
117109
############################################
@@ -126,4 +118,3 @@ if [ "$KEEPDATA" != "YES" ] ; then
126118
rm -rf $DATA
127119
fi
128120

129-
date

‎jobs/JGDAS_ATMOS_GEMPAK_META_NCDC‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#!/bin/sh
1+
#! /usr/bin/env bash
22

3-
set -xa
4-
export PS4='$SECONDS + '
5-
date
3+
source "$HOMEgfs/ush/preamble.sh"
64

75
############################################
86
# GDAS GEMPAK META NCDC PRODUCT GENERATION
@@ -86,7 +84,6 @@ fi
8684

8785
export pgmout=OUTPUT.$$
8886

89-
env
9087

9188
########################################################
9289
# Execute the script.
@@ -107,9 +104,6 @@ $SRCgfs/exgdas_atmos_gempak_gif_ncdc.sh
107104
export err=$?; err_chk
108105
########################################################
109106

110-
msg="JOB $job HAS COMPLETED NORMALLY!"
111-
postmsg $jlogfile "$msg"
112-
113107
############################################
114108
# print exec I/O output
115109
############################################
@@ -124,4 +118,3 @@ if [ "$KEEPDATA" != "YES" ] ; then
124118
rm -rf $DATA
125119
fi
126120

127-
date

‎jobs/JGDAS_EFSOI‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#!/bin/ksh
2-
set -x
1+
#! /usr/bin/env bash
32

4-
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
5-
export PS4='$SECONDS + '
6-
date
3+
source "$HOMEgfs/ush/preamble.sh"
74

5+
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
86

97
#############################
108
# Source relevant config files
@@ -97,10 +95,6 @@ mkdir -p $OSENSE_SAVE_DIR
9795

9896
###############################################################
9997
# Run relevant exglobal script
100-
env
101-
msg="HAS BEGUN on `hostname`"
102-
postmsg "$jlogfile" "$msg"
103-
$LOGSCRIPT
10498

10599
${EFSOIUPDSH:-$SCRgfs/exgdas_efsoi.sh}
106100
status=$?
@@ -117,17 +111,12 @@ if [ -e "$pgmout" ] ; then
117111
cat $pgmout
118112
fi
119113

120-
121-
msg="ENDED NORMALLY."
122-
postmsg "$jlogfile" "$msg"
123-
124-
125114
##########################################
126115
# Remove the Temporary working directory
127116
##########################################
128117
cd $DATAROOT
129118

130119
[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
131120

132-
date
121+
133122
exit 0

‎jobs/JGDAS_EFSOI_ECEN‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#!/bin/ksh
2-
set -x
1+
#! /usr/bin/env bash
32

4-
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
5-
export PS4='$SECONDS + '
6-
date
3+
source "$HOMEgfs/ush/preamble.sh"
74

5+
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
86

97
#############################
108
# Source relevant config files
@@ -106,11 +104,6 @@ export COMIN_GES_ENS="$ROTDIR/enkf$CDUMP.$gPDY/$gcyc/$COMPONENT"
106104

107105
###############################################################
108106
# Run relevant script
109-
env
110-
msg="HAS BEGUN on `hostname`"
111-
postmsg "$jlogfile" "$msg"
112-
$LOGSCRIPT
113-
114107

115108
${ENKFRECENSH:-$SCRgfs/exgdas_enkf_ecen.sh}
116109
status=$?
@@ -129,15 +122,11 @@ if [ -e "$pgmout" ] ; then
129122
fi
130123

131124

132-
msg="ENDED NORMALLY."
133-
postmsg "$jlogfile" "$msg"
134-
135-
136125
##########################################
137126
# Remove the Temporary working directory
138127
##########################################
139128
cd $DATAROOT
140129
[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
141130

142-
date
131+
143132
exit 0

‎jobs/JGDAS_EFSOI_FCST‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
#!/bin/ksh
2-
set -x
1+
#! /usr/bin/env bash
32

4-
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
5-
export PS4='$SECONDS + '
6-
date
3+
source "$HOMEgfs/ush/preamble.sh"
74

5+
export RUN_ENVIR=${RUN_ENVIR:-"nco"}
86

97
#############################
108
# Source relevant config files
@@ -93,11 +91,6 @@ export ENSBEG=$((ENSEND - NMEM_EFCSGRP + 1))
9391

9492
###############################################################
9593
# Run relevant script
96-
env
97-
msg="HAS BEGUN on `hostname`"
98-
postmsg "$jlogfile" "$msg"
99-
$LOGSCRIPT
100-
10194

10295
${ENKFFCSTSH:-$SCRgfs/exgdas_enkf_fcst.sh}
10396
status=$?
@@ -129,16 +122,11 @@ if [ -e "$pgmout" ] ; then
129122
cat $pgmout
130123
fi
131124

132-
133-
msg="ENDED NORMALLY."
134-
postmsg "$jlogfile" "$msg"
135-
136-
137125
##########################################
138126
# Remove the Temporary working directory
139127
##########################################
140128
cd $DATAROOT
141129
[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
142130

143-
date
131+
144132
exit 0

0 commit comments

Comments
 (0)