From 8b4af418cb9b623dc4506a66f6f612a3cc22248d Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 29 Dec 2017 16:16:21 +0100
Subject: [PATCH] Remove property LinearSolverPrecondBlockLevel. Provide it as
optional tparam to solve.
---
dumux/common/properties.hh | 3 ---
dumux/discretization/fvproperties.hh | 7 +------
dumux/discretization/staggered/properties.hh | 5 +----
dumux/porousmediumflow/sequential/properties.hh | 6 +-----
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index ca9b5c443d..4f592b4853 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -65,7 +65,6 @@ NEW_PROP_TAG(LocalResidual);
//! TODO: Remove this property as soon as the decoupled models are integrated
NEW_PROP_TAG(LinearSolver);
-NEW_PROP_TAG(LinearSolverPreconditionerBlockLevel); //!< Block level depth for the preconditioner
////////////////////////////////////////////////
// Basic properties regarding balance equations
@@ -147,8 +146,6 @@ NEW_PROP_TAG(NumSPhases);
NEW_PROP_TAG(NonMineralizationVtkOutputFields);
NEW_PROP_TAG(NonMineralizationVolumeVariables);
-NEW_PROP_TAG(UseConstraintSolver); //!< Determines whether the constraint solver should be used#
-
/////////////////////////////////////////////////////////////
// non-isothermal porous medium flow models
/////////////////////////////////////////////////////////////
diff --git a/dumux/discretization/fvproperties.hh b/dumux/discretization/fvproperties.hh
index 56e2e5fe3b..c0596dc4ec 100644
--- a/dumux/discretization/fvproperties.hh
+++ b/dumux/discretization/fvproperties.hh
@@ -59,7 +59,7 @@ SET_BOOL_PROP(FiniteVolumeModel, EnableGridFluxVariablesCache, false);
//! Boundary types at a single degree of freedom
SET_TYPE_PROP(FiniteVolumeModel, BoundaryTypes, BoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
-// TODO: bundle SolutionVector, JacobianMatrix and LinearSolverPreconditionerBlockLevel
+// TODO: bundle SolutionVector, JacobianMatrix
// in LinearAlgebra traits
//! The type of a solution for the whole grid at a fixed time TODO: move to LinearAlgebra traits
@@ -76,11 +76,6 @@ public:
using type = typename Dune::BCRSMatrix<MatrixBlock>;
};
-//! set the block level to 1, suitable for e.g. a simple Dune::BCRSMatrix.
-//! Set this to more than one if the matrix to solve is nested multiple times
-//! e.g. for Dune::MultiTypeBlockMatrix'es. TODO: move to LinearAlgebra traits
-SET_INT_PROP(FiniteVolumeModel, LinearSolverPreconditionerBlockLevel, 1);
-
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 4385fc018d..2b7ce7c9dc 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -208,7 +208,7 @@ public:
}
};
-// TODO: bundle SolutionVector, JacobianMatrix and LinearSolverPreconditionerBlockLevel
+// TODO: bundle SolutionVector, JacobianMatrix
// in LinearAlgebra traits
//! The type of a solution for the whole grid at a fixed time TODO: move to LinearAlgebra traits
@@ -263,9 +263,6 @@ public:
using type = typename Dune::MultiTypeBlockMatrix<RowCellCenter, RowFace>;
};
-// set the block level to 2 (nested multiple times) TODO: move to LinearAlgebra traits
-SET_INT_PROP(StaggeredModel, LinearSolverPreconditionerBlockLevel, 2);
-
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index e789684279..28e1cb65ea 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -104,13 +104,9 @@ SET_PROP(SequentialModel, DiscretizationMethod)
static const DiscretizationMethods value = DiscretizationMethods::CCTpfa;
};
-//!< Type of the jacobian matrix needed for compatibility with implicit models for the amg backend
+//! Type of the jacobian matrix needed for compatibility with implicit models for the amg backend
SET_TYPE_PROP(SequentialModel, JacobianMatrix, typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix));
-
-//!< Block level on which the preconditioner is supposed to work.
-SET_INT_PROP(SequentialModel, LinearSolverPreconditionerBlockLevel, 1);
-
//! Use the leaf grid view if not defined otherwise
SET_PROP(SequentialModel, GridView)
{
--
GitLab