Skip to content

Commit 869e16e

Browse files
rtodlingrtodling
authored
Merge pull request #367 from GEOS-ESM/feature/rtodling/general_vertical_resol
Some generalization of number of vertical levels in analysis
2 parents aef3d29 + 22e1f1e commit 869e16e

File tree

7 files changed

+95
-88
lines changed

7 files changed

+95
-88
lines changed

‎src/Applications/GEOSdas_App/fvsetup‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3713,7 +3713,7 @@ sub set_geosjedi {
37133713
}
37143714
}
37153715
3716-
$cmd = "$fvbin/setup_aanajedi.pl $jedivar $expid $bjedi_im $jediopts";
3716+
$cmd = "$fvbin/setup_aanajedi.pl $jedivar $expid $bjedi_im $vres $jediopts";
37173717
print "$cmd\n";
37183718
system($cmd);
37193719

‎src/Applications/GEOSdas_App/jedi/etc/geos_3dfgat.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ cost function:
99
fms initialization:
1010
namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
1111
field table filename: ./fv3-jedi/fv3files/field_table_gmao
12-
akbk: ./fv3-jedi/fv3files/akbk72.nc4
12+
akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
1313
layout:
1414
- @JEDI_VAR_XLAYOUT
1515
- @JEDI_VAR_YLAYOUT
16-
npx: @JEDI_BKG_RESOL
17-
npy: @JEDI_BKG_RESOL
18-
npz: 72
16+
npx: @JEDI_BKG_HRES
17+
npy: @JEDI_BKG_HRES
18+
npz: @JEDI_BKG_VRES
1919
field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
2020
model:
2121
name: PSEUDO
@@ -25,7 +25,7 @@ cost function:
2525
datapath: ./
2626
filenames:
2727
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
28-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
28+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
2929
variable change:
3030
variable change name: Analysis2Model
3131
# forecast length: PT6H
@@ -52,7 +52,7 @@ cost function:
5252
datapath: ./
5353
filenames:
5454
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
55-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
55+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
5656
state variables:
5757
- ua
5858
- va
@@ -98,7 +98,7 @@ cost function:
9898
saber central block:
9999
saber block name: gsi hybrid covariance
100100
read:
101-
gsi akbk: ./fv3-jedi/fv3files/akbk72.nc4
101+
gsi akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
102102
gsi error covariance file: ./fv3-jedi/gsibec/gsibec_coefficients_c@JEDI_BKGCOV_RESOL.nc4
103103
gsi berror namelist file: ./fv3-jedi/gsibec/cli_gsibec_configuration_c@JEDI_BKGCOV_RESOL.nml
104104
processor layout x direction: @JEDI_VAR_GSIXLAYOUT
@@ -122,7 +122,7 @@ cost function:
122122
- fraction_of_ice
123123
- geopotential_height_times_gravity_at_surface
124124
- skin_temperature_at_surface
125-
gsi akbk: ./fv3-jedi/fv3files/akbk72.nc4
125+
gsi akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
126126
gsi error covariance file: ./fv3-jedi/gsibec/gsibec_coefficients_c@JEDI_BKGCOV_RESOL.nc4
127127
gsi berror namelist file: ./fv3-jedi/gsibec/cli_gsibec_configuration_c@JEDI_BKGCOV_RESOL.nml
128128
processor layout x direction: @JEDI_VAR_GSIXLAYOUT
@@ -172,13 +172,13 @@ variational:
172172
fms initialization:
173173
namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
174174
field table filename: ./fv3-jedi/fv3files/field_table_gmao
175-
akbk: ./fv3-jedi/fv3files/akbk72.nc4
175+
akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
176176
layout:
177177
- @JEDI_VAR_XLAYOUT
178178
- @JEDI_VAR_YLAYOUT
179-
npx: @JEDI_BKG_RESOL
180-
npy: @JEDI_BKG_RESOL
181-
npz: 72
179+
npx: @JEDI_BKG_HRES
180+
npy: @JEDI_BKG_HRES
181+
npz: @JEDI_BKG_VRES
182182
field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
183183
gradient norm reduction: 1e-3
184184
ninner: '100'

‎src/Applications/GEOSdas_App/jedi/etc/geos_3dvar.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ cost function:
99
fms initialization:
1010
namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
1111
field table filename: ./fv3-jedi/fv3files/field_table_gmao
12-
akbk: ./fv3-jedi/fv3files/akbk72.nc4
12+
akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
1313
layout:
1414
- @JEDI_VAR_XLAYOUT
1515
- @JEDI_VAR_YLAYOUT
16-
npx: @JEDI_BKG_RESOL
17-
npy: @JEDI_BKG_RESOL
18-
npz: 72
16+
npx: @JEDI_BKG_HRES
17+
npy: @JEDI_BKG_HRES
18+
npz: @JEDI_BKG_VRES
1919
field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
2020
analysis variables:
2121
- ua
@@ -40,7 +40,7 @@ cost function:
4040
datapath: ./
4141
filenames:
4242
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
43-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
43+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
4444
state variables:
4545
- ua
4646
- va
@@ -86,7 +86,7 @@ cost function:
8686
saber central block:
8787
saber block name: gsi hybrid covariance
8888
read:
89-
gsi akbk: ./fv3-jedi/fv3files/akbk72.nc4
89+
gsi akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
9090
gsi error covariance file: ./fv3-jedi/gsibec/gsibec_coefficients_c@JEDI_BKGCOV_RESOL.nc4
9191
gsi berror namelist file: ./fv3-jedi/gsibec/cli_gsibec_configuration_c@JEDI_BKGCOV_RESOL.nml
9292
processor layout x direction: @JEDI_VAR_GSIXLAYOUT
@@ -110,7 +110,7 @@ cost function:
110110
- fraction_of_ice
111111
- geopotential_height_times_gravity_at_surface
112112
- skin_temperature_at_surface
113-
gsi akbk: ./fv3-jedi/fv3files/akbk72.nc4
113+
gsi akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
114114
gsi error covariance file: ./fv3-jedi/gsibec/gsibec_coefficients_c@JEDI_BKGCOV_RESOL.nc4
115115
gsi berror namelist file: ./fv3-jedi/gsibec/cli_gsibec_configuration_c@JEDI_BKGCOV_RESOL.nml
116116
processor layout x direction: @JEDI_VAR_GSIXLAYOUT
@@ -160,13 +160,13 @@ variational:
160160
fms initialization:
161161
namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
162162
field table filename: ./fv3-jedi/fv3files/field_table_gmao
163-
akbk: ./fv3-jedi/fv3files/akbk72.nc4
163+
akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
164164
layout:
165165
- @JEDI_VAR_XLAYOUT
166166
- @JEDI_VAR_YLAYOUT
167-
npx: @JEDI_BKG_RESOL
168-
npy: @JEDI_BKG_RESOL
169-
npz: 72
167+
npx: @JEDI_BKG_HRES
168+
npy: @JEDI_BKG_HRES
169+
npz: @JEDI_BKG_VRES
170170
field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
171171
gradient norm reduction: 1e-3
172172
ninner: '100'

‎src/Applications/GEOSdas_App/jedi/etc/geos_hyb3dcenvar.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cost function:
2121
datetime: $JEDI_ISO_DATE_ANA
2222
filenames:
2323
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
24-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
24+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
2525
filetype: cube sphere history
2626
provider: geos
2727
state variables:
@@ -91,7 +91,7 @@ cost function:
9191
saber central block:
9292
read:
9393
debugging mode: false
94-
gsi akbk: ./fv3-jedi/fv3files/akbk72.nc4
94+
gsi akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
9595
gsi berror namelist file: ./fv3-jedi/gsibec/cli_gsibec_configuration_c@JEDI_BKGCOV_RESOL.nml
9696
gsi error covariance file: ./fv3-jedi/gsibec/gsibec_coefficients_c@JEDI_BKGCOV_RESOL.nc4
9797
processor layout x direction: @JEDI_VAR_GSIXLAYOUT
@@ -100,7 +100,7 @@ cost function:
100100
saber block name: gsi static covariance
101101
saber outer blocks:
102102
- debugging mode: false
103-
gsi akbk: ./fv3-jedi/fv3files/akbk72.nc4
103+
gsi akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
104104
gsi berror namelist file: ./fv3-jedi/gsibec/cli_gsibec_configuration_c@JEDI_BKGCOV_RESOL.nml
105105
gsi error covariance file: ./fv3-jedi/gsibec/gsibec_coefficients_c@JEDI_BKGCOV_RESOL.nc4
106106
processor layout x direction: @JEDI_VAR_GSIXLAYOUT
@@ -239,17 +239,17 @@ cost function:
239239
value: 0.50
240240
cost type: 3D-Var
241241
geometry:
242-
akbk: ./fv3-jedi/fv3files/akbk72.nc4
242+
akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
243243
field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
244244
fms initialization:
245245
field table filename: ./fv3-jedi/fv3files/field_table_gmao
246246
namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
247247
layout:
248248
- @JEDI_VAR_XLAYOUT
249249
- @JEDI_VAR_YLAYOUT
250-
npx: @JEDI_BKG_RESOL
251-
npy: @JEDI_BKG_RESOL
252-
npz: 72
250+
npx: @JEDI_BKG_HRES
251+
npy: @JEDI_BKG_HRES
252+
npz: @JEDI_BKG_VRES
253253
jb evaluation: false
254254
# OBSYAML_BEG
255255
# OBSYAML_END
@@ -277,17 +277,17 @@ variational:
277277
diagnostics:
278278
departures: ombg
279279
geometry:
280-
akbk: ./fv3-jedi/fv3files/akbk72.nc4
280+
akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
281281
field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
282282
fms initialization:
283283
field table filename: ./fv3-jedi/fv3files/field_table_gmao
284284
namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
285285
layout:
286286
- @JEDI_VAR_XLAYOUT
287287
- @JEDI_VAR_YLAYOUT
288-
npx: @JEDI_BKG_RESOL
289-
npy: @JEDI_BKG_RESOL
290-
npz: 72
288+
npx: @JEDI_BKG_HRES
289+
npy: @JEDI_BKG_HRES
290+
npz: @JEDI_BKG_VRES
291291
gradient norm reduction: 1e-3
292292
linear model:
293293
increment variables:
@@ -323,17 +323,17 @@ variational:
323323
# diagnostics:
324324
# departures: ombg
325325
# geometry:
326-
# akbk: ./fv3-jedi/fv3files/akbk72.nc4
326+
# akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
327327
# field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
328328
# fms initialization:
329329
# field table filename: ./fv3-jedi/fv3files/field_table_gmao
330330
# namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
331331
# layout:
332332
# - @JEDI_VAR_XLAYOUT
333333
# - @JEDI_VAR_YLAYOUT
334-
# npx: @JEDI_BKG_RESOL
335-
# npy: @JEDI_BKG_RESOL
336-
# npz: 72
334+
# npx: @JEDI_BKG_HRES
335+
# npy: @JEDI_BKG_HRES
336+
# npz: @JEDI_BKG_VRES
337337
# gradient norm reduction: 1e-3
338338
# linear model:
339339
# increment variables:

‎src/Applications/GEOSdas_App/jedi/etc/geos_hyb4dcenvar.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cost function:
2121
datetime: $JEDI_ISO_DATE_001
2222
filenames:
2323
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
24-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
24+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
2525
filetype: cube sphere history
2626
provider: geos
2727
state variables:
@@ -68,7 +68,7 @@ cost function:
6868
datetime: $JEDI_ISO_DATE_002
6969
filenames:
7070
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
71-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
71+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
7272
filetype: cube sphere history
7373
provider: geos
7474
state variables:
@@ -115,7 +115,7 @@ cost function:
115115
datetime: $JEDI_ISO_DATE_003
116116
filenames:
117117
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
118-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
118+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
119119
filetype: cube sphere history
120120
provider: geos
121121
state variables:
@@ -162,7 +162,7 @@ cost function:
162162
datetime: $JEDI_ISO_DATE_004
163163
filenames:
164164
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
165-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
165+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
166166
filetype: cube sphere history
167167
provider: geos
168168
state variables:
@@ -209,7 +209,7 @@ cost function:
209209
datetime: $JEDI_ISO_DATE_005
210210
filenames:
211211
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
212-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
212+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
213213
filetype: cube sphere history
214214
provider: geos
215215
state variables:
@@ -256,7 +256,7 @@ cost function:
256256
datetime: $JEDI_ISO_DATE_006
257257
filenames:
258258
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
259-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
259+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
260260
filetype: cube sphere history
261261
provider: geos
262262
state variables:
@@ -303,7 +303,7 @@ cost function:
303303
datetime: $JEDI_ISO_DATE_007
304304
filenames:
305305
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
306-
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_RESOL.nc4
306+
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
307307
filetype: cube sphere history
308308
provider: geos
309309
state variables:
@@ -373,7 +373,7 @@ cost function:
373373
saber central block:
374374
read:
375375
debugging mode: false
376-
gsi akbk: ./fv3-jedi/fv3files/akbk72.nc4
376+
gsi akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
377377
gsi berror namelist file: ./fv3-jedi/gsibec/cli_gsibec_configuration_c@JEDI_BKGCOV_RESOL.nml
378378
gsi error covariance file: ./fv3-jedi/gsibec/gsibec_coefficients_c@JEDI_BKGCOV_RESOL.nc4
379379
processor layout x direction: @JEDI_VAR_GSIXLAYOUT
@@ -382,7 +382,7 @@ cost function:
382382
saber block name: gsi static covariance
383383
saber outer blocks:
384384
- debugging mode: false
385-
gsi akbk: ./fv3-jedi/fv3files/akbk72.nc4
385+
gsi akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
386386
gsi berror namelist file: ./fv3-jedi/gsibec/cli_gsibec_configuration_c@JEDI_BKGCOV_RESOL.nml
387387
gsi error covariance file: ./fv3-jedi/gsibec/gsibec_coefficients_c@JEDI_BKGCOV_RESOL.nc4
388388
processor layout x direction: @JEDI_VAR_GSIXLAYOUT
@@ -557,17 +557,17 @@ cost function:
557557
value: 0.50
558558
cost type: 4D-Ens-Var
559559
geometry:
560-
akbk: ./fv3-jedi/fv3files/akbk72.nc4
560+
akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
561561
field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
562562
fms initialization:
563563
field table filename: ./fv3-jedi/fv3files/field_table_gmao
564564
namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
565565
layout:
566566
- @JEDI_VAR_XLAYOUT
567567
- @JEDI_VAR_YLAYOUT
568-
npx: @JEDI_BKG_RESOL
569-
npy: @JEDI_BKG_RESOL
570-
npz: 72
568+
npx: @JEDI_BKG_HRES
569+
npy: @JEDI_BKG_HRES
570+
npz: @JEDI_BKG_VRES
571571
jb evaluation: false
572572
# OBSYAML_BEG
573573
# OBSYAML_END
@@ -597,17 +597,17 @@ variational:
597597
diagnostics:
598598
departures: ombg
599599
geometry:
600-
akbk: ./fv3-jedi/fv3files/akbk72.nc4
600+
akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
601601
field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
602602
fms initialization:
603603
field table filename: ./fv3-jedi/fv3files/field_table_gmao
604604
namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
605605
layout:
606606
- @JEDI_VAR_XLAYOUT
607607
- @JEDI_VAR_YLAYOUT
608-
npx: @JEDI_BKG_RESOL
609-
npy: @JEDI_BKG_RESOL
610-
npz: 72
608+
npx: @JEDI_BKG_HRES
609+
npy: @JEDI_BKG_HRES
610+
npz: @JEDI_BKG_VRES
611611
gradient norm reduction: 1e-3
612612
linear model:
613613
increment variables:
@@ -673,17 +673,17 @@ variational:
673673
# diagnostics:
674674
# departures: ombg
675675
# geometry:
676-
# akbk: ./fv3-jedi/fv3files/akbk72.nc4
676+
# akbk: ./fv3-jedi/fv3files/akbk@JEDI_BKG_VRES.nc4
677677
# field metadata override: ./fv3-jedi/fieldmetadata/geos.yaml
678678
# fms initialization:
679679
# field table filename: ./fv3-jedi/fv3files/field_table_gmao
680680
# namelist filename: ./fv3-jedi/fv3files/fmsmpp.nml
681681
# layout:
682682
# - @JEDI_VAR_XLAYOUT
683683
# - @JEDI_VAR_YLAYOUT
684-
# npx: @JEDI_BKG_RESOL
685-
# npy: @JEDI_BKG_RESOL
686-
# npz: 72
684+
# npx: @JEDI_BKG_HRES
685+
# npy: @JEDI_BKG_HRES
686+
# npz: @JEDI_BKG_VRES
687687
# gradient norm reduction: 1e-3
688688
# linear model:
689689
# increment variables:

0 commit comments

Comments
 (0)