Skip to content

Commit db138f8

Browse files
jderrico-noaajderrico-noaa
authored
Merge branch 'NOAA-EMC:develop' into develop
2 parents 70b5578 + 3c86873 commit db138f8

File tree

241 files changed

+7829
-2138
lines changed

Some content is hidden

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

241 files changed

+7829
-2138
lines changed

‎.gitignore‎

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,8 @@ parm/gdas/soca
5353
parm/gdas/jcb-gdas
5454
parm/gdas/jcb-algorithms
5555
parm/monitor
56-
parm/post/AEROSOL_LUTS.dat
5756
parm/post/nam_micro_lookup.dat
5857
parm/post/optics_luts_DUST.dat
59-
parm/post/gtg.config.gfs
60-
parm/post/gtg_imprintings.txt
6158
parm/post/optics_luts_DUST_nasa.dat
6259
parm/post/optics_luts_NITR_nasa.dat
6360
parm/post/optics_luts_SALT.dat
@@ -70,51 +67,19 @@ parm/post/optics_luts_WASO.dat
7067
parm/post/optics_luts_WASO_nasa.dat
7168
parm/post/params_grib2_tbl_new
7269
parm/post/post_tag_gfs128
73-
parm/post/post_tag_gfs65
74-
parm/post/postcntrl_gefs.xml
75-
parm/post/postcntrl_gefs_aerosol.xml
76-
parm/post/postcntrl_gefs_anl.xml
77-
parm/post/postcntrl_gefs_chem.xml
78-
parm/post/postcntrl_gefs_f00.xml
79-
parm/post/postcntrl_gfs.xml
80-
parm/post/postcntrl_gfs_anl.xml
81-
parm/post/postcntrl_gfs_f00.xml
82-
parm/post/postcntrl_gfs_f00_two.xml
83-
parm/post/postcntrl_gfs_flux.xml
84-
parm/post/postcntrl_gfs_flux_f00.xml
85-
parm/post/postcntrl_gfs_goes.xml
86-
parm/post/postcntrl_gfs_goes.xml-new
87-
parm/post/postcntrl_gfs_two.xml
88-
parm/post/postcntrl_gfs_wafs.xml
89-
parm/post/postcntrl_gfs_wafs_anl.xml
90-
parm/post/postxconfig-NT-GEFS-ANL.txt
91-
parm/post/postxconfig-NT-GEFS-F00.txt
92-
parm/post/postxconfig-NT-GEFS-F00-aerosol.txt
93-
parm/post/postxconfig-NT-GEFS-WAFS.txt
94-
parm/post/postxconfig-NT-GEFS-aerosol.txt
95-
parm/post/postxconfig-NT-GEFS.txt
96-
parm/post/postxconfig-NT-GFS-ANL.txt
97-
parm/post/postxconfig-NT-GFS-F00-TWO.txt
98-
parm/post/postxconfig-NT-GFS-F00.txt
99-
parm/post/postxconfig-NT-GFS-FLUX-F00.txt
100-
parm/post/postxconfig-NT-GFS-FLUX.txt
101-
parm/post/postxconfig-NT-GFS-GOES.txt
102-
parm/post/postxconfig-NT-GFS-TWO.txt
103-
parm/post/postxconfig-NT-GFS-WAFS-ANL.txt
104-
parm/post/postxconfig-NT-GFS-WAFS.txt
105-
parm/post/postxconfig-NT-GFS.txt
106-
parm/post/postxconfig-NT-gefs-aerosol.txt
107-
parm/post/postxconfig-NT-gefs-chem.txt
70+
parm/post/gfs
71+
parm/post/gefs
10872
parm/post/ocean.csv
10973
parm/post/ice.csv
11074
parm/post/ocnicepost.nml.jinja2
11175
parm/ufs/noahmptable.tbl
11276
parm/ufs/model_configure.IN
113-
parm/ufs/model_configure_nest.IN
77+
parm/ufs/input_global_nest.nml.IN
11478
parm/ufs/MOM_input_*.IN
11579
parm/ufs/MOM6_data_table.IN
11680
parm/ufs/ice_in.IN
11781
parm/ufs/ufs.configure.*.IN
82+
parm/ufs/post_itag_gfs
11883
parm/wafs
11984

12085
# Ignore sorc and logs folders from externals
@@ -200,6 +165,7 @@ ush/month_name.sh
200165
ush/imsfv3_scf2ioda.py
201166
ush/atparse.bash
202167
ush/run_bufr2ioda.py
168+
ush/bufr2ioda_insitu*
203169

204170
# version files
205171
versions/build.ver

‎ci/Jenkinsfile‎

Lines changed: 80 additions & 88 deletions
Large diffs are not rendered by default.

‎ci/cases/gfsv17/ocnanal.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ base:
1717
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
1818

1919
ocnanal:
20-
SOCA_INPUT_FIX_DIR: {{ FIXgfs }}/gdas/soca/1440x1080x75/soca
20+
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
2121
SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
2222
SOCA_NINNER: 100
2323

‎ci/cases/pr/C48mx500_3DVarAOWCDA.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ arguments:
99
resdetocean: 5.0
1010
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1111
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
12-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500
12+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20240610
1313
idate: 2021032412
1414
edate: 2021032418
1515
nens: 0
@@ -19,5 +19,6 @@ arguments:
1919

2020
skip_ci_on_hosts:
2121
- wcoss2
22+
- gaea
2223
- orion
2324
- hercules

‎ci/cases/pr/C96C48_hybatmDA.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ arguments:
1010
resensatmos: 48
1111
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1212
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
13-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48
13+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20240610
1414
idate: 2021122018
1515
edate: 2021122106
1616
nens: 2

‎ci/cases/pr/C96_atmaerosnowDA.yaml‎ renamed to ‎ci/cases/pr/C96C48_hybatmaerosnowDA.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@ arguments:
66
pslot: {{ 'pslot' | getenv }}
77
app: ATMA
88
resdetatmos: 96
9+
resensatmos: 48
910
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1011
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
11-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48
12+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20240610
1213
idate: 2021122012
1314
edate: 2021122100
14-
nens: 0
15+
nens: 2
1516
gfs_cyc: 1
1617
start: cold
1718
yaml: {{ HOMEgfs }}/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
1819

1920
skip_ci_on_hosts:
2021
- orion
22+
- gaea
2123
- hercules

‎ci/cases/pr/C96C48_ufs_hybatmDA.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ arguments:
99
resensatmos: 48
1010
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1111
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
12-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48
12+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20240610
1313
idate: 2024022318
1414
edate: 2024022400
1515
nens: 2
@@ -18,7 +18,7 @@ arguments:
1818
yaml: {{ HOMEgfs }}/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
1919

2020
skip_ci_on_hosts:
21-
- hera
21+
- gaea
2222
- orion
2323
- hercules
2424

‎ci/cases/pr/C96_atm3DVar.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ arguments:
88
resdetatmos: 96
99
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1010
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
11-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48
11+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20240610
1212
idate: 2021122018
1313
edate: 2021122106
1414
nens: 0

‎ci/cases/pr/C96_atm3DVar_extended.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ arguments:
88
resdetatmos: 96
99
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1010
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
11-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48
11+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20240610
1212
idate: 2021122018
1313
edate: 2021122118
1414
nens: 0
@@ -18,5 +18,6 @@ arguments:
1818

1919
skip_ci_on_hosts:
2020
- hera
21+
- gaea
2122
- orion
2223
- hercules

‎ci/cases/yamls/gfs_extended_ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ base:
99
DO_AWIPS: "NO"
1010
DO_NPOESS: "YES"
1111
DO_GENESIS_FSU: "NO"
12+
FCST_BREAKPOINTS: 192
1213
FHMAX_GFS: 384
1314
FHMAX_HF_GFS: 120

0 commit comments

Comments
 (0)