OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

disable flow_alugrid in buildsystem if dune-alugrid was not found

Browse Source
This commit is contained in:
Arne Morten Kvarving 2022-11-15 13:52:02 +01:00
parent d15c2607f5
commit d7c468575b
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CMakeLists.txt
View File

@ -499,23 +499,25 @@ opm_add_test(flow_distribute_z
${FLOW_TGTS} ${FLOW_TGTS}
$<TARGET_OBJECTS:moduleVersion> $<TARGET_OBJECTS:moduleVersion>
) )
if (NOT BUILD_FLOW_ALU_GRID)
set(FLOW_ALUGRID_ONLY_DEFAULT_ENABLE_IF "FALSE")
else()
set(FLOW_ALUGRID_ONLY_DEFAULT_ENABLE_IF "TRUE")
endif()
# the production oriented general-purpose ECL simulator if(dune-alugrid_FOUND)
opm_add_test(flow_alugrid if (NOT BUILD_FLOW_ALU_GRID)
ONLY_COMPILE set(FLOW_ALUGRID_ONLY_DEFAULT_ENABLE_IF "FALSE")
ALWAYS_ENABLE else()
DEFAULT_ENABLE_IF ${FLOW_ALUGRID_ONLY_DEFAULT_ENABLE_IF} set(FLOW_ALUGRID_ONLY_DEFAULT_ENABLE_IF "TRUE")
DEPENDS opmsimulators endif()
LIBRARIES opmsimulators
SOURCES opm_add_test(flow_alugrid
flow/flow_blackoil_alugrid.cpp ONLY_COMPILE
$<TARGET_OBJECTS:moduleVersion>) ALWAYS_ENABLE
target_compile_definitions(flow_alugrid PRIVATE USE_ALUGRID) DEFAULT_ENABLE_IF ${FLOW_ALUGRID_ONLY_DEFAULT_ENABLE_IF}
DEPENDS opmsimulators
LIBRARIES opmsimulators
SOURCES
flow/flow_blackoil_alugrid.cpp
$<TARGET_OBJECTS:moduleVersion>)
target_compile_definitions(flow_alugrid PRIVATE USE_ALUGRID)
endif()
if (BUILD_FLOW) if (BUILD_FLOW)
install(TARGETS flow DESTINATION bin) install(TARGETS flow DESTINATION bin)

11
ebos/eclproblem.hh
View File

@ -30,17 +30,6 @@
#if USE_ALUGRID #if USE_ALUGRID
#define DISABLE_ALUGRID_SFC_ORDERING 1 #define DISABLE_ALUGRID_SFC_ORDERING 1
#if !HAVE_DUNE_ALUGRID
#warning "ALUGrid was indicated to be used for the ECL black oil simulator, but this "
#warning "requires the presence of dune-alugrid >= 2.4. Falling back to Dune::CpGrid"
#undef USE_ALUGRID
#define USE_ALUGRID 0
#endif
#else
#define USE_ALUGRID 0
#endif
#if USE_ALUGRID
#include "eclalugridvanguard.hh" #include "eclalugridvanguard.hh"
#elif USE_POLYHEDRALGRID #elif USE_POLYHEDRALGRID
#include "eclpolyhedralgridvanguard.hh" #include "eclpolyhedralgridvanguard.hh"