Skip to content

Commit a75e73e

Browse files
jderrico-noaajderrico-noaa
authored
Merge branch 'NOAA-EMC:develop' into develop
2 parents 5adc47b + 9d901db commit a75e73e

36 files changed

+413
-419
lines changed

‎jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#! /usr/bin/env bash
22

3-
# TODO (#1222) This job is not part of the rocoto suite
4-
53
############################################
64
# GFS_PGRB2_SPEC_GEMPAK PRODUCT GENERATION
75
############################################
@@ -12,12 +10,12 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_spec" -c "base"
1210
################################
1311
# Set up the HOME directory
1412
################################
15-
export EXECgfs=${EXECgfs:-${HOMEgfs}/exec}
16-
export PARMgfs=${PARMgfs:-${HOMEgfs}/parm}
17-
export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config}
18-
export FIXgempak=${FIXgempak:-${HOMEgfs}/gempak/fix}
19-
export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush}
20-
export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts}
13+
export EXECgfs="${EXECgfs:-${HOMEgfs}/exec}"
14+
export PARMgfs="${PARMgfs:-${HOMEgfs}/parm}"
15+
export EXPDIR="${EXPDIR:-${HOMEgfs}/parm/config}"
16+
export FIXgempak="${FIXgempak:-${HOMEgfs}/gempak/fix}"
17+
export USHgempak="${USHgempak:-${HOMEgfs}/gempak/ush}"
18+
export SRCgfs="${SRCgfs:-${HOMEgfs}/scripts}"
2119

2220
# For half-degree P Grib files
2321
#export DO_HD_PGRB=YES
@@ -33,25 +31,20 @@ export EXT=""
3331
##############################################
3432
# Define COM directories
3533
##############################################
36-
export COMIN=${COMIN:-$(compath.py ${envir}/${NET}/${gfs_ver})/${RUN}.${PDY}/${cyc}/${COMPONENT}}
37-
export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${gfs_ver}/${NET}.${PDY})/${cyc}/${COMPONENT}/gempak}
38-
39-
export SENDDBN=${SENDDBN:-NO}
40-
export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
41-
42-
mkdir -m 775 -p ${COMOUT}
43-
34+
export COMIN="${COMIN:-$(compath.py "${envir}"/"${NET}"/"${gfs_ver}")/${RUN}.${PDY}/${cyc}/${COMPONENT}}"
35+
export COMOUT="${COMOUT:-$(compath.py -o "${NET}"/"${gfs_ver}"/"${NET}"."${PDY}")/${cyc}/${COMPONENT}/gempak}"
4436

45-
# TODO - Assess what is going on with overwriting $DATA here (#1224)
37+
export SENDDBN="${SENDDBN:-NO}"
38+
export DBNROOT="${DBNROOT:-${UTILROOT}/fakedbn}"
4639

47-
export DATA_HOLD=${DATA}
40+
mkdir -m 775 -p "${COMOUT}"
4841

4942
#################################################################
5043
# Execute the script for the regular grib
5144
#################################################################
52-
export DATA=${DATA_HOLD}/SPECIAL
53-
mkdir -p ${DATA}
54-
cd ${DATA}
45+
export DATA_SPECIAL="${DATA}/SPECIAL"
46+
mkdir -p "${DATA_SPECIAL}"
47+
cd "${DATA_SPECIAL}" || exit 1
5548

5649
export DBN_ALERT_TYPE=GFS_GOESSIM_GEMPAK
5750
export RUN2=gfs_goessim
@@ -65,14 +58,14 @@ echo "RUNS the Program"
6558

6659
########################################################
6760
# Execute the script.
68-
${SRCgfs}/exgfs_atmos_goes_nawips.sh
61+
"${SRCgfs}/exgfs_atmos_goes_nawips.sh"
6962

7063
#################################################################
7164
# Execute the script for the 221 grib
7265

73-
export DATA=${DATA_HOLD}/SPECIAL221
74-
mkdir -p ${DATA}
75-
cd ${DATA}
66+
export DATA_SPECIAL221="${DATA}/SPECIAL221"
67+
mkdir -p "${DATA_SPECIAL221}"
68+
cd "${DATA_SPECIAL221}" || exit 1
7669

7770
export DBN_ALERT_TYPE=GFS_GOESSIM221_GEMPAK
7871
export RUN2=gfs_goessim221
@@ -86,27 +79,27 @@ echo "RUNS the Program"
8679

8780
########################################################
8881
# Execute the script.
89-
${SRCgfs}/exgfs_atmos_goes_nawips.sh
82+
"${SRCgfs}/exgfs_atmos_goes_nawips.sh"
9083
export err=$?; err_chk
9184
########################################################
9285

9386
echo "end of program"
94-
cd ${DATA_HOLD}
87+
cd "${DATA}" || exit 1
9588
echo "######################################"
9689
echo " SPECIAL.OUT "
9790
echo "######################################"
9891

9992
############################################
10093
# print exec I/O output
10194
############################################
102-
if [ -e "${pgmout}" ] ; then
103-
cat ${pgmout}
95+
if [[ -e "${pgmout}" ]] ; then
96+
cat "${pgmout}"
10497
fi
10598

10699
###################################
107100
# Remove temp directories
108101
###################################
109-
if [ "${KEEPDATA}" != "YES" ] ; then
102+
if [[ "${KEEPDATA}" != "YES" ]] ; then
110103
rm -rf "${DATA}"
111104
fi
112105

‎jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "npoess" -c "base"
1010

1111
export OMP_NUM_THREADS=${OMP_NUM_THREADS:-1}
1212

13-
1413
################################
1514
# Set up the HOME directory
1615
################################
@@ -38,47 +37,6 @@ GRID="0p50" YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_GRIB_0p50:COM_ATMOS_
3837

3938
mkdir -m 775 -p "${COM_ATMOS_GOES}"
4039

41-
# TODO - This should be in the ex-script (#1226)
42-
43-
####################################
44-
# Specify Forecast Hour Range
45-
####################################
46-
export SHOUR=000
47-
export FHOUR=180
48-
export FHINC=003
49-
50-
####################################
51-
# Specify Timeout Behavior of Post
52-
#
53-
# SLEEP_TIME - Amount of time to wait for
54-
# a restart file before exiting
55-
# SLEEP_INT - Amount of time to wait between
56-
# checking for restart files
57-
####################################
58-
export SLEEP_TIME=900
59-
export SLEEP_INT=5
60-
61-
####################################
62-
# Check if this is a restart
63-
####################################
64-
if [[ -f "${COM_ATMOS_GOES}/${RUN}.t${cyc}z.control.goessimpgrb2" ]]; then
65-
modelrecvy=$(cat < "${COM_ATMOS_GOES}/${RUN}.t${cyc}z.control.goessimpgrb")
66-
recvy_cyc="${modelrecvy:8:2}"
67-
recvy_shour="${modelrecvy:10:13}"
68-
69-
if [[ ${RERUN} == "NO" ]]; then
70-
NEW_SHOUR=$(( recvy_shour + FHINC ))
71-
if (( NEW_SHOUR >= SHOUR )); then
72-
export SHOUR=${NEW_SHOUR}
73-
fi
74-
if (( recvy_shour >= FHOUR )); then
75-
echo "Forecast Pgrb Generation Already Completed to ${FHOUR}"
76-
else
77-
echo "Starting: PDY=${PDY} cycle=t${recvy_cyc}z SHOUR=${SHOUR}"
78-
fi
79-
fi
80-
fi
81-
8240
#############################################################
8341
# Execute the script
8442
"${HOMEgfs}/scripts/exgfs_atmos_grib2_special_npoess.sh"

‎jobs/JGLOBAL_WAVE_INIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export errchk=${errchk:-err_chk}
1010
export MP_PULSE=0
1111

1212
# Path to HOME Directory
13-
export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
13+
export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
1414
export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
1515
export USHwave=${USHwave:-${HOMEgfs}/ush}
1616
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

‎jobs/JGLOBAL_WAVE_POST_BNDPNT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export errchk=${errchk:-err_chk}
99
export MP_PULSE=0
1010

1111
# Path to HOME Directory
12-
export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
12+
export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
1313
export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
1414
export USHwave=${USHwave:-${HOMEgfs}/ush}
1515
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

‎jobs/JGLOBAL_WAVE_POST_BNDPNTBLL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export CDATE=${PDY}${cyc}
1313
export MP_PULSE=0
1414

1515
# Path to HOME Directory
16-
export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
16+
export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
1717
export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
1818
export USHwave=${USHwave:-${HOMEgfs}/ush}
1919
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

‎jobs/JGLOBAL_WAVE_POST_PNT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export errchk=${errchk:-err_chk}
99
export MP_PULSE=0
1010

1111
# Path to HOME Directory
12-
export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
12+
export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
1313
export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
1414
export USHwave=${USHwave:-${HOMEgfs}/ush}
1515
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

‎jobs/JGLOBAL_WAVE_POST_SBS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export errchk=${errchk:-err_chk}
99
export MP_PULSE=0
1010

1111
# Path to HOME Directory
12-
export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
12+
export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
1313
export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
1414
export USHwave=${USHwave:-${HOMEgfs}/ush}
1515
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

‎jobs/JGLOBAL_WAVE_PREP

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export MP_PULSE=0
1717
export CDO=${CDO_ROOT}/bin/cdo
1818

1919
# Path to HOME Directory
20-
export FIXwave=${FIXwave:-${HOMEgfs}/fix/fix_wave_${NET}}
20+
export FIXwave=${FIXwave:-${HOMEgfs}/fix/wave}
2121
export PARMwave=${PARMwave:-${HOMEgfs}/parm/wave}
2222
export USHwave=${USHwave:-${HOMEgfs}/ush}
2323
export EXECwave=${EXECwave:-${HOMEgfs}/exec}

‎parm/config/gefs/config.base.emc.dyn

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,15 @@ export UTILgfs=${HOMEgfs}/util
3030
export EXECgfs=${HOMEgfs}/exec
3131
export SCRgfs=${HOMEgfs}/scripts
3232

33-
export FIXcice=${HOMEgfs}/fix/cice
34-
export FIXmom=${HOMEgfs}/fix/mom6
35-
export FIXreg2grb2=${HOMEgfs}/fix/reg2grb2
33+
export FIXam="${FIXgfs}/am"
34+
export FIXaer="${FIXgfs}/aer"
35+
export FIXcpl="${FIXgfs}/cpl"
36+
export FIXlut="${FIXgfs}/lut"
37+
export FIXorog="${FIXgfs}/orog"
38+
export FIXcice="${FIXgfs}/cice"
39+
export FIXmom="${FIXgfs}/mom6"
40+
export FIXreg2grb2="${FIXgfs}/reg2grb2"
41+
export FIXugwd="${FIXgfs}/ugwd"
3642

3743
########################################################################
3844

‎parm/config/gfs/config.aeroanl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/aero/obs/config/
1010
export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/aero/obs/lists/gdas_aero_prototype.yaml
1111
export STATICB_TYPE='identity'
1212
export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/aero/berror/staticb_${STATICB_TYPE}.yaml
13-
export FV3JEDI_FIX=${HOMEgfs}/fix/gdas
14-
export BERROR_DATA_DIR=${FV3JEDI_FIX}/bump/aero/${CASE_ANL}/
13+
export FIXgdas=${HOMEgfs}/fix/gdas
14+
export BERROR_DATA_DIR=${FIXgdas}/bump/aero/${CASE_ANL}/
1515
export BERROR_DATE="20160630.000000"
1616

1717
export io_layout_x=@IO_LAYOUT_X@

‎parm/config/gfs/config.base.emc.dyn

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,22 @@ export HPSS_PROJECT="@HPSS_PROJECT@"
2323

2424
# Directories relative to installation areas:
2525
export HOMEgfs=@HOMEgfs@
26-
export PARMgfs=${HOMEgfs}/parm
27-
export FIXgfs=${HOMEgfs}/fix
28-
export USHgfs=${HOMEgfs}/ush
29-
export UTILgfs=${HOMEgfs}/util
30-
export EXECgfs=${HOMEgfs}/exec
31-
export SCRgfs=${HOMEgfs}/scripts
32-
33-
export FIXcice=${HOMEgfs}/fix/cice
34-
export FIXmom=${HOMEgfs}/fix/mom6
35-
export FIXreg2grb2=${HOMEgfs}/fix/reg2grb2
26+
export PARMgfs="${HOMEgfs}/parm"
27+
export FIXgfs="${HOMEgfs}/fix"
28+
export USHgfs="${HOMEgfs}/ush"
29+
export UTILgfs="${HOMEgfs}/util"
30+
export EXECgfs="${HOMEgfs}/exec"
31+
export SCRgfs="${HOMEgfs}/scripts"
32+
33+
export FIXam="${FIXgfs}/am"
34+
export FIXaer="${FIXgfs}/aer"
35+
export FIXcpl="${FIXgfs}/cpl"
36+
export FIXlut="${FIXgfs}/lut"
37+
export FIXorog="${FIXgfs}/orog"
38+
export FIXcice="${FIXgfs}/cice"
39+
export FIXmom="${FIXgfs}/mom6"
40+
export FIXreg2grb2="${FIXgfs}/reg2grb2"
41+
export FIXugwd="${FIXgfs}/ugwd"
3642

3743
########################################################################
3844

‎parm/gdas/aero_jedi_fix.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
mkdir:
22
- !ENV ${DATA}/fv3jedi
33
copy:
4-
- - !ENV ${FV3JEDI_FIX}/fv3jedi/fv3files/akbk$(npz).nc4
4+
- - !ENV ${FIXgdas}/fv3jedi/fv3files/akbk$(npz).nc4
55
- !ENV ${DATA}/fv3jedi/akbk.nc4
6-
- - !ENV ${FV3JEDI_FIX}/fv3jedi/fv3files/fmsmpp.nml
6+
- - !ENV ${FIXgdas}/fv3jedi/fv3files/fmsmpp.nml
77
- !ENV ${DATA}/fv3jedi/fmsmpp.nml
8-
- - !ENV ${FV3JEDI_FIX}/fv3jedi/fv3files/field_table_gfdl
8+
- - !ENV ${FIXgdas}/fv3jedi/fv3files/field_table_gfdl
99
- !ENV ${DATA}/fv3jedi/field_table
1010
- - !ENV $(HOMEgfs)/sorc/gdas.cd/parm/io/fv3jedi_fieldmetadata_restart.yaml
1111
- !ENV ${DATA}/fv3jedi/fv3jedi_fieldmetadata_restart.yaml

0 commit comments

Comments
 (0)