Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
amdis
Commits
866b205b
Commit
866b205b
authored
Oct 27, 2016
by
Praetorius, Simon
Browse files
Merge branch 'master' of
https://gitlab.math.tu-dresden.de/iwr/amdis
parents
b284e2f1
79eef411
Pipeline
#596
failed
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
AMDiS/src/parallel/PetscHelper.cc
View file @
866b205b
...
...
@@ -308,7 +308,11 @@ namespace AMDiS
PetscViewer
viewer
;
PetscViewerCreate
(
PETSC_COMM_WORLD
,
&
viewer
);
PetscViewerSetType
(
viewer
,
PETSCVIEWERASCII
);
#if (PETSC_VERSION_MINOR >= 7)
PetscOptionsView
(
PETSC_NULL
,
viewer
);
#else
PetscOptionsView
(
viewer
);
#endif
PetscViewerDestroy
(
&
viewer
);
#endif
}
...
...
AMDiS/src/parallel/PetscSolverGlobalMatrix.cc
View file @
866b205b
...
...
@@ -95,8 +95,13 @@ namespace AMDiS { namespace Parallel {
PetscViewer
viewer
;
PetscViewerCreate
(
PETSC_COMM_WORLD
,
&
viewer
);
PetscViewerSetType
(
viewer
,
PETSCVIEWERASCII
);
#if (PETSC_VERSION_MINOR >= 7)
PetscOptionsView
(
PETSC_NULL
,
viewer
);
#else
PetscOptionsView
(
viewer
);
#endif
PetscViewerDestroy
(
&
viewer
);
}
#endif
}
...
...
extensions/preconditioner/PetscSolverNavierStokes2.cc
View file @
866b205b
...
...
@@ -139,9 +139,9 @@ namespace AMDiS { namespace Parallel {
KSPSetOperators
(
ksp
,
getMatInterior
(),
getMatInterior
(),
SAME_NONZERO_PATTERN
);
#endif
if
(
getInfo
()
>=
10
)
KSPMonitorSet
(
ksp
,
KSPMonitorDefault
,
PETSC_NULL
,
PETSC_NULL
);
KSPMonitorSet
(
ksp
,
PETSC_MONITOR_CAST
(
KSPMonitorDefault
)
,
PETSC_NULL
,
PETSC_NULL
);
else
if
(
getInfo
()
>=
20
)
KSPMonitorSet
(
ksp
,
KSPMonitorTrueResidualNorm
,
PETSC_NULL
,
PETSC_NULL
);
KSPMonitorSet
(
ksp
,
PETSC_MONITOR_CAST
(
KSPMonitorTrueResidualNorm
)
,
PETSC_NULL
,
PETSC_NULL
);
petsc_helper
::
setSolver
(
ksp
,
"ns_"
,
KSPFGMRES
,
PCNONE
,
getRelative
(),
getTolerance
(),
getMaxIterations
());
// Create null space information.
...
...
extensions/preconditioner/PetscSolverPfc.cc
View file @
866b205b
...
...
@@ -84,9 +84,9 @@ namespace AMDiS { namespace Parallel {
KSPSetOperators
(
ksp
,
getMatInterior
(),
getMatInterior
(),
SAME_NONZERO_PATTERN
);
#endif
if
(
getInfo
()
>=
10
)
KSPMonitorSet
(
ksp
,
KSPMonitorDefault
,
PETSC_NULL
,
PETSC_NULL
);
KSPMonitorSet
(
ksp
,
PETSC_MONITOR_CAST
(
KSPMonitorDefault
)
,
PETSC_NULL
,
PETSC_NULL
);
else
if
(
getInfo
()
>=
20
)
KSPMonitorSet
(
ksp
,
KSPMonitorTrueResidualNorm
,
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
);
...
...
extensions/preconditioner/PetscSolverPfc_diag.cc
View file @
866b205b
...
...
@@ -82,9 +82,9 @@ namespace AMDiS { namespace Parallel {
KSPSetOperators
(
ksp
,
getMatInterior
(),
getMatInterior
(),
SAME_NONZERO_PATTERN
);
#endif
if
(
getInfo
()
>=
10
)
KSPMonitorSet
(
ksp
,
KSPMonitorDefault
,
PETSC_NULL
,
PETSC_NULL
);
KSPMonitorSet
(
ksp
,
PETSC_MONITOR_CAST
(
KSPMonitorDefault
)
,
PETSC_NULL
,
PETSC_NULL
);
else
if
(
getInfo
()
>=
20
)
KSPMonitorSet
(
ksp
,
KSPMonitorTrueResidualNorm
,
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
Supports
Markdown
0%
Try again
or
attach a new 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