Skip to content

Commit 9847797

Browse files
NeilBarton-NOAANeilBarton-NOAA
committed
Merge remote-tracking branch 'origin/develop' into dev/sfs
2 parents cc98a9f + 62ac472 commit 9847797

140 files changed

Lines changed: 2684 additions & 337 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ fix/ugwd_nest
4545
fix/verif
4646
fix/wave
4747

48+
# Ignore modulefile symlinks
49+
#--------------------------
50+
modulefiles/upp
51+
4852
# Ignore parm file symlinks
4953
#--------------------------
5054
parm/gdas/aero
@@ -102,6 +106,10 @@ parm/ufs/post_itag_gfs
102106
parm/ufs/post_itag_gcafs
103107
parm/ufs/ww3_shel.nml.IN
104108
parm/ufs/global_control.nml.IN
109+
parm/ufs/fd_ufs.yaml
110+
parm/ufs/suite_FV3_global_nest_v1.xml
111+
parm/ufs/suite_FV3_GFS_v17_p8_ugwpv1.xml
112+
parm/ufs/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
105113
parm/regrid_sfc
106114
parm/chem/nexus
107115

‎dev/ci/cases/gcafsv1/C384_gcafs_cycled.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ experiment:
66
resdetatmos: 384
77
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
88
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
9-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
10-
idate: 2021122012
11-
edate: 2021122100
9+
icsdir: {{ BASE_IC }}/C384C192/20240610
10+
idate: 2023040118
11+
edate: 2023040206
1212
nens: 0
1313
interval: 12
1414
start: cold

‎dev/ci/cases/gcafsv1/C384_gcafs_cycled_noDA.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ experiment:
66
resdetatmos: 384
77
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
88
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
9-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
10-
idate: 2021122012
11-
edate: 2021122100
9+
icsdir: {{ BASE_IC }}/C384C192/20240610
10+
idate: 2023040118
11+
edate: 2023040206
1212
nens: 0
1313
interval: 12
1414
start: cold

‎dev/ci/cases/gcafsv1/C384_gcafs_cycled_noDA_dev.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ experiment:
66
resdetatmos: 384
77
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
88
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
9-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
10-
idate: 2021122012
11-
edate: 2021122100
9+
icsdir: {{ BASE_IC }}/C384C192/20240610
10+
idate: 2023040118
11+
edate: 2023040206
1212
nens: 0
1313
interval: 0
1414
start: cold

‎dev/ci/cases/gcafsv1/C96_gcafs_cycled.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ experiment:
66
resdetatmos: 96
77
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
88
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
9-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
9+
icsdir: {{ BASE_IC }}/C96C48/20250808
1010
idate: 2021122012
1111
edate: 2021122100
1212
nens: 0

‎dev/ci/cases/gcafsv1/C96_gcafs_cycled_noDA.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ experiment:
66
resdetatmos: 96
77
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
88
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
9-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
9+
icsdir: {{ BASE_IC }}/C96C48/20250808
1010
idate: 2021122012
1111
edate: 2021122100
1212
nens: 0

‎dev/ci/cases/gcafsv1/C96_gcafs_cycled_noDA_dev.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ experiment:
66
resdetatmos: 96
77
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
88
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
9-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
9+
icsdir: {{ BASE_IC }}/C96C48/20250808
1010
idate: 2021122012
1111
edate: 2021122200
1212
nens: 0

‎dev/ci/cases/gfsv17/gfs.v17_lowres_extended.yaml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
experiment:
2+
net: gfs
3+
mode: cycled
4+
pslot: {{ 'pslot' | getenv }}
5+
app: S2SW
6+
resdetatmos: 96
7+
resensatmos: 48
8+
resdetocean: 5.0
9+
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
10+
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
11+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
12+
idate: 2021122012
13+
edate: 2021122200
14+
nens: 2
15+
interval: 6
16+
start: cold
17+
yaml: {{ HOMEglobal }}/dev/ci/cases/yamls/gfs_cyc_extended_ci.yaml
18+
19+
skip_ci_on_hosts:
20+
- ursa
21+
- gaeac5
22+
- gaeac6
23+
- orion
24+
- hercules
25+
- awsepicglobalworkflow
26+
- hera
27+
28+
workflow:
29+
engine: rocoto
30+
rocoto:
31+
maxtries: 2
32+
cyclethrottle: 3
33+
taskthrottle: 25
34+
verbosity: 2

‎dev/ci/cases/pr/C48_ATM_ecflow.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ skip_ci_on_hosts:
1717
- gaeac6
1818
- orion
1919
- hercules
20+
- derecho
2021
- awsepicglobalworkflow
2122

2223
workflow:

‎dev/ci/cases/pr/C48_S2SWA_gefs_RT.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ skip_ci_on_hosts:
2626
- hera
2727
- ursa
2828
- orion
29+
- derecho
2930
- awsepicglobalworkflow
3031

3132
workflow:

0 commit comments

Comments
 (0)