Commit ad2ca3f3 authored by Holger Class's avatar Holger Class
Browse files

Merge branch 'bugfix/compile-with-dumux-master' into 'master'

Bugfix/compile with dumux master



See merge request !6
parents af627623 c01ee942
......@@ -86,12 +86,6 @@ SET_BOOL_PROP(LensTwoPProblem, NewtonWriteConvergence, false);
// Use forward differences instead of central differences
SET_INT_PROP(LensTwoPProblem, ImplicitNumericDifferenceMethod, +1);
// Linear solver settings
SET_TYPE_PROP(LensTwoPProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
SET_INT_PROP(LensTwoPProblem, LinearSolverVerbosity, 0);
SET_INT_PROP(LensTwoPProblem, LinearSolverPreconditionerIterations, 1);
SET_SCALAR_PROP(LensTwoPProblem, LinearSolverPreconditionerRelaxation, 1.0);
// Enable gravity
SET_BOOL_PROP(LensTwoPProblem, ProblemEnableGravity, false);
}
......
......@@ -84,12 +84,6 @@ SET_BOOL_PROP(LensTwoPProblem, NewtonWriteConvergence, false);
// Use forward differences instead of central differences
SET_INT_PROP(LensTwoPProblem, ImplicitNumericDifferenceMethod, +1);
// Linear solver settings
SET_TYPE_PROP(LensTwoPProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
SET_INT_PROP(LensTwoPProblem, LinearSolverVerbosity, 0);
SET_INT_PROP(LensTwoPProblem, LinearSolverPreconditionerIterations, 1);
SET_SCALAR_PROP(LensTwoPProblem, LinearSolverPreconditionerRelaxation, 1.0);
// Enable gravity
SET_BOOL_PROP(LensTwoPProblem, ProblemEnableGravity, true);
}
......
......@@ -424,11 +424,8 @@ public:
for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 4)
int dofIdxGlobal = this->model().dofMapper().subIndex(*eIt, scvIdx, dofCodim);
#else
int dofIdxGlobal = this->model().dofMapper().map(*eIt, scvIdx, dofCodim);
#endif
//reactionSource Output
PrimaryVariables source;
this->solDependentSource(source, *eIt, fvGeometry, scvIdx, elemVolVars);
......
......@@ -96,12 +96,6 @@ SET_BOOL_PROP(Henry2pProblem, NewtonWriteConvergence, false);
SET_INT_PROP(Henry2pProblem, ImplicitNumericDifferenceMethod, +1);
SET_SCALAR_PROP(Henry2pProblem, ImplicitMassUpwindWeight, 0.5);
// Linear solver settings
SET_TYPE_PROP(Henry2pProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
SET_INT_PROP(Henry2pProblem, LinearSolverVerbosity, 0);
SET_INT_PROP(Henry2pProblem, LinearSolverPreconditionerIterations, 1);
SET_SCALAR_PROP(Henry2pProblem, LinearSolverPreconditionerRelaxation, 1.0);
// Enable gravity
SET_BOOL_PROP(Henry2pProblem, ProblemEnableGravity, true);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment