JEDI increment write to cubed sphere history

parm/atm/utils/gdas_jediinc2fv3.yaml.j2

@@ -9,11 +9,11 @@ background:
       field table filename: ./fv3jedi/field_table
     akbk: ./fv3jedi/akbk.nc4
     layout:
-    - ${{ layout_x }}
-    - ${{ layout_y }}
-    npx: ${{ npx_ges }}
-    npy: ${{ npy_ges }}
-    npz: ${{ npz_ges }}
+    - {{ layout_x }}
+    - {{ layout_y }}
+    npx: {{ npx_ges }}
+    npy: {{ npy_ges }}
+    npz: {{ npz_ges }}
     field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
   input:
     datapath: ./bkg
@@ -33,11 +33,11 @@ jedi increment:
       field table filename: ./fv3jedi/field_table
     akbk: ./fv3jedi/akbk.nc4
     layout:
-    - ${{ layout_x }}
-    - ${{ layout_y }}
-    npx: ${{ npx_ges }}
-    npy: ${{ npy_ges }}
-    npz: ${{ npz_ges }}
+    - {{ layout_x }}
+    - {{ layout_y }}
+    npx: {{ npx_ges }}
+    npy: {{ npy_ges }}
+    npz: {{ npz_ges }}
     field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml
   input:
     filetype: cube sphere history
@@ -50,11 +50,11 @@ fv3 increment:
       field table filename: ./fv3jedi/field_table
     akbk: ./fv3jedi/akbk.nc4
     layout:
-    - ${{ layout_x }}
-    - ${{ layout_y }}
-    npx: ${{ npx_ges }}
-    npy: ${{ npy_ges }}
-    npz: ${{ npz_ges }}
+    - {{ layout_x }}
+    - {{ layout_y }}
+    npx: {{ npx_ges }}
+    npy: {{ npy_ges }}
+    npz: {{ npz_ges }}
     field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_fv3inc.yaml
   output:
     filetype: auxgrid

parm/atm/variational/3dvar_drpcg.yaml.j2

@@ -84,9 +84,10 @@ final:
   increment:
     output:
       state component:
-        filetype: auxgrid
-        gridtype: gaussian
-        filename: ./anl/atminc.
+        filetype: cube sphere history
+        filename: ./anl/atminc.{{ current_cycle | to_fv3time }}.nc4
+        provider: ufs
+        fields to write: [ugrd,vgrd,tmp,pressfc,spfh,icmr,clwmr,o3mr]
     geometry:
       fms initialization:
         namelist filename: ./fv3jedi/fmsmpp.nml
@@ -98,4 +99,4 @@ final:
       npx: {{ npx_anl }}
       npy: {{ npy_anl }}
       npz: {{ npz_anl }}
-      field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
+      field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_history.yaml

test/CMakeLists.txt

@@ -116,11 +116,6 @@ add_test(NAME test_gdasapp_check_yaml_keys
 #         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/)
 # commented out above test because it does not really do as advertised with all these templates which are not valid yaml
 
-# test for ush/jediinc2fv3.py
-add_test(NAME test_gdasapp_jedi_increment_to_fv3
-         COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/ush/jediinc2fv3.py ${PROJECT_BINARY_DIR}/test/testdata/atmges_compress.nc4 ${PROJECT_BINARY_DIR}/test/testdata/atminc_compress.nc4 ${PROJECT_BINARY_DIR}/test/testoutput/fv_increment.nc
-         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/)
-
 # test for converting ewok yaml to gdas
 add_test(NAME test_gdasapp_convert_ewok_yaml
          COMMAND ${PROJECT_SOURCE_DIR}/test/convert_ewok_yaml.sh ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}