Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
22f4a9a8
Commit
22f4a9a8
authored
5 years ago
by
Timo Koch
Browse files
Options
Downloads
Plain Diff
Merge branch 'Fix/compilation-fails-with-missing-umfpack' into 'master'
[sovler] Fix preprocessor guards in case UMFPack is not present Closes
#857
See merge request
!1962
parents
1a5ffc50
7f286673
No related branches found
No related tags found
1 merge request
!1962
[sovler] Fix preprocessor guards in case UMFPack is not present
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/linear/preconditioners.hh
+2
-3
2 additions, 3 deletions
dumux/linear/preconditioners.hh
with
2 additions
and
3 deletions
dumux/linear/preconditioners.hh
+
2
−
3
View file @
22f4a9a8
...
...
@@ -91,7 +91,6 @@ class SeqUzawa : public Dune::Preconditioner<X,Y>
using
LinearOperator
=
Dune
::
MatrixAdapter
<
A
,
U
,
U
>
;
using
Smoother
=
Dune
::
SeqSSOR
<
A
,
U
,
U
>
;
using
AMGSolverForA
=
Dune
::
Amg
::
AMG
<
LinearOperator
,
U
,
Smoother
,
Comm
>
;
using
UMFPackSolverForA
=
Dune
::
UMFPack
<
A
>
;
public:
//! \brief The matrix type the preconditioner is for.
...
...
@@ -217,7 +216,7 @@ private:
{
#if HAVE_UMFPACK
using
namespace
Dune
::
Indices
;
umfPackSolverForA_
=
std
::
make_unique
<
UMFPack
SolverForA
>
(
matrix_
[
_0
][
_0
]);
umfPackSolverForA_
=
std
::
make_unique
<
Dune
::
UMFPack
<
A
>
>
(
matrix_
[
_0
][
_0
]);
#else
DUNE_THROW
(
Dune
::
InvalidStateException
,
"UMFPack not available. Use LinearSolver.Preconditioner.DirectVelocitySolver = false."
);
#endif
...
...
@@ -324,7 +323,7 @@ private:
std
::
unique_ptr
<
AMGSolverForA
>
amgSolverForA_
;
#if HAVE_UMFPACK
std
::
unique_ptr
<
UMFPack
SolverForA
>
umfPackSolverForA_
;
std
::
unique_ptr
<
Dune
::
UMFPack
<
A
>
>
umfPackSolverForA_
;
#endif
const
std
::
string
paramGroup_
;
const
bool
useDirectVelocitySolverForA_
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment