Skip to content
Snippets Groups Projects
Commit 2f716bbd authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/petsc_3-7' into 'master'

smal type in petscsolver

small errors in petscSolver corrected

See merge request !17
parents 82835361 8c4548a8
No related branches found
No related tags found
1 merge request!17smal type in petscsolver
Pipeline #
......@@ -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)
......
......@@ -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")
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment