Fix some things with Ascent (Exawind#631)

stephan-rohr · Jun 9, 2022 · 8dea2fb · 8dea2fb
1 parent 3a6a8e3
commit 8dea2fb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -158,6 +158,7 @@ endif()
 if(AMR_WIND_ENABLE_ASCENT)
   set(CMAKE_PREFIX_PATH ${ASCENT_DIR} ${CMAKE_PREFIX_PATH})
   find_package(Ascent REQUIRED)
+  find_package(OpenMP REQUIRED)
   if(AMR_WIND_ENABLE_MPI)
     target_link_libraries(${amr_wind_lib_name} PUBLIC ascent::ascent_mpi)
   else()

diff --git a/amr-wind/utilities/console_io.cpp b/amr-wind/utilities/console_io.cpp
@@ -18,6 +18,7 @@
 #endif
 #ifdef AMR_WIND_USE_ASCENT
 #include "ascent_config.h"
+#include <omp.h>
 #endif
 
 namespace amrex {

diff --git a/cmake/set_amrex_options.cmake b/cmake/set_amrex_options.cmake
@@ -4,11 +4,11 @@ set(AMReX_SPACEDIM 3)
 set(AMReX_AMRDATA OFF)
 set(AMReX_AMRLEVEL OFF)
 set(AMReX_ASSERTIONS OFF)
-set(AMReX_ASCENT OFF)
+set(AMReX_ASCENT ${AMR_WIND_ENABLE_ASCENT})
 set(AMReX_BACKTRACE OFF)
 set(AMReX_BASE_PROFILE OFF)
 set(AMReX_COMM_PROFILE OFF)
-set(AMReX_CONDUIT OFF)
+set(AMReX_CONDUIT ${AMR_WIND_ENABLE_ASCENT})
 set(AMReX_PRECISION DOUBLE)
 set(AMReX_EB OFF)
 set(AMReX_FORTRAN OFF)
@@ -39,10 +39,3 @@ elseif(AMR_WIND_ENABLE_DPCPP)
 else()
   set(AMReX_GPU_BACKEND NONE CACHE STRING "AMReX GPU type" FORCE)
 endif()
-
-if (AMR_WIND_ENABLE_ASCENT)
-  set(AMReX_ASCENT ON)
-  set(AMReX_CONDUIT ON)
-else()
-  set(AMReX_CONDUIT OFF)
-endif()