Skip to content

Commit cef9c83

Browse files
rtodlingrtodling
authored
Merge branch 'develop' into bugfix/jstassi/#381/handling_LFO_LDAS
2 parents bb875b9 + 0a850c3 commit cef9c83

File tree

8 files changed

+86
-14
lines changed

8 files changed

+86
-14
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ states:
1717
datetime: $ISO_STATES_DATE
1818
filetype: cube sphere history
1919
provider: geos
20+
compute edge pressure from surface pressure: true
21+
max allowable geometry difference: 1e-3
2022
filename: &mybkg $JEDI_CUBED_BKG
2123
datapath: ./
2224
state variables:
2325
- eastward_wind
2426
- northward_wind
2527
- air_temperature
26-
- air_pressure_thickness
28+
- air_pressure_levels
2729
- air_pressure_at_surface
2830
- water_vapor_mixing_ratio_wrt_moist_air
2931
- cloud_liquid_ice
@@ -64,7 +66,6 @@ states:
6466
eastward_wind: ua
6567
northward_wind: va
6668
air_temperature: t
67-
air_pressure_thickness: delp
6869
water_vapor_mixing_ratio_wrt_moist_air: q
6970
cloud_liquid_ice: qi
7071
cloud_liquid_water: ql
@@ -93,6 +94,7 @@ states:
9394
skin_temperature_at_surface: ts
9495
eastward_wind_at_surface: u10m
9596
northward_wind_at_surface: v10m
97+
air_pressure_levels: pe
9698
air_pressure_at_surface: ps
9799
sea_surface_temperature: ts_found
98100
#vtype, stype,vfrac,

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ state1:
2121
datetime: $ISO_STATES_DATE
2222
filetype: cube sphere history
2323
provider: geos
24+
compute edge pressure from surface pressure: true
25+
max allowable geometry difference: 1e-3
2426
datapath: ./ana
2527
filename: $JEDI_CUBED_ANA
2628
state variables: &statevars
@@ -34,6 +36,7 @@ state1:
3436
- snow_water
3537
- mole_fraction_of_ozone_in_air
3638
- geopotential_height_times_gravity_at_surface
39+
- air_pressure_levels
3740
- air_pressure_at_surface
3841
- skin_temperature_at_surface
3942
field io names: &field_io_names
@@ -47,13 +50,15 @@ state1:
4750
snow_water: qs
4851
mole_fraction_of_ozone_in_air: o3ppmv
4952
geopotential_height_times_gravity_at_surface: phis
53+
air_pressure_levels: pe
5054
air_pressure_at_surface: ps
5155
skin_temperature_at_surface: ts
52-
# - delp
5356
state2:
5457
datetime: $ISO_STATES_DATE
5558
filetype: cube sphere history
5659
provider: geos
60+
compute edge pressure from surface pressure: true
61+
max allowable geometry difference: 1e-3
5762
datapath: ./bkg
5863
filename: $JEDI_CUBED_BKG
5964
state variables: *statevars

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cost function:
55
- air_temperature
66
- water_vapor_mixing_ratio_wrt_moist_air
77
- air_pressure_at_surface
8+
- air_pressure_levels
89
- cloud_liquid_ice
910
- cloud_liquid_water
1011
- rain_water
@@ -19,6 +20,8 @@ cost function:
1920
datetime: $JEDI_ISO_DATE_BEG
2021
filetype: cube sphere history
2122
provider: geos
23+
compute edge pressure from surface pressure: true
24+
max allowable geometry difference: 1e-3
2225
datapath: ./
2326
filenames:
2427
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
@@ -27,7 +30,7 @@ cost function:
2730
- eastward_wind
2831
- northward_wind
2932
- air_temperature
30-
- air_pressure_thickness
33+
- air_pressure_levels
3134
- air_pressure_at_surface
3235
- water_vapor_mixing_ratio_wrt_moist_air
3336
- cloud_liquid_ice
@@ -69,7 +72,6 @@ cost function:
6972
eastward_wind: ua
7073
northward_wind: va
7174
air_temperature: t
72-
air_pressure_thickness: delp
7375
water_vapor_mixing_ratio_wrt_moist_air: q
7476
cloud_liquid_ice: qi
7577
cloud_liquid_water: ql
@@ -98,6 +100,7 @@ cost function:
98100
skin_temperature_at_surface: ts
99101
eastward_wind_at_surface: u10m
100102
northward_wind_at_surface: v10m
103+
air_pressure_levels: pe
101104
air_pressure_at_surface: ps
102105
sea_surface_temperature: ts_found
103106
# mole_fraction_of_carbon_dioxide_in_air: co2
@@ -159,6 +162,8 @@ cost function:
159162
tstep: PT3H
160163
filetype: cube sphere history
161164
provider: geos
165+
compute edge pressure from surface pressure: true
166+
max allowable geometry difference: 1e-3
162167
datapath: ./
163168
filenames:
164169
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
@@ -193,6 +198,7 @@ variational:
193198
air_temperature: t
194199
water_vapor_mixing_ratio_wrt_moist_air: q
195200
air_pressure_at_surface: ps
201+
air_pressure_levels: pe
196202
cloud_liquid_ice: qi
197203
cloud_liquid_water: ql
198204
rain_water: qr

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ cost function:
2222
- air_temperature
2323
- water_vapor_mixing_ratio_wrt_moist_air
2424
- air_pressure_at_surface
25+
- air_pressure_levels
2526
- cloud_liquid_ice
2627
- cloud_liquid_water
2728
- rain_water
@@ -36,6 +37,8 @@ cost function:
3637
datetime: $JEDI_ISO_DATE_ANA
3738
filetype: cube sphere history
3839
provider: geos
40+
compute edge pressure from surface pressure: true
41+
max allowable geometry difference: 1e-3
3942
datapath: ./
4043
filenames:
4144
- bkg.%yyyy%mm%ddT%hh%MM%ssZ.nc4
@@ -44,7 +47,7 @@ cost function:
4447
- eastward_wind
4548
- northward_wind
4649
- air_temperature
47-
- air_pressure_thickness
50+
- air_pressure_levels
4851
- air_pressure_at_surface
4952
- water_vapor_mixing_ratio_wrt_moist_air
5053
- cloud_liquid_ice
@@ -85,7 +88,6 @@ cost function:
8588
eastward_wind: ua
8689
northward_wind: va
8790
air_temperature: t
88-
air_pressure_thickness: delp
8991
water_vapor_mixing_ratio_wrt_moist_air: q
9092
cloud_liquid_ice: qi
9193
cloud_liquid_water: ql
@@ -114,6 +116,7 @@ cost function:
114116
skin_temperature_at_surface: ts
115117
eastward_wind_at_surface: u10m
116118
northward_wind_at_surface: v10m
119+
air_pressure_levels: pe
117120
air_pressure_at_surface: ps
118121
sea_surface_temperature: ts_found
119122
background error:

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ cost function:
55
- air_temperature
66
- water_vapor_mixing_ratio_wrt_moist_air
77
- air_pressure_at_surface
8+
- air_pressure_levels
9+
- air_pressure_levels
810
- cloud_liquid_ice
911
- cloud_liquid_water
1012
- rain_water
@@ -24,11 +26,13 @@ cost function:
2426
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
2527
filetype: cube sphere history
2628
provider: geos
29+
compute edge pressure from surface pressure: true
30+
max allowable geometry difference: 1e-3
2731
state variables: &statevars
2832
- eastward_wind
2933
- northward_wind
3034
- air_temperature
31-
- air_pressure_thickness
35+
- air_pressure_levels
3236
- air_pressure_at_surface
3337
- water_vapor_mixing_ratio_wrt_moist_air
3438
- cloud_liquid_ice
@@ -69,7 +73,6 @@ cost function:
6973
eastward_wind: ua
7074
northward_wind: va
7175
air_temperature: t
72-
air_pressure_thickness: delp
7376
water_vapor_mixing_ratio_wrt_moist_air: q
7477
cloud_liquid_ice: qi
7578
cloud_liquid_water: ql
@@ -98,6 +101,7 @@ cost function:
98101
skin_temperature_at_surface: ts
99102
eastward_wind_at_surface: u10m
100103
northward_wind_at_surface: v10m
104+
air_pressure_levels: pe
101105
air_pressure_at_surface: ps
102106
sea_surface_temperature: ts_found
103107
background error:
@@ -150,6 +154,8 @@ cost function:
150154
## datetime: 2020-12-15T00:00:00Z
151155
## filetype: cube sphere history
152156
## provider: geos
157+
## compute edge pressure from surface pressure: true
158+
## max allowable geometry difference: 1e-3
153159
## filename: Data/inputs/geos_c90/clim6.nc4
154160
value: 0.50
155161

@@ -161,6 +167,8 @@ cost function:
161167
- datetime: $JEDI_ISO_DATE_ANA
162168
filetype: cube sphere history
163169
provider: geos
170+
compute edge pressure from surface pressure: true
171+
max allowable geometry difference: 1e-3
164172
state variables: *anavars
165173
datapath: ./
166174
filenames: [mem%mem%/geos.bkg_clcv.%yyyy%mm%dd_%hh%MMz.nc4, fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKGCOV_RESOL.nc4]

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

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cost function:
55
- air_temperature
66
- water_vapor_mixing_ratio_wrt_moist_air
77
- air_pressure_at_surface
8+
- air_pressure_levels
89
- cloud_liquid_ice
910
- cloud_liquid_water
1011
- rain_water
@@ -24,11 +25,13 @@ cost function:
2425
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
2526
filetype: cube sphere history
2627
provider: geos
28+
compute edge pressure from surface pressure: true
29+
max allowable geometry difference: 1e-3
2730
state variables: &statevars
2831
- eastward_wind
2932
- northward_wind
3033
- air_temperature
31-
- air_pressure_thickness
34+
- air_pressure_levels
3235
- air_pressure_at_surface
3336
- water_vapor_mixing_ratio_wrt_moist_air
3437
- cloud_liquid_ice
@@ -69,7 +72,6 @@ cost function:
6972
eastward_wind: ua
7073
northward_wind: va
7174
air_temperature: t
72-
air_pressure_thickness: delp
7375
water_vapor_mixing_ratio_wrt_moist_air: q
7476
cloud_liquid_ice: qi
7577
cloud_liquid_water: ql
@@ -98,6 +100,7 @@ cost function:
98100
skin_temperature_at_surface: ts
99101
eastward_wind_at_surface: u10m
100102
northward_wind_at_surface: v10m
103+
air_pressure_levels: pe
101104
air_pressure_at_surface: ps
102105
sea_surface_temperature: ts_found
103106
- datapath: './'
@@ -107,6 +110,8 @@ cost function:
107110
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
108111
filetype: cube sphere history
109112
provider: geos
113+
compute edge pressure from surface pressure: true
114+
max allowable geometry difference: 1e-3
110115
state variables: *statevars
111116
field io names: *field_io_names
112117
- datapath: './'
@@ -116,6 +121,8 @@ cost function:
116121
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
117122
filetype: cube sphere history
118123
provider: geos
124+
compute edge pressure from surface pressure: true
125+
max allowable geometry difference: 1e-3
119126
state variables: *statevars
120127
field io names: *field_io_names
121128
- datapath: './'
@@ -125,6 +132,8 @@ cost function:
125132
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
126133
filetype: cube sphere history
127134
provider: geos
135+
compute edge pressure from surface pressure: true
136+
max allowable geometry difference: 1e-3
128137
state variables: *statevars
129138
field io names: *field_io_names
130139
- datapath: './'
@@ -134,6 +143,8 @@ cost function:
134143
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
135144
filetype: cube sphere history
136145
provider: geos
146+
compute edge pressure from surface pressure: true
147+
max allowable geometry difference: 1e-3
137148
state variables: *statevars
138149
field io names: *field_io_names
139150
- datapath: './'
@@ -143,6 +154,8 @@ cost function:
143154
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
144155
filetype: cube sphere history
145156
provider: geos
157+
compute edge pressure from surface pressure: true
158+
max allowable geometry difference: 1e-3
146159
state variables: *statevars
147160
field io names: *field_io_names
148161
- datapath: './'
@@ -152,6 +165,8 @@ cost function:
152165
- fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKG_HRES.nc4
153166
filetype: cube sphere history
154167
provider: geos
168+
compute edge pressure from surface pressure: true
169+
max allowable geometry difference: 1e-3
155170
state variables: *statevars
156171
field io names: *field_io_names
157172
background error:
@@ -204,6 +219,8 @@ cost function:
204219
## datetime: 2020-12-15T00:00:00Z
205220
## filetype: cube sphere history
206221
## provider: geos
222+
## compute edge pressure from surface pressure: true
223+
## max allowable geometry difference: 1e-3
207224
## filename: Data/inputs/geos_c90/clim6.nc4
208225
value: 0.50
209226

@@ -215,42 +232,56 @@ cost function:
215232
- datetime: $JEDI_ISO_DATE_001
216233
filetype: cube sphere history
217234
provider: geos
235+
compute edge pressure from surface pressure: true
236+
max allowable geometry difference: 1e-3
218237
state variables: *anavars
219238
datapath: ./
220239
filenames: [mem%mem%/geos.bkg_clcv.%yyyy%mm%dd_%hh%MMz.nc4, fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKGCOV_RESOL.nc4]
221240
- datetime: $JEDI_ISO_DATE_002
222241
filetype: cube sphere history
223242
provider: geos
243+
compute edge pressure from surface pressure: true
244+
max allowable geometry difference: 1e-3
224245
state variables: *anavars
225246
datapath: ./
226247
filenames: [mem%mem%/geos.bkg_clcv.%yyyy%mm%dd_%hh%MMz.nc4, fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKGCOV_RESOL.nc4]
227248
- datetime: $JEDI_ISO_DATE_003
228249
filetype: cube sphere history
229250
provider: geos
251+
compute edge pressure from surface pressure: true
252+
max allowable geometry difference: 1e-3
230253
state variables: *anavars
231254
datapath: ./
232255
filenames: [mem%mem%/geos.bkg_clcv.%yyyy%mm%dd_%hh%MMz.nc4, fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKGCOV_RESOL.nc4]
233256
- datetime: $JEDI_ISO_DATE_004
234257
filetype: cube sphere history
235258
provider: geos
259+
compute edge pressure from surface pressure: true
260+
max allowable geometry difference: 1e-3
236261
state variables: *anavars
237262
datapath: ./
238263
filenames: [mem%mem%/geos.bkg_clcv.%yyyy%mm%dd_%hh%MMz.nc4, fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKGCOV_RESOL.nc4]
239264
- datetime: $JEDI_ISO_DATE_005
240265
filetype: cube sphere history
241266
provider: geos
267+
compute edge pressure from surface pressure: true
268+
max allowable geometry difference: 1e-3
242269
state variables: *anavars
243270
datapath: ./
244271
filenames: [mem%mem%/geos.bkg_clcv.%yyyy%mm%dd_%hh%MMz.nc4, fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKGCOV_RESOL.nc4]
245272
- datetime: $JEDI_ISO_DATE_006
246273
filetype: cube sphere history
247274
provider: geos
275+
compute edge pressure from surface pressure: true
276+
max allowable geometry difference: 1e-3
248277
state variables: *anavars
249278
datapath: ./
250279
filenames: [mem%mem%/geos.bkg_clcv.%yyyy%mm%dd_%hh%MMz.nc4, fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKGCOV_RESOL.nc4]
251280
- datetime: $JEDI_ISO_DATE_007
252281
filetype: cube sphere history
253282
provider: geos
283+
compute edge pressure from surface pressure: true
284+
max allowable geometry difference: 1e-3
254285
state variables: *anavars
255286
datapath: ./
256287
filenames: [mem%mem%/geos.bkg_clcv.%yyyy%mm%dd_%hh%MMz.nc4, fv3-jedi/bkg/geos.crtmsrf.@JEDI_BKGCOV_RESOL.nc4]
@@ -363,6 +394,8 @@ cost function:
363394
# datetime: 2020-12-15T00:00:00Z
364395
# filetype: cube sphere history
365396
# provider: geos
397+
# compute edge pressure from surface pressure: true
398+
# max allowable geometry difference: 1e-3
366399
# filename: Data/inputs/geos_c90/tropo6.nc4
367400
# filename: Data/inputs/geos_c90/ens6.nc4
368401
value: 0.50

0 commit comments

Comments
 (0)