Add ability for JEDI-to-FV3 increment converter to process ensembles

parm/atm/utils/fv3jedi_fv3inc_lgetkf.yaml.j2

@@ -0,0 +1,62 @@
+variable change:
+  variable change name: Model2GeoVaLs
+  input variables: &bkgvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height]
+  output variables: &fv3incrvars [ua,va,t,sphum,ice_wat,liq_wat,o3mr,delp,hydrostatic_delz]
+jedi increment variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
+fv3 increment variables: *fv3incrvars
+background geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table
+  akbk: ./fv3jedi/akbk.nc4
+  layout:
+  - {{ layout_x }}
+  - {{ layout_y }}
+  npx: {{ npx_ges }}
+  npy: {{ npy_ges }}
+  npz: {{ npz_ges }}
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml
+jedi increment geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table
+  akbk: ./fv3jedi/akbk.nc4
+  layout:
+  - {{ layout_x }}
+  - {{ layout_y }}
+  npx: {{ npx_ges }}
+  npy: {{ npy_ges }}
+  npz: {{ npz_ges }}
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml
+fv3 increment geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table
+  akbk: ./fv3jedi/akbk.nc4
+  layout:
+  - {{ layout_x }}
+  - {{ layout_y }}
+  npx: {{ npx_ges }}
+  npy: {{ npy_ges }}
+  npz: {{ npz_ges }}
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_fv3inc.yaml
+members from template:
+  template:
+    background input:
+      datetime: '{{ current_cycle | to_isotime }}'
+      filetype: cube sphere history
+      provider: ufs
+      datapath: ./bkg/mem%mem%
+      filename: {{ EPREFIX }}atmf006.nc
+      state variables: *bkgvars
+    jedi increment input:
+      filetype: cube sphere history
+      filename: ./anl/mem%mem%/atminc.{{ current_cycle | to_fv3time }}.nc4
+      provider: ufs
+    fv3 increment output:
+      filetype: auxgrid
+      gridtype: gaussian
+      filename: ./anl/mem%mem%/atminc.
+  pattern: '%mem%'
+  nmembers: {{ NMEM_ENS }}
+  zero padding: 3    

parm/atm/utils/fv3jedi_fv3inc_variational.yaml.j2

@@ -0,0 +1,62 @@
+variable change:
+  variable change name: Model2GeoVaLs
+  input variables: &bkgvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,phis]
+  output variables: &fv3incrvars [ua,va,t,sphum,ice_wat,liq_wat,o3mr,delp,hydrostatic_delz]
+jedi increment variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
+fv3 increment variables: *fv3incrvars
+background geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table
+  akbk: ./fv3jedi/akbk.nc4
+  layout:
+  - {{ layout_x }}
+  - {{ layout_y }}
+  npx: {{ npx_ges }}
+  npy: {{ npy_ges }}
+  npz: {{ npz_ges }}
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
+jedi increment geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table
+  akbk: ./fv3jedi/akbk.nc4
+  layout:
+  - {{ layout_x }}
+  - {{ layout_y }}
+  npx: {{ npx_anl }}
+  npy: {{ npy_anl }}
+  npz: {{ npz_anl }}
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml
+fv3 increment geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table
+  akbk: ./fv3jedi/akbk.nc4
+  layout:
+  - {{ layout_x }}
+  - {{ layout_y }}
+  npx: {{ npx_anl }}
+  npy: {{ npy_anl }}
+  npz: {{ npz_anl }}
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_fv3inc.yaml
+members:
+- background input:
+    datapath: ./bkg
+    filetype: fms restart
+    datetime: '{{ current_cycle | to_isotime }}'
+    filename_core: '{{ current_cycle | to_fv3time }}.fv_core.res.nc'
+    filename_trcr: '{{ current_cycle | to_fv3time }}.fv_tracer.res.nc'
+    filename_sfcd: '{{ current_cycle | to_fv3time }}.sfc_data.nc'
+    filename_sfcw: '{{ current_cycle | to_fv3time }}.fv_srf_wnd.res.nc'
+    filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
+    state variables: *bkgvars
+  jedi increment input:
+    filetype: cube sphere history
+    filename: ./anl/atminc.{{ current_cycle | to_fv3time }}.nc4
+    provider: ufs
+  fv3 increment output:
+    filetype: auxgrid
+    gridtype: gaussian
+    filename: ./anl/atminc.
+

test/fv3jedi/testinput/gdasapp_fv3jedi_fv3inc.yaml

@@ -1,60 +1,59 @@
 variable change:
   variable change name: Model2GeoVaLs
-  input variables: &inputvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,phis]
-  output variables: [ua,va,t,sphum,ice_wat,liq_wat,o3mr,delp,hydrostatic_delz]
-background:
-  geometry:
-    fms initialization:
-      namelist filename: ./fv3jedi/fmsmpp.nml
-      field table filename: ./fv3jedi/field_table_gfdl
-    akbk: ./fv3jedi/akbk127.nc4
-    layout:
-    - '1'
-    - '1'
-    npx: '13'
-    npy: '13'
-    npz: '127'
-    field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml
-  input:
+  input variables: &bkgvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,phis]
+  output variables: &fv3incrvars [ua,va,t,sphum,ice_wat,liq_wat,o3mr,delp,hydrostatic_delz]
+jedi increment variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
+fv3 increment variables: *fv3incrvars
+background geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table_gfdl
+  akbk: ./fv3jedi/akbk127.nc4
+  layout:
+  - '1'
+  - '1'
+  npx: '13'
+  npy: '13'
+  npz: '127'
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml
+jedi increment geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table_gfdl
+  akbk: ./fv3jedi/akbk127.nc4
+  layout:
+  - '1'
+  - '1'
+  npx: '13'
+  npy: '13'
+  npz: '127'
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml
+fv3 increment geometry:
+  fms initialization:
+    namelist filename: ./fv3jedi/fmsmpp.nml
+    field table filename: ./fv3jedi/field_table_gfdl
+  akbk: ./fv3jedi/akbk127.nc4
+  layout:
+  - '1'
+  - '1'
+  npx: '13'
+  npy: '13'
+  npz: '127'
+  field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_fv3inc.yaml
+members:
+- background input:
     filetype: cube sphere history
     datapath: ../testdata/
     provider: ufs
     datetime: '2021-07-31T12:00:00Z'
     filename: gdas.t06z.atmf006.nc
-    state variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,phis]
-jedi increment:
-  input variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
-  geometry:
-    fms initialization:
-      namelist filename: ./fv3jedi/fmsmpp.nml
-      field table filename: ./fv3jedi/field_table_gfdl
-    akbk: ./fv3jedi/akbk127.nc4
-    layout:
-    - '1'
-    - '1'
-    npx: '13'
-    npy: '13'
-    npz: '127'
-    field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml
-  input:
+    state variables: *bkgvars
+  jedi increment input:
     filetype: cube sphere history
     datapath: ../testdata/
     filename: atminc.20210731.120000.nc4
     provider: ufs
-fv3 increment:
-  geometry:
-    fms initialization:
-      namelist filename: ./fv3jedi/fmsmpp.nml
-      field table filename: ./fv3jedi/field_table_gfdl
-    akbk: ./fv3jedi/akbk127.nc4
-    layout:
-    - '1'
-    - '1'
-    npx: '13'
-    npy: '13'
-    npz: '127'
-    field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_fv3inc.yaml
-  output:
+  fv3 increment output:
     filetype: cube sphere history
     filename: atminc.20210731_120000.nc4
     provider: ufs