Add more CI to GW-CI (#1365)

This PR is a companion to GW PR
[#3120](NOAA-EMC/global-workflow#3120).

It does a couple things:

1. 5 GW CI tests are added/extended as CTests in GDASApp, running
through to the fcst jobs in the first full-cycle. These CI tests are:
```C96C48_hybatmDA```, ```C96C48_ufs_hybatmDA```,
```C96C48_hybatmaerosnowDA```, ```C48mx500_3DVarAOWCDA```, and
```C48mx500_hybAOWCDA```.
2. Test references are added for ```C96C48_ufs_hybatmDA``` and
```C48mx500_3DVarAOWCDA```, so that we're actually testing the output.
3. These CTests are turned on by default in a workflow build, rather
than having to mess with the ```CMakeCache.txt``` file and re-running
make. This will allow us to use these tests in nightly testing.
4. ```test/gw-ci/CMakeLists.txt``` is refactored quite a bit.
5. There are 89 CTests, but for 5 CI tests, but I added task
dependencies, so they can be run in parallel.

The primary motivation for this PR is that we can run CI for our nightly
testing of GDASApp. Also, anyone with a PR can easily do CI testing
through CTests.

---------

Co-authored-by: Russ-Treadon-NOAA <[email protected]>

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

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

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

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

parm/atm/jcb-base.yaml.j2

@@ -27,6 +27,11 @@ final_prints_frequency: PT3H
 number_of_outer_loops: 2
 analysis_variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
 
+# Testing
+# -------
+
+do_testing: {{ DO_TEST_MODE | default(false, true) }}
+
 # Model things
 # ------------
 # Geometry

parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2

@@ -0,0 +1,10 @@
+# Algorithm
+# ---------
+algorithm: fv3jedi_fv3inc_variational
+
+# Testing things
+# --------------
+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

parm/atm/jcb-prototype_3dvar.yaml.j2

@@ -30,3 +30,10 @@ observations:
 #  - scatwind_ascat_metop-a
 #  - snowcvr
 #  - abi_g16
+
+# Testing things
+# --------------
+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

parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2

@@ -0,0 +1,10 @@
+# Algorithm
+# ---------
+algorithm: fv3jedi_fv3inc_lgetkf
+
+# Testing things
+# --------------
+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

parm/atm/jcb-prototype_lgetkf.yaml.j2

@@ -38,3 +38,10 @@ observations:
   - satwnd.viirs_npp
 #  - scatwind_ascat_metop-a
 #  - snowcvr
+
+# Testing things
+# --------------
+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

parm/atm/jcb-prototype_lgetkf_observer.yaml.j2

@@ -44,3 +44,10 @@ atmosphere_obsdataout_prefix: diag_lobs_
 
 # Distribution type
 distribution_type: RoundRobin
+
+# Testing things
+# --------------
+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

parm/atm/jcb-prototype_lgetkf_solver.yaml.j2

@@ -47,3 +47,10 @@ atmosphere_obsdataout_prefix: diag_solv_
 
 # Distribution type
 distribution_type: Halo
+
+# Testing things
+# --------------
+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

parm/soca/marine-jcb-3dfgat.yaml.j2

@@ -3,3 +3,10 @@ algorithm: 3dfgat
 
 # Observations
 observations: !INC ${OBS_LIST_SHORT}
+
+# Testing things
+# --------------
+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

parm/soca/marine-jcb-base.yaml

@@ -26,6 +26,10 @@ 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]
 
+# Testing
+# -------
+
+do_testing: '{{ DO_TEST_MODE | default(false, true) }}'
 
 # Model things
 # ------------

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()

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)
 

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

test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2

@@ -0,0 +1,10 @@
+# Algorithm
+# ---------
+algorithm: fv3jedi_fv3inc_variational
+
+# Testing things
+# --------------
+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

test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2

@@ -17,7 +17,7 @@ atmosphere_obsdatain_suffix: ".{{ current_cycle | to_YMDH }}.nc"
 
 # Testing things
 # --------------
-test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/atm/global-workflow/3dvar.ref
-test_output_filename: ./3dvar.out
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_3dvar.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_3dvar.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5

test/atm/global-workflow/jcb-prototype_lgetkf-fv3inc.yaml.j2

@@ -0,0 +1,10 @@
+# Algorithm
+# ---------
+algorithm: fv3jedi_fv3inc_lgetkf
+
+# Testing things
+# --------------
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf-fv3inc.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf-fv3inc.test.out
+test_float_relative_tolerance: 1.0e-3
+test_float_absolute_tolerance: 1.0e-5

test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2

@@ -22,7 +22,7 @@ atmosphere_obsdatain_suffix: ".{{ current_cycle | to_YMDH }}.nc"
 
 # Testing things
 # --------------
-test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/atm/global-workflow/lgetkf.ref
-test_output_filename: ./lgetkf.out
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5

test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2

@@ -28,7 +28,7 @@ distribution_type: RoundRobin
 
 # Testing things
 # --------------
-test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/atm/global-workflow/lgetkf_observer.ref
-test_output_filename: ./lgetkf_observer.out
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf_observer.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf_observer.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5

test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2

@@ -28,7 +28,7 @@ distribution_type: Halo
 
 # Testing things
 # --------------
-test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/atm/global-workflow/lgetkf_solver.ref
-test_output_filename: ./lgetkf_solver.out
+test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf_solver.ref
+test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf_solver.test.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5