From 32ca9b5ede32137b629d0dd7669e0f2ce20bbf30 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 10 Jun 2024 15:49:14 -0400 Subject: [PATCH] Removed coarray fortran stuff from the cmake script, as it is a leftover from the Swiftest project --- CMakeLists.txt | 1 - cmake/Modules/SetParallelizationLibrary.cmake | 15 +++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea1ab76f..f6cd01ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ ELSE () ENDIF () # Set some options the user may choose -OPTION(USE_COARRAY "Use Coarray Fortran for parallelization of test particles" OFF) OPTION(USE_OPENMP "Use OpenMP for parallelization" ON) OPTION(USE_SIMD "Use SIMD vectorization" ON) OPTION(BUILD_SHARED_LIBS "Build using shared libraries" ON) diff --git a/cmake/Modules/SetParallelizationLibrary.cmake b/cmake/Modules/SetParallelizationLibrary.cmake index 505a77d6..71a382a9 100644 --- a/cmake/Modules/SetParallelizationLibrary.cmake +++ b/cmake/Modules/SetParallelizationLibrary.cmake @@ -17,20 +17,11 @@ IF (USE_OPENMP) ENDIF (NOT OpenMP_Fortran_FLAGS) ENDIF (USE_OPENMP) -IF (USE_COARRAY) - IF (NOT Coarray_Fortran_FLAGS) - FIND_PACKAGE (Coarray_Fortran) - IF (NOT Coarray_Fortran_FLAGS) - MESSAGE (FATAL_ERROR "Fortran compiler does not support Coarrays") - ENDIF (NOT Coarray_Fortran_FLAGS) - ENDIF (NOT Coarray_Fortran_FLAGS) -ENDIF (USE_COARRAY) -IF (NOT USE_OPENMP AND NOT USE_COARRAY) - # Turn off both OpenMP and CAF +IF (NOT USE_OPENMP) + # Turn off OpenMP SET (OMP_NUM_PROCS 0 CACHE STRING "Number of processors OpenMP may use" FORCE) UNSET (OpenMP_Fortran_FLAGS CACHE) - UNSET (Coarray_Fortran_FLAGS CACHE) UNSET (GOMP_Fortran_LINK_FLAGS CACHE) -ENDIF (NOT USE_OPENMP AND NOT USE_COARRAY) +ENDIF ()