Merge branch 'master' of https://gitlab.math.tu-dresden.de/iwr/amdis

AMDiS/cmake/enable_mtl4.cmake

@@ -10,6 +10,7 @@ macro(enable_mtl4 _FLAGS_ _INC_DIRS_ _LIBS_)
     else ()
       list(APPEND ${_INC_DIRS_} ${BASE_DIR}/lib/mtl4)
     endif (LINK_EXECUTABLE)
+    list(APPEND ${_FLAGS_} "-DMTL_ASSERT_FOR_THROW=1")
 
 
     if (ENABLE_CXX11 OR AMDIS_NEED_CXX11)

AMDiS/cmake3/target_enable_mtl4.cmake

@@ -12,7 +12,7 @@ macro(target_enable_mtl4 _TARGET_ _SCOPE_)
     else ()
       target_include_directories(${_TARGET_} ${_SCOPE_} ${BASE_DIR}/lib/mtl4)
     endif (LINK_EXECUTABLE)
-
+    target_compile_definitions(${_TARGET_} ${_SCOPE_} MTL_ASSERT_FOR_THROW=1)
 
     if (ENABLE_CXX11)
       set (CXX_ELEVEN_FEATURE_LIST "MOVE" "AUTO" "RANGEDFOR" "INITLIST" "STATICASSERT" "DEFAULTIMPL")

extensions/preconditioner/PetscSolverPfc.cc

@@ -86,7 +86,7 @@ namespace AMDiS { namespace Parallel {
     if (getInfo() >= 10)
       KSPMonitorSet(ksp, PETSC_MONITOR_CAST(KSPMonitorDefault), PETSC_NULL, PETSC_NULL);
     else if (getInfo() >= 20)
-      KSPMonitorSet(ksp, PETSC_MONITOR_CASTKSPMonitorTrueResidualNorm), PETSC_NULL, PETSC_NULL);
+      KSPMonitorSet(ksp, PETSC_MONITOR_CAST(KSPMonitorTrueResidualNorm), PETSC_NULL, PETSC_NULL);
     petsc_helper::setSolver(ksp, "pfc_", KSPFGMRES, PCNONE, getRelative(), getTolerance(), getMaxIterations());
     KSPSetFromOptions(ksp);