Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Aland, Sebastian
amdis
Commits
e094bc1a
Commit
e094bc1a
authored
Oct 27, 2016
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.math.tu-dresden.de/iwr/amdis
parents
3d0351c1
2f716bbd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
AMDiS/cmake/enable_mtl4.cmake
AMDiS/cmake/enable_mtl4.cmake
+1
-0
AMDiS/cmake3/target_enable_mtl4.cmake
AMDiS/cmake3/target_enable_mtl4.cmake
+1
-1
extensions/preconditioner/PetscSolverPfc.cc
extensions/preconditioner/PetscSolverPfc.cc
+1
-1
No files found.
AMDiS/cmake/enable_mtl4.cmake
View file @
e094bc1a
...
...
@@ -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
View file @
e094bc1a
...
...
@@ -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
View file @
e094bc1a
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment