Skip to content

Commit

Permalink
EAMxx: reorg query-cf-database utility
Browse files Browse the repository at this point in the history
* Moved to its own folder
* Do not add scripts subdir when building EAMxx
* Move data/*yaml in query-cf-database folder
  • Loading branch information
bartgol committed Dec 19, 2024
1 parent aecc186 commit cd6a6b9
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 7 deletions.
3 changes: 0 additions & 3 deletions components/eamxx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -584,9 +584,6 @@ if (NOT DEFINED ENV{SCREAM_FAKE_ONLY})
${CMAKE_CURRENT_BINARY_DIR}/src/scream_config.h
F90_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/scream_config.f)

# Build any tools in the scripts/ dir.
add_subdirectory(scripts)

# Generate scream_config.h and scream_config.f
include (EkatUtils)
EkatConfigFile(${CMAKE_CURRENT_SOURCE_DIR}/src/scream_config.h.in
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ This tool is not used in our core testing tools and goes through long periods of
(IE there are no active ongoing porting efforts). It is likely this tool will not work exactly as expected if it
has not been run in a while or is being used on a package on which it has not been used before.

## cf-xml-to-yaml
## query-cf-database/cf-xml-to-yaml

Given an XML file containing the CF conventions for standardized field names
(https://cfconventions.org/standard-names.html), this tool generates a YAML

Check failure on line 86 in components/eamxx/scripts/README.md

View workflow job for this annotation

GitHub Actions / linter

Bare URL used

components/eamxx/scripts/README.md:86:2 MD034/no-bare-urls Bare URL used [Context: "https://cfconventions.org/stan..."] https://github.com/DavidAnson/markdownlint/blob/v0.36.1/doc/md034.md
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Generate the source file for the CF validator and build it.
# Build the CF validator tool

set (CF_STANDARD_NAME_FILE "${PROJECT_SOURCE_DIR}/data/cf-standard-name-table.yaml"
set (CF_STANDARD_NAME_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cf-standard-name-table.yaml"
CACHE STRING "Location of the cf standard name yaml table")
set (CF_SCREAM_NAME_FILE "${PROJECT_SOURCE_DIR}/data/cf-scream-name-table.yaml"
set (CF_SCREAM_NAME_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cf-scream-name-table.yaml"
CACHE STRING "Location of the scream-specific cf name yaml table")

add_executable(query-cf-database query-cf-database.cpp)
target_compile_definitions(query-cf-database PUBLIC
CF_STANDARD_NAME_FILE=${CF_STANDARD_NAME_FILE}
CF_SCREAM_NAME_FILE=${CF_SCREAM_NAME_FILE})

find_package (ekat HINTS ${EKAT_ROOT})
find_package (yaml-cpp HINTS ${YAML_CPP_ROOT})
target_link_libraries(query-cf-database ekat yaml-cpp)
File renamed without changes.

0 comments on commit cd6a6b9

Please sign in to comment.