Merge branch 'develop' into feature/stable-nightly

NOAA-EMC · Nov 28, 2024 · 73aa8db · 73aa8db
2 parents 95ed6be + 9b78c7d
commit 73aa8db
Show file tree

Hide file tree

Showing 49 changed files with 3,457 additions and 527 deletions.
diff --git a/ci/hera.sh b/ci/hera.sh
@@ -6,3 +6,4 @@ export SALLOC_ACCOUNT=$SLURM_ACCOUNT
 export SBATCH_ACCOUNT=$SLURM_ACCOUNT
 export SLURM_QOS=debug
 export PATH=$PATH:/home/role.jedipara/bin
+export NTASKS_TESTS=12
diff --git a/ci/orion.sh b/ci/orion.sh
@@ -8,3 +8,4 @@ export SLURM_QOS=debug
 export SLURM_EXCLUSIVE=user
 export OMP_NUM_THREADS=1
 ulimit -s unlimited
+export NTASKS_TESTS=12
diff --git a/ci/run_ci.sh b/ci/run_ci.sh
@@ -61,7 +61,7 @@ module use $GDAS_MODULE_USE
 module load GDAS/$TARGET
 echo "---------------------------------------------------" >> $outfile
 rm -rf log.ctest
-ctest -R gdasapp --output-on-failure &>> log.ctest
+ctest -j${NTASKS_TESTS} -R gdasapp --output-on-failure &>> log.ctest
 ctest_status=$?
 npassed=$(cat log.ctest | grep "tests passed")
 if [ $ctest_status -eq 0 ]; then

diff --git a/ci/run_gw_ci.sh b/ci/run_gw_ci.sh
@@ -62,7 +62,7 @@ module use $repodir/sorc/gdas.cd/modulefiles
 module load GDAS/$TARGET
 echo "---------------------------------------------------" >> $outfile
 rm -rf log.ctest
-ctest -R gdasapp --output-on-failure &>> log.ctest
+ctest -j${NTASKS_TESTS} -R gdasapp --output-on-failure &>> log.ctest
 ctest_status=$?
 npassed=$(cat log.ctest | grep "tests passed")
 if [ $ctest_status -eq 0 ]; then

diff --git a/parm/aero/berror/aero_diagb.yaml.j2 b/parm/aero/berror/aero_diagb.yaml.j2
@@ -76,25 +76,25 @@ variables:
   - mass_fraction_of_sea_salt003_in_air
   - mass_fraction_of_sea_salt004_in_air
 
-global rescale: 
-  geometry:
-    fms initialization:
-      namelist filename: ./fv3jedi/fmsmpp.nml
-      field table filename: ./fv3jedi/field_table
-    akbk: ./fv3jedi/akbk.nc4
-    layout: 
-    - {{ layout_x }} 
-    - {{ layout_y }}
-    nxp: {{ npx_rescale }}
-    npy: {{ npy_rescale }}
-    npz: {{ npz_ges }}
-    field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
-  rescale stddev:
-    filetype: fms restart
-    skip coupler file: true
-    dateapath: ./stddev
-    filename_trcr: rescale.fv_tracer.res.nc
-    filename_cplr: rescale.coupler.res 
+#global rescale:
+#  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_rescale }}
+#    npy: {{ npy_rescale }}
+#    npz: {{ npz_ges }}
+#    field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
+#  rescale stddev:
+#    filetype: fms restart
+#    skip coupler file: true
+#    dateapath: ./stddev
+#    filename_trcr: rescale.fv_tracer.res.nc
+#    filename_cplr: rescale.coupler.res
 
 number of halo points: {{ aero_diagb_n_halo }}
 number of neighbors: {{ aero_diagb_n_neighbors }}

diff --git a/parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2 b/parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2
@@ -0,0 +1,13 @@
+# Algorithm
+# ---------
+algorithm: fv3jedi_fv3inc_variational
+
+# Testing things
+# --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_3dvar-fv3inc.test.out
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_3dvar.yaml.j2 b/parm/atm/jcb-prototype_3dvar.yaml.j2
@@ -30,3 +30,13 @@ observations:
 #  - scatwind_ascat_metop-a
 #  - snowcvr
 #  - abi_g16
+
+# Testing things
+# --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_3dvar.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_3dvar.test.out
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2 b/parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2
@@ -0,0 +1,13 @@
+# Algorithm
+# ---------
+algorithm: fv3jedi_fv3inc_lgetkf
+
+# Testing things
+# --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf-fv3inc.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf-fv3inc.test.out
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf.yaml.j2 b/parm/atm/jcb-prototype_lgetkf.yaml.j2
@@ -38,3 +38,13 @@ observations:
   - satwnd.viirs_npp
 #  - scatwind_ascat_metop-a
 #  - snowcvr
+
+# Testing things
+# --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf.test.out
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2 b/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
@@ -44,3 +44,13 @@ atmosphere_obsdataout_prefix: diag_lobs_
 
 # Distribution type
 distribution_type: RoundRobin
+
+# Testing things
+# --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf_observer.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf_observer.test.out
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2 b/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
@@ -47,3 +47,13 @@ atmosphere_obsdataout_prefix: diag_solv_
 
 # Distribution type
 distribution_type: Halo
+
+# Testing things
+# --------------
+{% if DO_TEST_MODE and RUN == 'enkfgdas'  %}
+do_testing: true
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf_solver.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf_solver.test.out
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/jcb-algorithms b/parm/jcb-algorithms
diff --git a/parm/jcb-gdas b/parm/jcb-gdas
diff --git a/parm/soca/marine-jcb-3dfgat.yaml.j2 b/parm/soca/marine-jcb-3dfgat.yaml.j2
@@ -3,3 +3,13 @@ algorithm: 3dfgat
 
 # Observations
 observations: !INC ${OBS_LIST_SHORT}
+
+# Testing things
+# --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
+test_reference_filename: '{{HOMEgfs}}/sorc/gdas.cd/test/testreference/C48mx500_3DVarAOWCDA_3dfgat.ref'
+test_output_filename: '{{HOMEgfs}}/sorc/gdas.cd/build/gdas/test/testoutput/C48mx500_3DVarAOWCDA_3dfgat.test.out'
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5
+{% endif %}
diff --git a/parm/soca/marine-jcb-base.yaml b/parm/soca/marine-jcb-base.yaml
@@ -26,7 +26,6 @@ final_prints_frequency: PT3H
 number_of_outer_loops: 1
 analysis_variables: [sea_ice_area_fraction, sea_ice_thickness, sea_ice_snow_thickness, sea_water_salinity, sea_water_potential_temperature, eastward_sea_water_velocity, northward_sea_water_velocity, sea_surface_height_above_geoid]
 
-
 # Model things
 # ------------
 marine_window_begin: '{{MARINE_WINDOW_BEGIN}}'

diff --git a/sorc/soca b/sorc/soca
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -24,7 +24,6 @@ file(ARCHIVE_EXTRACT INPUT ${CMAKE_CURRENT_BINARY_DIR}/${TAR}
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 # list of test binary/data files to install
 list(APPEND test_data
-  ${CMAKE_CURRENT_BINARY_DIR}/testdata/atminc_compress.nc4
   ${CMAKE_CURRENT_BINARY_DIR}/testdata/adt.nc
   ${CMAKE_CURRENT_BINARY_DIR}/testdata/sst.nc
   ${CMAKE_CURRENT_BINARY_DIR}/testdata/sss.nc
@@ -120,11 +119,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/)
-
 # high level tests that require the global-workflow
 # TODO(AFE) see GDASApp issue #1213
 #if (WORKFLOW_TESTS)
@@ -136,7 +130,6 @@ add_test(NAME test_gdasapp_jedi_increment_to_fv3
 #endif()
 
 if (${BUILD_GDASBUNDLE})
-  add_subdirectory(fv3jedi)   # fv3jedi tests
   add_subdirectory(snow)      # snow da tests
   add_subdirectory(gw-ci)   # subset of the global-workflow ci tests
 endif()

diff --git a/test/atm/global-workflow/CMakeLists.txt b/test/atm/global-workflow/CMakeLists.txt
@@ -1,63 +1,86 @@
 # test for creating an experiment directory within the global-workflow
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
 
-add_test(NAME test_gdasapp_setup_atm_cycled_exp
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/setup_workflow_exp.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_var_init
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_var_init.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_var_run
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_var_run.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_var_inc
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_var_inc.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_var_final
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_var_final.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_ens_init
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_init.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_ens_letkf
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_letkf.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-	  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_ens_init_split
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_init_split.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_ens_obs
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_obs.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_ens_sol
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_sol.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
+ecbuild_add_test(TARGET test_gdasapp_setup_atm_cycled_exp
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/setup_workflow_exp.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_var_init
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_var_init.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_setup_atm_cycled_exp)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_var_run
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_var_run.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_var_init)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_var_inc
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_var_inc.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_var_run)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_var_final
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_var_final.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_var_inc)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_ens_init
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_init.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_setup_atm_cycled_exp)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_ens_letkf
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_letkf.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+	         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_ens_init)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_ens_init_split
+                 TYPE SCRIPT                 
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_init_split.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_ens_letkf)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_ens_obs
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_obs.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_ens_init_split)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_ens_sol
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_sol.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_ens_obs)
 
-add_test(NAME test_gdasapp_atm_jjob_ens_inc
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_inc.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
-
-add_test(NAME test_gdasapp_atm_jjob_ens_final
-  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_final.sh
-          ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_ens_inc
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_inc.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_ens_sol)
+
+ecbuild_add_test(TARGET test_gdasapp_atm_jjob_ens_final
+                 TYPE SCRIPT
+                 COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/jjob_ens_final.sh
+                 ARGS ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun
+                 TEST_DEPENDS test_gdasapp_atm_jjob_ens_inc)
 
diff --git a/test/atm/global-workflow/config.yaml b/test/atm/global-workflow/config.yaml
@@ -8,9 +8,11 @@ base:
   DUMPDIR: "@dumpdir@"
   STMP: "@bindir@/test/atm/global-workflow/testrun"
   PTMP: "@bindir@/test/atm/global-workflow/testrun"
+  DO_TEST_MODE: "YES"
 
 atmanl:
   JCB_ALGO_YAML_VAR: "@srcdir@/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2"
+  JCB_ALGO_YAML_FV3INC: "@srcdir@/test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2"  
   STATICB_TYPE: "identity"
   ATMRES_ANL: "C48"
   LAYOUT_X_ATMANL: 1
@@ -20,5 +22,6 @@ atmensanl:
   JCB_ALGO_YAML_LETKF: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2"
   JCB_ALGO_YAML_OBS: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2"
   JCB_ALGO_YAML_SOL: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2"
+  JCB_ALGO_YAML_FV3INC: "@srcdir@/test/atm/global-workflow/jcb-prototype_lgetkf-fv3inc.yaml.j2"  
   LAYOUT_X_ATMENSANL: 1
   LAYOUT_Y_ATMENSANL: 1
diff --git a/test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2 b/test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2
@@ -0,0 +1,13 @@
+# Algorithm
+# ---------
+algorithm: fv3jedi_fv3inc_variational
+
+# Testing things
+# --------------
+{% if DO_TEST_MODE and RUN == 'gdas'  %}
+do_testing: true
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_3dvar-fv3inc.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_3dvar-fv3inc.test.out
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5
+{% endif %}
+1 −1		3dfgat.yaml.j2
+1 −1		3dvar.yaml.j2
+1 −1		local_ensemble_da.yaml.j2
+1 −1		local_ensemble_da_observer.yaml.j2
+1 −1		local_ensemble_da_solver.yaml.j2
+0 −40		algorithm/marine/soca_2cice_arctic.yaml.j2
+14 −11		algorithm/marine/soca_2cice_global.yaml.j2
+13 −25		src/soca/VariableChange/Soca2Cice/Soca2Cice.F90
+4 −2		src/soca/VariableChange/Soca2Cice/Soca2Cice.cc
+65 −0		src/soca/VariableChange/Soca2Cice/Soca2Cice.h
+1 −1		src/soca/VariableChange/Soca2Cice/Soca2CiceFortran.h
+35 −38		src/soca/VariableChange/Soca2Cice/soca_soca2cice_mod.F90
+10 −8		test/testinput/convertstate_soca2cice.yml