Update ctests to include more obs types for more realistic testing (#184

)

This PR addresses #178 by updating the mpas-jedi ctests in RDASApp to
now use a larger set of observations for more realistic testing. The
yaml files for these new ctests are generated from the individual yamls
added by other developers into

fix/expr_data/mpas_2024052700/obs_ctest

@@ -0,0 +1 @@
+../../.agent/expr_data/mpas_2024052700/obs_ctest

rrfs-test/CMakeLists.txt

@@ -14,8 +14,6 @@ add_to_dictionary(rrfs_fv3jedi_tests "rrfs_fv3jedi_letkf_2022052619"   "fv3jedi_
 # MPAS-JEDI tests 
 set(rrfs_mpasjedi_tests)
 add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2024052700_Ens3Dvar"       "mpasjedi_variational.x")
-add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2024052700_letkf"          "mpasjedi_enkf.x")
-add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2024052700_getkf"          "mpasjedi_enkf.x")
 add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2024052700_getkf_observer" "mpasjedi_enkf.x")
 add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2024052700_getkf_solver"   "mpasjedi_enkf.x")
 add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2024052700_bumploc"        "mpasjedi_error_covariance_toolbox.x")
@@ -76,6 +74,7 @@ if(FV3_DYCORE)
          set(MPI_ARGS "${MPI_ARGS} --exclusive")
       endif()   
       set(MPI_ARGS "${MPI_ARGS} --ntasks-per-node=4")
+      set(MPI_ARGS "${MPI_ARGS} --time=00:30:00")
 
       get_all_keys(rrfs_mpasjedi_tests caselist)
       foreach(case ${caselist})

rrfs-test/scripts/link_mpasjedi_expr.sh

@@ -27,14 +27,14 @@ cp -rp ${RDASApp}/fix/stream_list/* stream_list/
 cp ${RDASApp}/sorc/mpas-jedi/test/testinput/obsop_name_map.yaml .
 cp ${RDASApp}/sorc/mpas-jedi/test/testinput/namelists/keptvars.yaml .
 cp ${RDASApp}/sorc/mpas-jedi/test/testinput/namelists/geovars.yaml .
-cp ${RDASApp}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_bumploc.yaml ./bumploc.yaml
-cp ${RDASApp}/rrfs-test/testinput/namelist.atmosphere .
-cp ${RDASApp}/rrfs-test/testinput/streams.atmosphere .
-cp ${RDASApp}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml .
-cp ${RDASApp}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_letkf.yaml .
-cp ${RDASApp}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf.yaml .
-cp ${RDASApp}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_observer.yaml .
-cp ${RDASApp}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf_solver.yaml .
+cp ${RDASApp}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_bumploc.yaml ./bumploc.yaml
+cp ${RDASApp}/rrfs-test/testinput_expr/namelist.atmosphere .
+cp ${RDASApp}/rrfs-test/testinput_expr/streams.atmosphere .
+cp ${RDASApp}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml .
+cp ${RDASApp}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml .
+cp ${RDASApp}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml .
+cp ${RDASApp}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_observer.yaml .
+cp ${RDASApp}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf_solver.yaml .
 if [[ "${exprname}" == "atl_2024052700" ]]; then
   sed -i -e "s/conus12km_mpas.graph/atl12km.graph/" ./namelist.atmosphere
   sed -i -e "s/conus12km-401km11levels/atl12km-401km11levels/" ./rrfs_mpasjedi_2024052700_Ens3Dvar.yaml
@@ -48,11 +48,12 @@ cp ${RDASApp}/rrfs-test/ush/mpasjedi_spread.py .
 
 mkdir -p data
 cd data
-mkdir -p bumploc bkg obs ens
+mkdir -p bumploc bkg obs obs_ctest ens
 ln -snf ${RDASApp}/fix/bumploc/${BUMPLOC} bumploc/${BUMPLOC}
 ln -snf ${RDASApp}/fix/expr_data/${exprname}/bkg/restart.2024-05-27_00.00.00.nc .
 ln -snf ${RDASApp}/fix/expr_data/${exprname}/bkg/restart.2024-05-27_00.00.00.nc static.nc
 ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs/* obs/
+ln -snf ${RDASApp}/fix/expr_data/${exprname}/obs_ctest/* obs_ctest/
 ln -snf ${RDASApp}/fix/expr_data/${exprname}/ens/* ens/
 ln -snf ${RDASApp}/fix/crtm/2.4.0 crtm
 

rrfs-test/scripts/setup_experiment.sh

@@ -86,12 +86,12 @@ elif [[ $DYCORE == "MPAS" ]]; then
   mkdir -p graphinfo stream_list
   ln -sf ${RDAS_DATA}/fix/graphinfo/* graphinfo/
   cp -rp ${RDAS_DATA}/fix/stream_list/* stream_list/
-  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/bumploc.yaml .
-  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/namelist.atmosphere .
-  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml .
-  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_letkf.yaml .
-  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/rrfs_mpasjedi_2024052700_getkf.yaml .
-  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput/streams.atmosphere .
+  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput_expr/bumploc.yaml .
+  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput_expr/namelist.atmosphere .
+  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_Ens3Dvar.yaml .
+  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_letkf.yaml .
+  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput_expr/rrfs_mpasjedi_2024052700_getkf.yaml .
+  cp ${YOUR_PATH_TO_RDASAPP}/rrfs-test/testinput_expr/streams.atmosphere .
   cp ${YOUR_PATH_TO_RDASAPP}/sorc/mpas-jedi/test/testinput/obsop_name_map.yaml .
   cp ${YOUR_PATH_TO_RDASAPP}/sorc/mpas-jedi/test/testinput/namelists/keptvars.yaml .
   cp ${YOUR_PATH_TO_RDASAPP}/sorc/mpas-jedi/test/testinput/namelists/geovars.yaml .
@@ -135,7 +135,7 @@ fi
 
 # Copy rrts-test yamls and obs files.
 #mkdir -p testinput
-#cp -p $YOUR_PATH_TO_RDASAPP/rrfs-test/testinput/* testinput/.
+#cp -p $YOUR_PATH_TO_RDASAPP/rrfs-test/testinput_expr/* testinput/.
 #cp -p $YOUR_PATH_TO_RDASAPP/rrfs-test/obs/* Data/obs/.
 
 # Copy GSI test data