Merge branch 'NOAA-EMC:develop' into feature/phase2_msonet

.gitignore

@@ -154,6 +154,7 @@ install*/
 !/bundle/ioda-data
 !/bundle/fv3-jedi-data
 !/bundle/mpas-jedi-data
+!/bundle/fix
 
 # 
 expr

bundle/fix

@@ -0,0 +1 @@
+../fix/crtm/fix_REL-3.1.1.2/fix

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")
@@ -117,4 +116,35 @@ if(FV3_DYCORE)
           set(MPI_ARGS ${RESTORE_MPI_ARGS})
       endif()
 
+      ########################
+      ### Bufr2ioda ctests ###
+      ########################
+
+      # YAML-based bufr2ioda
+      set(case "rrfs_bufr2ioda_msonet")
+      set(casedir "${CMAKE_CURRENT_BINARY_DIR}/rundir-${case}")
+      set(src_casedir "${rrfs-test_data_local}/rrfs-data_mpasjedi_2024052700")
+      if (NOT EXISTS "${casedir}")
+         file(MAKE_DIRECTORY ${casedir})
+      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(MPI_ARGS "--time=00:05:00 --mem=64G")
+      set(IODA_CONV_COMP_TOL "5.0e-4")
+      ecbuild_add_test( TARGET  ${case}
+	                MPI     1
+                        TYPE    SCRIPT
+                        COMMAND bash
+          		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${case}
+           		ARGS    ${CMAKE_SOURCE_DIR}/rrfs-test/ush/iodaconv_comp_rrfs.sh
+                                netcdf
+                                "${CMAKE_BINARY_DIR}/bin/bufr2ioda.x ${case}.yaml"
+                                data/obs/ioda_mesonet.nc
+                                ioda_mesonet.nc 
+			        ${IODA_CONV_COMP_TOL}
+                        DEPENDS bufr2ioda.x )
+
+
 endif()
+