Skip to content

Commit 4bf0e14

Browse files
Merge branch 'NOAA-EMC:develop' into feature/inlineGW_20260319
2 parents e967069 + 3516bab commit 4bf0e14

45 files changed

Lines changed: 723 additions & 610 deletions

Some content is hidden

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

dev/ci/cases/gfsv17/retrov17_realtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ experiment:
1313
expdir: /lfs/h2/emc/gfstemp/emc.global/expdir
1414
idate: 2025111306
1515
edate: 2027011600
16-
icsdir: /lfs/h2/emc/gfstemp/emc.global/comroot/rt17_upd03_realtime
16+
icsdir: /lfs/h2/emc/gfstemp/emc.global/comroot/rt17_upd03_realtime
1717
yaml: {{ HOMEglobal }}/dev/ci/cases/gfsv17/s2sw_realtime.yaml
1818

1919
workflow:

dev/ci/cases/gfsv17/s2sw_realtime.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ prepoceanobs:
3131
# realtime
3232
dmpdir_exp: /lfs/h2/emc/da/noscrub/emc.da/obsForge/COMROOT/realtime
3333

34+
prep:
35+
# This can only be enabled in realtime
36+
PROCESS_TROPCY: "YES"
37+
3438
marinebmat:
3539
SOCA_INPUT_FIX_DIR: {{ HOMEglobal }}/fix/gdas/soca/1440x1080x75/soca
3640
SOCA_ANL_GEOM: {{ HOMEglobal }}/fix/gdas/soca/720x540x75/soca

dev/parm/config/gfs/config.base.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ export FIXgdas="${FIXglobal}/gdas"
4949
# GLOBAL static environment parameters
5050
export PACKAGEROOT="{{ PACKAGEROOT }}" # TODO: set via prod_envir in Ops
5151
export COMROOT="{{ COMROOT }}" # TODO: set via prod_envir in Ops
52+
# Available for WCOSS2/realtime only
53+
export DCOMROOT="/lfs/h1/ops/prod/dcom" # TODO: set via prod_envir in ops
5254
export COMINsyn="{{ COMINsyn }}"
5355
export DMPDIR="{{ DMPDIR }}"
5456
export IODADIR="{{ IODADIR }}"

dev/parm/config/gfs/config.prep.j2

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@ source "${EXPDIR}/config.resources" prep
1111
export cdate10=${PDY}${cyc}
1212

1313
# Relocation and syndata QC
14-
export PROCESS_TROPCY=${PROCESS_TROPCY:-NO}
14+
# TODO Remove this functionality from the workflow
15+
export PROCESS_TROPCY='{{PROCESS_TROPCY}}'
1516
export TROPCYQCRELOSH="${SCRglobal}/exglobal_atmos_tropcy_qc_reloc.sh"
1617
export COMINsyn=${COMINsyn:-$(compath.py "${envir}/com/gfs/${gfs_ver}")/syndat}
1718

18-
# If DOENKFONLY_ATM="YES", skip PROCESS_TROPCY
19-
if [[ "${DOENKFONLY_ATM:-NO}" == "YES" ]] ; then
20-
export PROCESS_TROPCY="NO"
21-
fi
22-
2319
# Allow users to control the generation or use of either operational or
2420
# their processed prepbufr, prepbufr.acft_profiles, nsstbufr files
2521
export MAKE_PREPBUFR="YES" # Generate prepbufr, etc. files by executing obsproc

dev/parm/config/gfs/config.resources

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ case ${step} in
13941394
elif [[ "${RUN}" = *gfs ]]; then
13951395
ntasks=28
13961396
tasks_per_node=28
1397-
memory="6GB"
1397+
memory="8GB"
13981398
fi
13991399
prepost=True
14001400
;;

dev/parm/config/gfs/yaml/defaults.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ marineanlletkf:
7979
SOCA_ANL_GEOM: "${FIXglobal}/gdas/soca/72x35x25/soca"
8080
SOCA_OBS_LIST: "${PARMglobal}/gdas/marine/obs/obs_list.yaml.j2"
8181

82+
prep:
83+
PROCESS_TROPCY: "NO"
84+
8285
prepoceanobs:
8386
use_exp_obs: "YES"
8487
dmpdir_exp: "${BASE_DATA}/experimental_obs"

dev/scripts/exgfs_wave_prdgen_gridded.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ while [[ "${fhcnt}" -le "${FHMAX_WAV}" ]]; do
8585

8686
iparam=1
8787
while [[ ${iparam} -le ${nparam} ]]; do
88-
nip=${arrpar[${iparam}-1]}
88+
nip=${arrpar[iparam-1]}
8989
prepar=${nip::-1} # Part prefix (assumes 1 digit index)
9090
paridx="${nip:0-1}"
9191
npart=0

dev/scripts/exglobal_atmos_tropcy_qc_reloc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [[ "${PROCESS_TROPCY}" = 'YES' ]]; then
5555
ls -ltr ./*syndata*
5656
cd "${ARCHSYND}" || exit 1
5757
pwd
58-
ls -ltr
58+
ls -ltr ./*syndata* || true
5959
cat syndat_dateck
6060
cd "${HOMENHC}" || exit 1
6161
pwd

dev/ush/convert_from_global_to_net.sh

Lines changed: 0 additions & 227 deletions
This file was deleted.

0 commit comments

Comments
 (0)