Clean up some of CMake and increase parallel runs of ctest from 6 to 7

rrfs-test/CMakeLists.txt

@@ -62,10 +62,9 @@ if(FV3_DYCORE)
           set(MPI_ARGS ${RESTORE_MPI_ARGS})
       endif()
 
+endif()
 
-   endif()
-
-   if(MPAS_DYCORE)
+if(MPAS_DYCORE)
 
       message(STATUS "MACHINE_ID is " ${MACHINE_ID})
       if("${MACHINE_ID}" STREQUAL "orion")
@@ -120,7 +119,11 @@ if(FV3_DYCORE)
 endif()
 
 
-# bufr2ioda ctests 
+########################
+### Bufr2ioda ctests ###
+########################
+
+# YAML-based bufr2ioda
 set(case "rrfs_bufr2ioda_msonet")
 set(casedir "${CMAKE_CURRENT_BINARY_DIR}/rundir-${case}")
 if (NOT EXISTS "${casedir}")
@@ -129,8 +132,8 @@ endif()
 file(CREATE_LINK ${src_casedir}/data ${casedir}/data SYMBOLIC)
 configure_file(${src_casedir}/data/obs/bufr/rap.t00z.prepbufr.tm00 ${casedir}/prepbufr COPYONLY)
 file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir})
-set(IODA_CONV_COMP_TOL "5.0e-4")
 set(MPI_ARGS "--time=00:05:00 --exclusive")
+set(IODA_CONV_COMP_TOL "5.0e-4")
 ecbuild_add_test( TARGET  ${case}
 	          MPI     1
                   TYPE    SCRIPT
@@ -139,7 +142,8 @@ ecbuild_add_test( TARGET  ${case}
 		  ARGS    ${CMAKE_SOURCE_DIR}/rrfs-test/ush/iodaconv_comp_rrfs.sh
                           netcdf
                           "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x ${case}.yaml"
-                          data/obs/bufr2ioda_ctest/ioda_mesonet.nc 
+                          data/obs/ioda_mesonet.nc
                           ioda_mesonet.nc 
 			  ${IODA_CONV_COMP_TOL}
                   DEPENDS bufr2ioda.x )
+

ush/run_rrfs_tests.sh

@@ -14,5 +14,5 @@ source ${ushdir}/load_rdas.sh
 set -x
 cd ${ushdir}/../build/rrfs-test
 pwd
-ctest -j6 # or ctest -VV for verbose outputs
+ctest -j7 # or ctest -VV for verbose outputs
 exit $?