Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OOPS and use reduce obs space filter action for pre-filters #209

Closed
wants to merge 4 commits into from
Closed

Update OOPS and use reduce obs space filter action for pre-filters #209

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3417600
Oops oops and use reduce obs space filter action
SamuelDegelia-NOAA Oct 23, 2024
66c8e66
Merge branch 'develop' into feature/update_oops
SamuelDegelia-NOAA Oct 23, 2024
72efe9f
fix spaces from merging conflict
SamuelDegelia-NOAA Oct 23, 2024
62bfc29
Merge branch 'develop' into feature/update_oops
SamuelDegelia-NOAA Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 44 additions & 50 deletions rrfs-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ set (src_yaml "${CMAKE_SOURCE_DIR}/rrfs-test/testinput")
if(FV3_DYCORE)

message(STATUS "MACHINE_ID is " ${MACHINE_ID})
if("${MACHINE_ID}" STREQUAL "orion")
message(STATUS "Because MACHINE_ID is orion, adding exclusive MPI option" )
set(RESTORE_MPI_ARGS ${MPI_ARGS})
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()
set(RESTORE_MPI_ARGS ${MPI_ARGS})

get_all_keys(rrfs_fv3jedi_tests caselist)
foreach(case ${caselist})
Expand All @@ -51,71 +47,69 @@ if(FV3_DYCORE)
file(CREATE_LINK ${CMAKE_SOURCE_DIR}/rrfs-test/testoutput ${casedir}/testoutput SYMBOLIC)
file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir} )
set(target_test ${case})
if("${MACHINE_ID}" STREQUAL "orion")
message(STATUS "Because MACHINE_ID is orion, adding exclusive MPI option" )
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()
ecbuild_add_test( TARGET ${target_test}
MPI 80
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
ARGS ${target_test}.yaml
COMMAND ${exe} )
endforeach()

if("${MACHINE_ID}" STREQUAL "orion")
set(MPI_ARGS ${RESTORE_MPI_ARGS})
endif()
endforeach()

endif()

if(MPAS_DYCORE)

message(STATUS "MACHINE_ID is " ${MACHINE_ID})
if("${MACHINE_ID}" STREQUAL "orion")
message(STATUS "Because MACHINE_ID is orion, adding exclusive MPI option" )
set(RESTORE_MPI_ARGS ${MPI_ARGS})
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")
set(RESTORE_MPI_ARGS ${MPI_ARGS})

get_all_keys(rrfs_mpasjedi_tests caselist)
foreach(case ${caselist})
get_from_dictionary(rrfs_mpasjedi_tests case exe)
get_from_dictionary(rrfs_mpasjedi_tests case exe)
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)
file(CREATE_LINK ${src_casedir}/graphinfo ${casedir}/graphinfo SYMBOLIC)
file(CREATE_LINK ${src_casedir}/stream_list ${casedir}/stream_list SYMBOLIC)
file(CREATE_LINK ${CMAKE_SOURCE_DIR}/rrfs-test/testoutput ${casedir}/testoutput SYMBOLIC)
file(COPY ${src_casedir}/streams.atmosphere DESTINATION ${casedir})
file(COPY ${src_casedir}/namelist.atmosphere DESTINATION ${casedir})
file(COPY ${src_casedir}/geovars.yaml DESTINATION ${casedir})
file(COPY ${src_casedir}/keptvars.yaml DESTINATION ${casedir})
file(COPY ${src_casedir}/obsop_name_map.yaml DESTINATION ${casedir})
file(GLOB bl_FILES "${src_casedir}/*.*BL")
file(COPY ${bl_FILES} DESTINATION ${casedir})
file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir})
file(CREATE_LINK ${src_casedir}/data ${casedir}/data SYMBOLIC)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we get extra indentations from the latest commit. Are these changes expected?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah not sure what happened there. I used Github to do the merge conflicts and it added some weird spacing. Just fixed it, I think.

file(CREATE_LINK ${src_casedir}/graphinfo ${casedir}/graphinfo SYMBOLIC)
file(CREATE_LINK ${src_casedir}/stream_list ${casedir}/stream_list SYMBOLIC)
file(CREATE_LINK ${CMAKE_SOURCE_DIR}/rrfs-test/testoutput ${casedir}/testoutput SYMBOLIC)
file(COPY ${src_casedir}/streams.atmosphere DESTINATION ${casedir})
file(COPY ${src_casedir}/namelist.atmosphere DESTINATION ${casedir})
file(COPY ${src_casedir}/geovars.yaml DESTINATION ${casedir})
file(COPY ${src_casedir}/keptvars.yaml DESTINATION ${casedir})
file(COPY ${src_casedir}/obsop_name_map.yaml DESTINATION ${casedir})
file(GLOB bl_FILES "${src_casedir}/*.*BL")
file(COPY ${bl_FILES} DESTINATION ${casedir})
file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir})
set(target_test ${case})
if ("${target_test}" STREQUAL "rrfs_mpasjedi_2024052700_getkf_solver")
if("${MACHINE_ID}" STREQUAL "orion")
message(STATUS "Because MACHINE_ID is orion, adding exclusive MPI option" )
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()
if ("${target_test}" STREQUAL "rrfs_mpasjedi_2024052700_getkf_solver")
set(MPI_ARGS "${MPI_ARGS} --time=00:15:00 --ntasks-per-node=4")
ecbuild_add_test( TARGET ${target_test}
MPI 120
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
ARGS ${target_test}.yaml
TEST_DEPENDS "rrfs_mpasjedi_2024052700_getkf_observer"
TEST_DEPENDS "rrfs_mpasjedi_2024052700_getkf_observer"
COMMAND ${exe} )
else()
else()
set(MPI_ARGS "${MPI_ARGS} --time=00:10:00 --ntasks-per-node=4")
ecbuild_add_test( TARGET ${target_test}
MPI 120
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
ARGS ${target_test}.yaml
COMMAND ${exe} )
endif()
endif()
set(MPI_ARGS ${RESTORE_MPI_ARGS})
endforeach()

if("${MACHINE_ID}" STREQUAL "orion")
set(MPI_ARGS ${RESTORE_MPI_ARGS})
endif()

########################
### Bufr2ioda ctests ###
########################
Expand All @@ -134,17 +128,17 @@ if(MPAS_DYCORE)
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 )

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 )
set(MPI_ARGS ${RESTORE_MPI_ARGS})

endif()

Loading
Loading