Skip to content

Commit a6a6c23

Browse files
committed
Merge 'origin/jayeshkrishna/homme/add_pnetcdf_for_standalone_bfbtests' (PR #6561)
Adding support for the PnetCDF library in HOMME for the BFB tests on Anvil and Chrysalis. Also see related PR #6552 [BFB]
2 parents 5944263 + 455ac56 commit a6a6c23

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

components/homme/cmake/machineFiles/anvil-bfb.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@ ENDIF()
2020
# Set kokkos arch, to get correct avx flags
2121
SET (Kokkos_ARCH_BDW ON CACHE BOOL "")
2222

23-
SET (WITH_PNETCDF FALSE CACHE FILEPATH "")
23+
EXECUTE_PROCESS(COMMAND pnetcdf-config --prefix
24+
RESULT_VARIABLE PNCCONFIG_RESULT
25+
OUTPUT_VARIABLE PNCCONFIG_OUTPUT
26+
ERROR_VARIABLE PNCCONFIG_ERROR
27+
OUTPUT_STRIP_TRAILING_WHITESPACE
28+
)
29+
SET (PnetCDF_PATH "${PNCCONFIG_OUTPUT}" CACHE STRING "")
30+
2431
#
2532
# anvil module system doesn't set environment variables, but will put
2633
# nc-config in our path. anvil seperates C and Fortran libraries,

components/homme/cmake/machineFiles/chrysalis-bfb.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ SET (USE_MPI_OPTIONS "-K --cpu_bind=cores" CACHE STRING "")
2020
# Set kokkos arch, to get correct avx flags
2121
SET (Kokkos_ARCH_ZEN2 ON CACHE BOOL "")
2222

23-
SET (WITH_PNETCDF FALSE CACHE FILEPATH "")
23+
EXECUTE_PROCESS(COMMAND pnetcdf-config --prefix
24+
RESULT_VARIABLE PNCCONFIG_RESULT
25+
OUTPUT_VARIABLE PNCCONFIG_OUTPUT
26+
ERROR_VARIABLE PNCCONFIG_ERROR
27+
OUTPUT_STRIP_TRAILING_WHITESPACE
28+
)
29+
SET (PnetCDF_PATH "${PNCCONFIG_OUTPUT}" CACHE STRING "")
2430

2531
EXECUTE_PROCESS(COMMAND nf-config --prefix
2632
RESULT_VARIABLE NFCONFIG_RESULT

0 commit comments

Comments
 (0)