Skip to content

Commit 4cb6ae0

Browse files
DavidHuber-NOAADavidHuber-NOAA
committed
Merge develop, resolve conflicts in gefs_tasks.py
2 parents cb5feaf + 2fdc2f0 commit 4cb6ae0

Some content is hidden

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

58 files changed

+2083
-359
lines changed

‎ci/cases/pr/C96_S2SWA_gefs_replay_ics.yaml renamed to ‎ci/cases/pr/C96mx100_S2S.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
experiment:
2-
system: gefs
2+
system: sfs
33
mode: forecast-only
44

55
arguments:
6+
idate: 1994050100
7+
edate: 1994050100
68
pslot: {{ 'pslot' | getenv }}
7-
app: S2SWA
9+
app: S2S
810
resdetatmos: 96
9-
resdetocean: 1.0
1011
resensatmos: 96
12+
resdetocean: 1
13+
start: 'cold'
1114
nens: 2
12-
interval: 6
13-
start: warm
1415
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1516
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
16-
idate: 2020110100
17-
edate: 2020110100
18-
yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_replay_ci.yaml
1917
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96mx100/20240610
18+
yaml: {{ HOMEgfs }}/ci/cases/yamls/sfs_defaults.yaml
2019

21-
skip_ci_on_hosts:
22-
- None

‎ci/cases/sfs/C96mx100_S2S.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
experiment:
2-
system: gefs
2+
system: sfs
33
mode: forecast-only
44

55
arguments:
6-
idate: 1994050100
6+
idate: 1994050100
77
edate: 1994050100
88
pslot: {{ 'pslot' | getenv }}
99
app: S2S
@@ -14,6 +14,6 @@ arguments:
1414
nens: 10
1515
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1616
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
17-
icsdir: {{ 'TOPICDIR' | getenv }}/HR4/C96mx100
18-
yaml: {{ HOMEgfs }}/ci/cases/yamls/sfs_defaults.yaml
17+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96mx100/20240610
18+
yaml: {{ HOMEgfs }}/ci/cases/yamls/sfs_full.yaml
1919

‎ci/cases/yamls/sfs_defaults.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@ base:
99
DO_AWIPS: "NO"
1010
KEEPDATA: "NO"
1111
DO_EXTRACTVARS: "NO"
12-
FHMAX_GFS: 2976
12+
FHMAX_GFS: 144
1313
FHMAX_HF_GFS: 0
1414
FHOUT_HF_GFS: 1
1515
FHOUT_GFS: 24
1616
FHOUT_OCN_GFS: 24
1717
FHOUT_ICE_GFS: 24
18-
FCST_BREAKPOINTS: ""
18+
FCST_BREAKPOINTS: "48,96"
1919
REPLAY_ICS: "NO"
2020
USE_OCN_ENS_PERTURB_FILES: "YES"
2121
USE_ATM_ENS_PERTURB_FILES: "YES"
2222
HPSSARCH: "NO"
2323
LOCALARCH: "NO"
24-
SFS_POST: "YES"
2524
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
2625
fcst:
2726
TYPE: "hydro"

‎ci/cases/yamls/sfs_full.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
base:
2+
DO_JEDIATMVAR: "NO"
3+
DO_JEDIATMENS: "NO"
4+
DO_JEDIOCNVAR: "NO"
5+
DO_JEDISNOWDA: "NO"
6+
DO_MERGENSST: "NO"
7+
DO_BUFRSND: "NO"
8+
DO_GEMPAK: "NO"
9+
DO_AWIPS: "NO"
10+
KEEPDATA: "NO"
11+
DO_EXTRACTVARS: "NO"
12+
FHMAX_GFS: 2976
13+
FHMAX_HF_GFS: 0
14+
FHOUT_HF_GFS: 1
15+
FHOUT_GFS: 24
16+
FHOUT_OCN_GFS: 24
17+
FHOUT_ICE_GFS: 24
18+
FCST_BREAKPOINTS: ""
19+
REPLAY_ICS: "NO"
20+
USE_OCN_ENS_PERTURB_FILES: "YES"
21+
USE_ATM_ENS_PERTURB_FILES: "YES"
22+
HPSSARCH: "NO"
23+
LOCALARCH: "NO"
24+
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
25+
fcst:
26+
TYPE: "hydro"
27+
MONO: "mono"
28+
reforecast: "YES"
29+
FHZER: 24
30+
ocn:
31+
MOM6_INTERP_ICS: "YES"

‎docs/source/clone.rst

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Clone the `global-workflow` and `cd` into the `sorc` directory:
2020

2121
.. _build_examples:
2222

23-
The build_all.sh script can be used to build all required components of the global workflow. The accepted arguments is a list of systems to be built. This includes builds for GFS and GEFS forecast-only experiments, GSI and GDASApp-based DA for cycled GFS experiments. See `feature availability <hpc.html#feature-availability-by-hpc>`__ to see which system(s) are available on each supported system.
23+
The build_all.sh script can be used to build all required components of the global workflow. The accepted arguments is a list of systems to be built. This includes builds for GFS, GEFS, and SFS forecast-only experiments, GSI and GDASApp-based DA for cycled GFS experiments. See `feature availability <hpc.html#feature-availability-by-hpc>`__ to see which system(s) are available on each supported system.
2424

2525
::
2626

27-
./build_all.sh [gfs] [gefs] [gs] [gdas] [all]
27+
./build_all.sh [gfs] [gefs] [sfs] [gsi] [gdas] [all]
2828

2929
For example, to run GFS experiments with GSI DA, execute:
3030

@@ -34,7 +34,7 @@ For example, to run GFS experiments with GSI DA, execute:
3434

3535
This builds the GFS, UFS-utils, GFS-utils, WW3 with PDLIB (structured wave grids), UPP, GSI, GSI-monitor, and GSI-utils executables.
3636

37-
For coupled cycling (include new UFSDA) execute:
37+
For coupled cycling (using only new UFSDA) execute:
3838

3939
::
4040

@@ -50,6 +50,14 @@ To run GEFS (forecast-only) execute:
5050

5151
This builds the GEFS, UFS-utils, GFS-utils, WW3 *without* PDLIB (unstructure wave grids), and UPP executables.
5252

53+
To run SFS (forecast-only) execute:
54+
55+
::
56+
57+
./build_all.sh sfs
58+
59+
This builds the same components as GEFS, except the UFS model is built in hydrostatic mode.
60+
5361
Once the building is complete, link workflow artifacts such as executables, configuration files, and scripts via
5462

5563
::
@@ -121,7 +129,7 @@ Under the ``/sorc`` folder is a script to build all components called ``build_al
121129
-v:
122130
Execute all build scripts with -v option to turn on verbose where supported
123131

124-
Lastly, pass to build_all.sh a list of systems to build. This includes `gfs`, `gefs`, `sfs` (not fully supported), `gsi`, `gdas`, and `all`.
132+
Lastly, pass to build_all.sh a list of systems to build. This includes `gfs`, `gefs`, `sfs`, `gsi`, `gdas`, and `all`.
125133

126134
For examples of how to use this script, see :ref:`build examples <build_examples>`.
127135

‎docs/source/development.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Continuous Integration (CI)
7979

8080
The global workflow comes fitted with a suite of system tests that run various types of workflow. These tests are commonly run for pull requests before they may be merged into the develop branch. At a minimum, developers are expected to run the CI test(s) that will be impacted by their changes on at least one platform.
8181

82-
The commonly run tests are written in YAML format and can be found in the ``ci/cases/pr`` directory. The ``workflow/generate_workflows.sh`` tool is available to aid running these cases. See the help documentation by running ``./generate_workflows.sh -h``. The script has the capability to prepare the EXPDIR and COMROOT directories for a specified or implied suite of CI tests (see :doc:`setup` for details on these directories). The script also has options to automatically build and run all tests for a given system (i.e. GFS or GEFS and a placeholder for SFS). For instance, to build the workflow and run all of the GFS tests, one would execute
82+
The commonly run tests are written in YAML format and can be found in the ``ci/cases/pr`` directory. The ``workflow/generate_workflows.sh`` tool is available to aid running these cases. See the help documentation by running ``./generate_workflows.sh -h``. The script has the capability to prepare the EXPDIR and COMROOT directories for a specified or implied suite of CI tests (see :doc:`setup` for details on these directories). The script also has options to automatically build and run all tests for a given system (i.e. GFS, GEFS or SFS). For instance, to build the workflow and run all of the GFS tests, one would execute
8383

8484
::
8585

‎docs/source/hpc.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
6060
GFS
6161
- Coupled
6262
GEFS
63+
- Coupled
64+
SFS
6365
- GSI
6466
DA
6567
- GDASApp
@@ -78,6 +80,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
7880
- 1
7981
- X
8082
- X
83+
- X
8184
- X
8285
- X
8386
-
@@ -91,6 +94,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
9194
- 1
9295
- X
9396
- X
97+
- X
9498
- X
9599
- X
96100
- X
@@ -104,6 +108,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
104108
- 1
105109
- X
106110
- X
111+
- X
107112
- X
108113
- X
109114
- X
@@ -117,6 +122,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
117122
- 2
118123
- X
119124
- X
125+
- X
120126
- X
121127
- X
122128
-
@@ -130,6 +136,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
130136
- 3
131137
- X
132138
- X
139+
- X
133140
- X
134141
- X
135142
-
@@ -143,6 +150,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
143150
- 3
144151
- X
145152
- X
153+
- X
146154
- X
147155
- X
148156
-
@@ -156,6 +164,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
156164
- 3
157165
- X
158166
- X
167+
- X
159168
- X
160169
-
161170
-
@@ -169,6 +178,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
169178
- 3
170179
- X
171180
- X
181+
- X
172182
-
173183
-
174184
-
@@ -182,6 +192,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
182192
- 3
183193
- X
184194
- X
195+
- X
185196
-
186197
-
187198
-
@@ -195,6 +206,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
195206
- 3
196207
- X
197208
-
209+
-
198210
- X
199211
-
200212
-
@@ -208,6 +220,7 @@ The Global Workflow provides capabilities for deterministic and ensemble forecas
208220
- 3
209221
-
210222
-
223+
-
211224
- X
212225
-
213226
-

‎docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Global Workflow
44
###############
55

6-
**Global-workflow** is the end-to-end workflow designed to run global configurations of medium range weather forecasting for the UFS weather model. It supports both development and operational implementations. In its current format it supports the Global Forecast System (GFS) and the Global Ensemble Forecast System (GEFS) configurations
6+
**Global-workflow** is the end-to-end workflow designed to run global configurations of medium range weather forecasting for the UFS weather model. It supports both development and operational implementations. In its current format it supports the Global Forecast System (GFS), Global Ensemble Forecast System (GEFS), and Subseasonal Forecast System (SFS) configurations.
77

88
======
99
Status

‎parm/archive/gefs_arcdir.yaml.j2

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@
2424
{% endif %}
2525

2626
# Select ensstat files to copy to the arcdir
27-
{% if RUN == "gefs" %}
28-
{% set ensstat_files = [] %}
29-
{% if path_exists(COMIN_ATMOS_ENSSTAT_1p00) %}
30-
{% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_GFS, FHOUT_GFS) %}
31-
{% do ensstat_files.append([COMIN_ATMOS_ENSSTAT_1p00 ~ "/" ~ head ~ "mean.pres_." ~
32-
"1p00" ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2",
33-
GEFS_ARCH]) %}
34-
{% endfor %}
35-
{% endif %}
27+
{% set ensstat_files = [] %}
28+
{% if path_exists(COMIN_ATMOS_ENSSTAT_1p00) %}
29+
{% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_GFS, FHOUT_GFS) %}
30+
{% do ensstat_files.append([COMIN_ATMOS_ENSSTAT_1p00 ~ "/" ~ head ~ "mean.pres_." ~
31+
"1p00" ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2",
32+
GEFS_ARCH]) %}
33+
{% endfor %}
3634
{% endif %}
3735
{% set file_set = ensstat_files %}
3836
# Actually write the yaml

‎parm/config/gefs/config.atmos_products

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,9 @@ fi
2525
export FLXGF="NO" # Create interpolated sflux.1p00 file
2626

2727
# paramlist files for the different forecast hours and downsets
28-
if [[ ${SFS_POST} == "YES" ]]; then
29-
export post_prefix='sfs'
30-
else
31-
export post_prefix='gefs'
32-
fi
33-
export paramlista="${PARMgfs}/product/${post_prefix}.0p25.fFFF.paramlist.a.txt"
34-
export paramlista_anl="${PARMgfs}/product/${post_prefix}.0p25.anl.paramlist.a.txt"
35-
export paramlista_f000="${PARMgfs}/product/${post_prefix}.0p25.f000.paramlist.a.txt"
36-
export paramlistb="${PARMgfs}/product/${post_prefix}.0p25.fFFF.paramlist.b.txt"
28+
export paramlista="${PARMgfs}/product/${NET}.0p25.fFFF.paramlist.a.txt"
29+
export paramlista_anl="${PARMgfs}/product/${NET}.0p25.anl.paramlist.a.txt"
30+
export paramlista_f000="${PARMgfs}/product/${NET}.0p25.f000.paramlist.a.txt"
31+
export paramlistb="${PARMgfs}/product/${NET}.0p25.fFFF.paramlist.b.txt"
3732

3833
echo "END: config.atmos_products"

0 commit comments

Comments
 (0)