Skip to content

Commit 51bf821

Browse files
rtodlingrtodling
authored
Merge pull request #356 from GEOS-ESM/feature/rtodling/rev4inc_handle
Var 4d no longer writes out inc; inc generated offline
2 parents 013885c + 3dd8a1b commit 51bf821

File tree

8 files changed

+259
-102
lines changed

8 files changed

+259
-102
lines changed

‎src/Applications/GEOSdas_App/jedi/etc/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set (ALLETC
22
JEDIanaConfig.csh
33
SWELLConfig.csh
4+
diffstates_geos.yaml
45
geos_3dvar.yaml
56
geos_3dfgat.yaml
67
geos_hyb4denvar.yaml

‎src/Applications/GEOSdas_App/jedi/etc/JEDIanaConfig.csh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ setenv JEDI_ROOT @JEDI_ROOT
2727
# Specific to run procedure
2828
setenv JEDI_RUN_ANA 1
2929
setenv JEDI_RUN_CNVANA 0 # convert cc ana and/or inc output to ll
30+
setenv JEDI_RUN_GETINC @JEDI_RUN_GETINC # calc cubed inc from diff of cubed ana and bkg
3031
setenv JEDI_RUN_UPDRST 0 # not desirable
3132

3233
setenv JEDI_ADDINC_MPIRUN "mpirun -np 12"
3334
setenv JEDI_CNVANA_MPIRUN "mpirun -np 12"
3435
setenv JEDI_CNVENS_MPIRUN "mpirun -np 12"
3536
setenv JEDI_CNVINC_MPIRUN "mpirun -np 12"
37+
setenv JEDI_GETINC_MPIRUN "mpirun -np 6"
3638
setenv JEDI_NCPUS @JEDI_VAR_NCPUS
3739
setenv JEDI_FV3VAR_MPIRUN "mpirun -perhost @JEDI_VAR_PERHOST -np $JEDI_NCPUS"
3840

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
input geometry:
2+
fms initialization:
3+
namelist filename: fv3-jedi/fv3files/fmsmpp.nml
4+
field table filename: fv3-jedi/fv3files/field_table_gmao
5+
akbk: fv3-jedi/fv3files/akbk72.nc4
6+
npx: @JEDI_BKG_RESOL
7+
npy: @JEDI_BKG_RESOL
8+
npz: 72
9+
field metadata override: fv3-jedi/fieldmetadata/geos.yaml
10+
output geometry:
11+
akbk: fv3-jedi/fv3files/akbk72.nc4
12+
# interpolation method: bump
13+
npx: @JEDI_BKG_RESOL_OUT
14+
npy: @JEDI_BKG_RESOL_OUT
15+
npz: 72
16+
field metadata override: fv3-jedi/fieldmetadata/geos.yaml
17+
states:
18+
- input:
19+
datetime: $ISO_STATES_DATE
20+
filetype: cube sphere history
21+
provider: geos
22+
filename: &mybkg $JEDI_CUBED_BKG
23+
datapath: ./
24+
state variables: [ua,va,t,delp,ps,q,qi,ql,qr,qs,o3ppmv,phis,
25+
qls,qcn,cfcn,frocean,frland,varflt,ustar,bstar,
26+
zpbl,cm,ct,cq,kcbl,tsm,khl,khu,frlake,frseaice,
27+
sheleg,ts,soilt,soilm,u10m,v10m,co2]
28+
#vtype, stype,vfrac,
29+
output:
30+
filetype: cube sphere history
31+
provider: geos
32+
datapath: ./$OUTDIR
33+
filename: *mybkg

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
state geometry:
2+
fms initialization:
3+
namelist filename: fv3-jedi/fv3files/fmsmpp.nml
4+
field table filename: fv3-jedi/fv3files/field_table_gmao
5+
akbk: fv3-jedi/fv3files/akbk72.nc4
6+
npx: @JEDI_BKG_RESOL
7+
npy: @JEDI_BKG_RESOL
8+
npz: 72
9+
field metadata override: fv3-jedi/fieldmetadata/geos.yaml
10+
increment geometry:
11+
akbk: fv3-jedi/fv3files/akbk72.nc4
12+
npx: @JEDI_BKG_RESOL
13+
npy: @JEDI_BKG_RESOL
14+
npz: 72
15+
field metadata override: fv3-jedi/fieldmetadata/geos.yaml
16+
state1:
17+
datetime: $ISO_STATES_DATE
18+
filetype: cube sphere history
19+
provider: geos
20+
datapath: ./ana
21+
filename: $JEDI_CUBED_ANA
22+
state variables:
23+
- ua
24+
- va
25+
- t
26+
- q
27+
- qi
28+
- ql
29+
- qr
30+
- qs
31+
- o3ppmv
32+
- ps
33+
- phis
34+
- ts
35+
# - delp
36+
state2:
37+
datetime: $ISO_STATES_DATE
38+
filetype: cube sphere history
39+
provider: geos
40+
datapath: ./bkg
41+
filename: $JEDI_CUBED_BKG
42+
state variables:
43+
- ua
44+
- va
45+
- t
46+
- q
47+
- qi
48+
- ql
49+
- qr
50+
- qs
51+
- o3ppmv
52+
- ps
53+
- phis
54+
- ts
55+
# - delp
56+
output:
57+
filetype: auxgrid
58+
gridtype: latlon
59+
datapath: ./inc
60+
filename: $EXPID.jedi_inc1.eta.

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

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -36221,13 +36221,13 @@ final:
3622136221
departures: oman
3622236222
prints:
3622336223
frequency: PT1H
36224-
#output:
36225-
# datapath: ./
36226-
# filename: $EXPID.ana.ceta.%yyyy%mm%dd_%hh%MM%ssz.nc4
36227-
# filetype: cube sphere history
36228-
# first: PT0H
36229-
# frequency: PT1H
36230-
# provider: geos
36224+
output:
36225+
datapath: ./ana
36226+
filename: $EXPID.ana.ceta.%yyyy%mm%dd_%hh%MMz.nc4
36227+
filetype: cube sphere history
36228+
first: PT0H
36229+
frequency: PT1H
36230+
provider: geos
3623136231
variational:
3623236232
iterations:
3623336233
- ninner: '50'
@@ -36266,46 +36266,46 @@ variational:
3626636266
name: Identity
3626736267
tstep: PT1H
3626836268
variable change: Identity
36269-
online diagnostics:
36270-
increment:
36271-
state component:
36272-
states:
36273-
- date: $JEDI_ISO_DATE_001
36274-
datapath: ./
36275-
filename: $EXPID.jedi_inc1.eta.
36276-
filetype: auxgrid
36277-
gridtype: latlon
36278-
- date: $JEDI_ISO_DATE_002
36279-
datapath: ./
36280-
filename: $EXPID.jedi_inc1.eta.
36281-
filetype: auxgrid
36282-
gridtype: latlon
36283-
- date: $JEDI_ISO_DATE_003
36284-
datapath: ./
36285-
filename: $EXPID.jedi_inc1.eta.
36286-
filetype: auxgrid
36287-
gridtype: latlon
36288-
- date: $JEDI_ISO_DATE_004
36289-
datapath: ./
36290-
filename: $EXPID.jedi_inc1.eta.
36291-
filetype: auxgrid
36292-
gridtype: latlon
36293-
- date: $JEDI_ISO_DATE_005
36294-
datapath: ./
36295-
filename: $EXPID.jedi_inc1.eta.
36296-
filetype: auxgrid
36297-
gridtype: latlon
36298-
- date: $JEDI_ISO_DATE_006
36299-
datapath: ./
36300-
filename: $EXPID.jedi_inc1.eta.
36301-
filetype: auxgrid
36302-
gridtype: latlon
36303-
- date: $JEDI_ISO_DATE_007
36304-
datapath: ./
36305-
filename: $EXPID.jedi_inc1.eta.
36306-
filetype: auxgrid
36307-
gridtype: latlon
36308-
write increment: true
36269+
# online diagnostics:
36270+
# increment:
36271+
# state component:
36272+
# states:
36273+
# - date: $JEDI_ISO_DATE_001
36274+
# datapath: ./
36275+
# filename: $EXPID.jedi_inc1.eta.
36276+
# filetype: auxgrid
36277+
# gridtype: latlon
36278+
# - date: $JEDI_ISO_DATE_002
36279+
# datapath: ./
36280+
# filename: $EXPID.jedi_inc1.eta.
36281+
# filetype: auxgrid
36282+
# gridtype: latlon
36283+
# - date: $JEDI_ISO_DATE_003
36284+
# datapath: ./
36285+
# filename: $EXPID.jedi_inc1.eta.
36286+
# filetype: auxgrid
36287+
# gridtype: latlon
36288+
# - date: $JEDI_ISO_DATE_004
36289+
# datapath: ./
36290+
# filename: $EXPID.jedi_inc1.eta.
36291+
# filetype: auxgrid
36292+
# gridtype: latlon
36293+
# - date: $JEDI_ISO_DATE_005
36294+
# datapath: ./
36295+
# filename: $EXPID.jedi_inc1.eta.
36296+
# filetype: auxgrid
36297+
# gridtype: latlon
36298+
# - date: $JEDI_ISO_DATE_006
36299+
# datapath: ./
36300+
# filename: $EXPID.jedi_inc1.eta.
36301+
# filetype: auxgrid
36302+
# gridtype: latlon
36303+
# - date: $JEDI_ISO_DATE_007
36304+
# datapath: ./
36305+
# filename: $EXPID.jedi_inc1.eta.
36306+
# filetype: auxgrid
36307+
# gridtype: latlon
36308+
# write increment: true
3630936309
# - ninner: '25'
3631036310
# diagnostics:
3631136311
# departures: ombg

‎src/Applications/GEOSdas_App/jedi/jedi_run.csh‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ if ( !($?FVWORK) ) setenv FAILED 1
5959
if ( !($?JEDI_ROOT) ) setenv FAILED 1
6060
if ( !($?JEDI_RUN_ANA) ) setenv FAILED 1
6161
if ( !($?JEDI_RUN_CNVANA) ) setenv FAILED 1
62+
if ( !($?JEDI_RUN_GETINC) ) setenv FAILED 1
6263
if ( !($?JEDI_RUN_UPDRST) ) setenv FAILED 1
6364
if ( !($?JEDI_VAROFFSET) ) setenv FAILED 1
6465
if ( !($?JEDI_ADDINC_MPIRUN) ) setenv FAILED 1
@@ -173,8 +174,7 @@ if ( $JEDI_RUN_ANA ) then
173174
endif
174175

175176
if ( -e $FVHOME/run/jedi/jedi_run_var.j ) then
176-
vED -env $FVHOME/run/jedi/jedi_run_var.j -o jedi_run_var.j
177-
sbatch -W jedi_run_var.j
177+
sbatch -W $FVHOME/run/jedi/jedi_run_var.j
178178
sleep 2
179179
else
180180
$JEDI_FV3VAR_MPIRUN $JEDIBUILD/bin/fv3jedi_var.x $MYCONF |& tee -a $FVWORK/$JEDIVARLOG
@@ -202,6 +202,29 @@ if ( $JEDI_RUN_ANA ) then
202202
endif
203203
endif
204204

205+
if ( $JEDI_RUN_GETINC ) then
206+
207+
# Calculate increment on the cubed offline from cubed ana and bkg
208+
# ATTENTION: 1. This should be parallelized.
209+
# 2. mkiau has been enabled to handled cubed states, so this
210+
# can be bypassed at some point.
211+
# ---------------------------------------------------------------
212+
foreach cana (`ls ana/*ana.ceta*` )
213+
set this = `basename $cana`
214+
set ttag = `echo $this | cut -d. -f4`
215+
set yyyys = `echo $ttag | cut -c1-4`
216+
set mms = `echo $ttag | cut -c5-6`
217+
set dds = `echo $ttag | cut -c7-8`
218+
set hhs = `echo $ttag | cut -c10-11`
219+
if ( -e Config/diffstates_geos_${yyyys}${mms}${dds}_${hhs}z.yaml ) then
220+
$JEDI_GETINC_MPIRUN $JEDIBUILD/bin/fv3jedi_diffstates.x Config/diffstates_geos_${yyyys}${mms}${dds}_${hhs}z.yaml
221+
else
222+
echo " ${MYNAME}: missing Config/diffstates_geos_${yyyys}${mms}${dds}_${hhs}z.yaml file, aborting ... "
223+
exit 1
224+
endif
225+
end
226+
227+
endif
205228

206229
if ( $JEDI_RUN_CNVANA ) then
207230

0 commit comments

Comments
 (0)