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 rrfs-test/CMakeLists.txt to be more compact for adding a CTest #81

Merged
merged 7 commits into from
Jun 18, 2024
Merged

Update rrfs-test/CMakeLists.txt to be more compact for adding a CTest #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84763fc
Reorganize rrfs-test/CMakeLists.txt to make it easier to add a ctest
SamuelDegelia-NOAA Jun 14, 2024
b339989
Split the dictionary functions into separate cmake file
SamuelDegelia-NOAA Jun 14, 2024
1fee81f
Renamed function file
SamuelDegelia-NOAA Jun 14, 2024
d8c9b5d
Added back in funcs.cmake file
SamuelDegelia-NOAA Jun 14, 2024
964d679
Removed match if-block
SamuelDegelia-NOAA Jun 14, 2024
1882918
Using new get_all_keys function instead of regex
SamuelDegelia-NOAA Jun 15, 2024
c68223f
Fixed a typo
SamuelDegelia-NOAA Jun 15, 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
61 changes: 22 additions & 39 deletions rrfs-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@
#! NOAA/NCEP, National Centers for Environmental Prediction RDASapp !
#!-------------------------------------------------------------------------

include(funcs.cmake)

### Define CTests here ###

# FV3-JEDI tests
set(rrfs_fv3jedi_tests)
add_to_dictionary(rrfs_fv3jedi_tests "rrfs_fv3jedi_hyb_2022052619" "fv3jedi_var.x")
add_to_dictionary(rrfs_fv3jedi_tests "rrfs_fv3jedi_letkf_2022052619" "fv3jedi_letkf.x")

# MPAS-JEDI tests
set(rrfs_mpasjedi_tests)
add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2022052619_Ens3Dvar" "mpasjedi_variational.x")
add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2022052619_atms_npp_qc" "mpasjedi_variational.x")
add_to_dictionary(rrfs_mpasjedi_tests "rrfs_mpasjedi_2022052619_letkf" "mpasjedi_enkf.x")


# rrfs data - from rrfs-test-data repo if found, from local directory, or from tarball
if (CLONE_RRFSDATA)
message(STATUS "Use test data from rrfs-test-data repository")
Expand All @@ -22,22 +38,9 @@ if (CLONE_RRFSDATA)
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()

# JEDI test cases
# ----------------
# NOTE: To add a new ctest for FV3, simple add the new yaml file here (without the extension)
# Also need to add the associated executable to the rrfs_fv3jedi_exes list below
list( APPEND rrfs_fv3jedi_tests
guoqing-noaa marked this conversation as resolved.
Show resolved Hide resolved
rrfs_fv3jedi_hyb_2022052619
rrfs_fv3jedi_letkf_2022052619
)

# JEDI executables for each test case above
list ( APPEND rrfs_fv3jedi_exes
fv3jedi_var.x
fv3jedi_letkf.x
)

foreach(case IN LISTS rrfs_fv3jedi_tests)
get_all_keys(rrfs_fv3jedi_tests caselist)
foreach(case ${caselist})
get_from_dictionary(rrfs_fv3jedi_tests case exe)
set(casedir "${CMAKE_CURRENT_BINARY_DIR}/rundir-${case}")
set(src_casedir "${rrfs-test_data_local}/rrfs-data_fv3jedi_2022052619")
if (NOT EXISTS "${casedir}")
Expand All @@ -49,8 +52,6 @@ if (CLONE_RRFSDATA)
file(CREATE_LINK ${src_casedir}/Data ${casedir}/Data SYMBOLIC)
file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir} )
set(target_test ${case})
list(FIND rrfs_fv3jedi_tests "${case}" index)
list(GET rrfs_fv3jedi_exes ${index} exe)
ecbuild_add_test( TARGET ${target_test}
MPI 80
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
Expand All @@ -73,25 +74,9 @@ if (CLONE_RRFSDATA)
set(MPI_ARGS "${MPI_ARGS} --exclusive")
endif()

# JEDI test cases
# ----------------
# NOTE: To add a new ctest for MPAS, simple add the new yaml file here (without the extension)
# Also need to add the associated executable to the rrfs_fv3jedi_exes list below
list( APPEND rrfs_mpasjedi_tests
rrfs_mpasjedi_2022052619_Ens3Dvar
rrfs_mpasjedi_2022052619_letkf
rrfs_mpasjedi_2022052619_atms_npp_qc
)

# JEDI executables for each test case above
list ( APPEND rrfs_mpasjedi_exes
mpasjedi_variational.x
mpasjedi_enkf.x
mpasjedi_variational.x
)

foreach(case IN LISTS rrfs_mpasjedi_tests)

get_all_keys(rrfs_mpasjedi_tests caselist)
foreach(case ${caselist})
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_2022052619")
if (NOT EXISTS "${casedir}")
Expand All @@ -111,8 +96,6 @@ if (CLONE_RRFSDATA)
file(COPY ${DATA_FILES} DESTINATION ${casedir})
file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir} )
set(target_test ${case})
list(FIND rrfs_mpasjedi_tests "${case}" index)
list(GET rrfs_mpasjedi_exes ${index} exe)
ecbuild_add_test( TARGET ${target_test}
MPI 36
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rundir-${target_test}
Expand Down
56 changes: 56 additions & 0 deletions rrfs-test/funcs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Function to add key-value pairs to the dictionary
function(add_to_dictionary dict key value)
# Check if the key already exists
foreach(entry IN LISTS ${dict})
string(FIND "${entry}" "=" EQUAL_POS)
if(EQUAL_POS GREATER -1)
string(SUBSTRING "${entry}" 0 ${EQUAL_POS} ENTRY_KEY)
if(ENTRY_KEY STREQUAL ${key})
# Key exists, check the value
math(EXPR VALUE_START "${EQUAL_POS} + 1")
string(SUBSTRING "${entry}" ${VALUE_START} -1 ENTRY_VALUE)
if(NOT ENTRY_VALUE STREQUAL ${value})
message(FATAL_ERROR "Error: Key '${key}' already exists with a different value '${ENTRY_VALUE}'")
else()
return()
endif()
endif()
endif()
endforeach()

# Key does not exist, add the new entry
set(entry "${key}=${value}")
list(APPEND ${dict} "${entry}")
set(${dict} "${${dict}}" PARENT_SCOPE)
endfunction()

# Function to get the value by key from the dictionary
function(get_from_dictionary dict key result)
foreach(entry IN LISTS ${dict})
string(FIND "${entry}" "=" EQUAL_POS)
if(EQUAL_POS GREATER -1)
string(SUBSTRING "${entry}" 0 ${EQUAL_POS} ENTRY_KEY)
if(ENTRY_KEY STREQUAL ${key})
math(EXPR VALUE_START "${EQUAL_POS} + 1")
string(SUBSTRING "${entry}" ${VALUE_START} -1 ENTRY_VALUE)
set(${result} "${ENTRY_VALUE}" PARENT_SCOPE)
return()
endif()
endif()
endforeach()
# If the key is not found, set the result to an empty string or some default value
set(${result} "" PARENT_SCOPE)
endfunction()

# Function to retrieve keys from a dict
function(get_all_keys dict result)
set(keys "")
foreach(entry IN LISTS ${dict})
string(FIND "${entry}" "=" EQUAL_POS)
if(EQUAL_POS GREATER -1)
string(SUBSTRING "${entry}" 0 ${EQUAL_POS} ENTRY_KEY)
list(APPEND keys "${ENTRY_KEY}")
endif()
endforeach()
set(${result} "${keys}" PARENT_SCOPE)
endfunction()
Loading