Commit 8ca9a701 authored by Praetorius, Simon's avatar Praetorius, Simon

solved some more compiler problems

parent d6f3e0e0
Pipeline #1484 failed with stage
in 29 minutes and 46 seconds
......@@ -5,7 +5,6 @@
#include <numeric>
#include <stack>
#include <variant>
#include <dune/common/iteratorfacades.hh>
#include <dune/common/iteratorrange.hh>
......
......@@ -40,27 +40,12 @@ if (dune-functions_FOUND AND dune-alugrid_FOUND AND HAVE_ALBERTA)
find_package(MTL QUIET PATHS /opt/development/mtl4)
if (MTL_FOUND)
set(CXX_ELEVEN_FEATURE_LIST "MOVE" "AUTO" "RANGEDFOR" "INITLIST" "STATICASSERT" "DEFAULTIMPL")
set(MTL_COMPILE_DEFINITIONS "")
foreach(feature ${CXX_ELEVEN_FEATURE_LIST})
list(APPEND MTL_COMPILE_DEFINITIONS "MTL_WITH_${feature}")
endforeach()
if (HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND)
list(APPEND MTL_COMPILE_DEFINITIONS "MTL_HAS_UMFPACK")
endif ()
set(MTL_TARGETS "")
list(APPEND MTL_TARGETS "phasefield" "phasefield2" "phasefield3" "phasefield4")
foreach(target ${MTL_TARGETS})
foreach(target "phasefield" "phasefield2" "phasefield3" "phasefield4")
add_executable(${target} ${target}.cc)
target_link_dune_default_libraries(${target})
add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 ${target})
target_include_directories(${target} PRIVATE ${MTL_INCLUDE_DIRS})
target_compile_definitions(${target} PRIVATE ${MTL_COMPILE_DEFINITIONS})
target_compile_options(${target} PRIVATE -Wno-deprecated-declarations)
endforeach()
endif ()
endif (MTL_FOUND)
endif ()
\ No newline at end of file
......@@ -57,7 +57,7 @@ namespace Dune
auto oldSubLocalView = Dune::Functions::subspaceBasis(oldBasis, treePath).localView();
auto newSubLocalView = Dune::Functions::subspaceBasis(newBasis, treePath).localView();
interpolate(oldCoeff, oldEntity, oldSubLocalView, newCoeff, newEntity, newSubLocalView);
this->interpolate(oldCoeff, oldEntity, oldSubLocalView, newCoeff, newEntity, newSubLocalView);
});
}
}
......
dune_add_test(SOURCES testvolume.cc)
dune_add_test(SOURCES testnumentities.cc)
dune_add_test(SOURCES testtransform.cc)
dune_add_test(SOURCES testgridviews.cc)
\ No newline at end of file
if (DUNE_HAVE_CXX_VARIANT)
dune_add_test(SOURCES testgridviews.cc)
endif (DUNE_HAVE_CXX_VARIANT)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment