Commit 6d1811ec authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

Tests: use new instead of deprecated names.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9313 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 5db0ffdd
......@@ -79,8 +79,8 @@ SET_PROP(OnePTestProblem, SpatialParams)
// Linear solver settings
SET_TYPE_PROP(OnePTestProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
SET_INT_PROP(OnePTestProblem, LinearSolverVerbosity, 0);
SET_INT_PROP(OnePTestProblem, PreconditionerIterations, 1);
SET_SCALAR_PROP(OnePTestProblem, PreconditionerRelaxation, 1.0);
SET_INT_PROP(OnePTestProblem, LinearSolverPreconditionerIterations, 1);
SET_SCALAR_PROP(OnePTestProblem, LinearSolverPreconditionerRelaxation, 1.0);
// Enable gravity
SET_BOOL_PROP(OnePTestProblem, ProblemEnableGravity, true);
......
......@@ -90,22 +90,22 @@ SET_TYPE_PROP(LensProblem, FluidSystem, H2ON2FluidSystem<TypeTag>);
#endif
// Enable partial reassembly of the jacobian matrix?
SET_BOOL_PROP(LensProblem, EnablePartialReassemble, true);
SET_BOOL_PROP(LensProblem, ImplicitEnablePartialReassemble, true);
// Enable reuse of jacobian matrices?
SET_BOOL_PROP(LensProblem, EnableJacobianRecycling, true);
SET_BOOL_PROP(LensProblem, ImplicitEnableJacobianRecycling, true);
// Write the solutions of individual newton iterations?
SET_BOOL_PROP(LensProblem, NewtonWriteConvergence, false);
// Use forward differences instead of central differences
SET_INT_PROP(LensProblem, NumericDifferenceMethod, +1);
SET_INT_PROP(LensProblem, ImplicitNumericDifferenceMethod, +1);
// Linear solver settings
SET_TYPE_PROP(LensProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
SET_INT_PROP(LensProblem, LinearSolverVerbosity, 0);
SET_INT_PROP(LensProblem, PreconditionerIterations, 1);
SET_SCALAR_PROP(LensProblem, PreconditionerRelaxation, 1.0);
SET_INT_PROP(LensProblem, LinearSolverPreconditionerIterations, 1);
SET_SCALAR_PROP(LensProblem, LinearSolverPreconditionerRelaxation, 1.0);
// Enable gravity
SET_BOOL_PROP(LensProblem, ProblemEnableGravity, true);
......
......@@ -66,7 +66,7 @@ SET_PROP(InjectionProblem, FluidSystem)
// Enable gravity
SET_BOOL_PROP(InjectionProblem, ProblemEnableGravity, true);
SET_BOOL_PROP(InjectionProblem, EnableJacobianRecycling, true);
SET_BOOL_PROP(InjectionProblem, ImplicitEnableJacobianRecycling, true);
SET_BOOL_PROP(InjectionProblem, VtkAddVelocity, false);
}
......
......@@ -66,7 +66,7 @@ SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename
SET_BOOL_PROP(WaterAirProblem, ProblemEnableGravity, true);
// Use forward differences instead of central differences
SET_INT_PROP(WaterAirProblem, NumericDifferenceMethod, +1);
SET_INT_PROP(WaterAirProblem, ImplicitNumericDifferenceMethod, +1);
// Write newton convergence
SET_BOOL_PROP(WaterAirProblem, NewtonWriteConvergence, false);
......
......@@ -66,7 +66,7 @@ SET_BOOL_PROP(InfiltrationProblem, NewtonWriteConvergence, false);
SET_SCALAR_PROP(InfiltrationProblem, NewtonRelTolerance, 1e-8);
// -1 backward differences, 0: central differences, +1: forward differences
SET_INT_PROP(InfiltrationProblem, NumericDifferenceMethod, 0);
SET_INT_PROP(InfiltrationProblem, ImplicitNumericDifferenceMethod, 0);
}
/*!
......
......@@ -69,13 +69,13 @@ SET_TYPE_PROP(ColumnProblem,
SET_BOOL_PROP(ColumnProblem, ProblemEnableGravity, true);
// Use forward differences instead of central differences
SET_INT_PROP(ColumnProblem, NumericDifferenceMethod, 0);
SET_INT_PROP(ColumnProblem, ImplicitNumericDifferenceMethod, 0);
// Write newton convergence
SET_BOOL_PROP(ColumnProblem, NewtonWriteConvergence, true);
// Set the maximum time step
SET_SCALAR_PROP(ColumnProblem, MaxTimeStepSize, 5.);
SET_SCALAR_PROP(ColumnProblem, TimeManagerMaxTimeStepSize, 5.);
}
......
......@@ -70,13 +70,13 @@ SET_TYPE_PROP(KuevetteProblem,
SET_BOOL_PROP(KuevetteProblem, ProblemEnableGravity, true);
// Use central differences (backward -1, forward +1)
SET_INT_PROP(KuevetteProblem, NumericDifferenceMethod, 0);
SET_INT_PROP(KuevetteProblem, ImplicitNumericDifferenceMethod, 0);
// Write newton convergence
//SET_BOOL_PROP(KuevetteProblem, NewtonWriteConvergence, true);
// Set the maximum time step
SET_SCALAR_PROP(KuevetteProblem, MaxTimeStepSize, 60.);
SET_SCALAR_PROP(KuevetteProblem, TimeManagerMaxTimeStepSize, 60.);
// set newton relative tolerance
SET_SCALAR_PROP(KuevetteProblem, NewtonRelTolerance, 1e-6);
......
......@@ -35,6 +35,7 @@
#include <dumux/boxmodels/co2/co2model.hh>
#include <dumux/boxmodels/co2/co2volumevariables.hh>
#include <dumux/material/fluidsystems/brineco2fluidsystem.hh>
#include <dumux/boxmodels/common/porousmediaboxproblem.hh>
#include <dumux/boxmodels/common/intersectiontovertexbc.hh>
#include "heterogeneousspatialparameters.hh"
......@@ -94,8 +95,8 @@ SET_TYPE_PROP(HeterogeneousProblem, VolumeVariables, CO2VolumeVariables<TypeTag>
// Enable gravity
SET_BOOL_PROP(HeterogeneousProblem, ProblemEnableGravity, true);
SET_BOOL_PROP(HeterogeneousProblem, EnableJacobianRecycling, false);
SET_BOOL_PROP(HeterogeneousProblem, EnableVelocityOutput, false);
SET_BOOL_PROP(HeterogeneousProblem, ImplicitEnableJacobianRecycling, false);
SET_BOOL_PROP(HeterogeneousProblem, VtkAddVelocity, false);
}
......@@ -138,7 +139,7 @@ class HeterogeneousProblem : public PorousMediaBoxProblem<TypeTag>
};
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
lPhaseIdx = Indices::wPhaseIdx,
gPhaseIdx = Indices::nPhaseIdx,
......
......@@ -34,6 +34,7 @@
#include <dumux/boxmodels/co2ni/co2nimodel.hh>
#include <dumux/boxmodels/co2ni/co2nivolumevariables.hh>
#include <dumux/material/fluidsystems/brineco2fluidsystem.hh>
#include <dumux/boxmodels/common/porousmediaboxproblem.hh>
#include <dumux/boxmodels/common/intersectiontovertexbc.hh>
......@@ -85,8 +86,8 @@ SET_TYPE_PROP(HeterogeneousProblem, VolumeVariables, CO2NIVolumeVariables<TypeTa
// Enable gravity
SET_BOOL_PROP(HeterogeneousProblem, ProblemEnableGravity, true);
SET_BOOL_PROP(HeterogeneousProblem, EnableJacobianRecycling, false);
SET_BOOL_PROP(HeterogeneousProblem, EnableVelocityOutput, false);
SET_BOOL_PROP(HeterogeneousProblem, ImplicitEnableJacobianRecycling, false);
SET_BOOL_PROP(HeterogeneousProblem, VtkAddVelocity, false);
}
......@@ -129,7 +130,7 @@ class HeterogeneousProblem : public PorousMediaBoxProblem<TypeTag>
};
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCNIIndices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
lPhaseIdx = Indices::wPhaseIdx,
gPhaseIdx = Indices::nPhaseIdx,
......
......@@ -86,13 +86,13 @@ SET_BOOL_PROP(Forchheimer1pProblem, NewtonWriteConvergence, false);
SET_BOOL_PROP(Forchheimer1pProblem, NewtonUseLineSearch, false);
// Enable the re-use of the jacobian matrix whenever possible?
SET_BOOL_PROP(Forchheimer1pProblem, EnableJacobianRecycling, true);
SET_BOOL_PROP(Forchheimer1pProblem, ImplicitEnableJacobianRecycling, true);
// Reassemble the jacobian matrix only where it changed?
SET_BOOL_PROP(Forchheimer1pProblem, EnablePartialReassemble, false);
SET_BOOL_PROP(Forchheimer1pProblem, ImplicitEnablePartialReassemble, false);
// use forward diffferences to approximate the partial derivatives
SET_INT_PROP(Forchheimer1pProblem, NumericDifferenceMethod, +1);
SET_INT_PROP(Forchheimer1pProblem, ImplicitNumericDifferenceMethod, +1);
// decide which type to use for floating values (double / quad)
SET_TYPE_PROP(Forchheimer1pProblem, Scalar, double);
......
......@@ -86,13 +86,13 @@ SET_BOOL_PROP(Forchheimer2pProblem, NewtonWriteConvergence, false);
SET_BOOL_PROP(Forchheimer2pProblem, NewtonUseLineSearch, false);
// Enable the re-use of the jacobian matrix whenever possible?
SET_BOOL_PROP(Forchheimer2pProblem, EnableJacobianRecycling, true);
SET_BOOL_PROP(Forchheimer2pProblem, ImplicitEnableJacobianRecycling, true);
// Reassemble the jacobian matrix only where it changed?
SET_BOOL_PROP(Forchheimer2pProblem, EnablePartialReassemble, false);
SET_BOOL_PROP(Forchheimer2pProblem, ImplicitEnablePartialReassemble, false);
// use forward diffferences to approximate the partial derivatives
SET_INT_PROP(Forchheimer2pProblem, NumericDifferenceMethod, +1);
SET_INT_PROP(Forchheimer2pProblem, ImplicitNumericDifferenceMethod, +1);
// decide which type to use for floating values (double / quad)
SET_TYPE_PROP(Forchheimer2pProblem, Scalar, double);
......
......@@ -85,13 +85,13 @@ SET_BOOL_PROP(ObstacleProblem, NewtonWriteConvergence, false);
SET_BOOL_PROP(ObstacleProblem, NewtonUseLineSearch, false);
// Enable the re-use of the jacobian matrix whenever possible?
SET_BOOL_PROP(ObstacleProblem, EnableJacobianRecycling, true);
SET_BOOL_PROP(ObstacleProblem, ImplicitEnableJacobianRecycling, true);
// Reassemble the jacobian matrix only where it changed?
SET_BOOL_PROP(ObstacleProblem, EnablePartialReassemble, true);
SET_BOOL_PROP(ObstacleProblem, ImplicitEnablePartialReassemble, true);
// use forward diffferences to approximate the partial derivatives
SET_INT_PROP(ObstacleProblem, NumericDifferenceMethod, +1);
SET_INT_PROP(ObstacleProblem, ImplicitNumericDifferenceMethod, +1);
// decide which type to use for floating values (double / quad)
SET_TYPE_PROP(ObstacleProblem, Scalar, double);
......
......@@ -67,13 +67,13 @@ public:
SET_BOOL_PROP(RichardsLensProblem, ProblemEnableGravity, true);
// Enable partial reassembly of the Jacobian matrix
SET_BOOL_PROP(RichardsLensProblem, EnablePartialReassemble, true);
SET_BOOL_PROP(RichardsLensProblem, ImplicitEnablePartialReassemble, true);
// Enable re-use of the Jacobian matrix for the first iteration of a time step
SET_BOOL_PROP(RichardsLensProblem, EnableJacobianRecycling, true);
SET_BOOL_PROP(RichardsLensProblem, ImplicitEnableJacobianRecycling, true);
// Use forward differences to approximate the Jacobian matrix
SET_INT_PROP(RichardsLensProblem, NumericDifferenceMethod, +1);
SET_INT_PROP(RichardsLensProblem, ImplicitNumericDifferenceMethod, +1);
// Set the maximum number of newton iterations of a time step
SET_INT_PROP(RichardsLensProblem, NewtonMaxSteps, 28);
......
......@@ -92,7 +92,7 @@ SET_BOOL_PROP(FVVelocity2PTestProblem, ProblemEnableGravity, false);
NEW_TYPE_TAG(FVMPFAOVelocity2PTestProblem, INHERITS_FROM(FVMPFAOPressurePropertiesTwoP, TestDiffusionSpatialParams));
//SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, Dumux::ILUnBiCGSTABBackend<TypeTag>);
SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, Dumux::SSORBiCGSTABBackend<TypeTag>);
SET_INT_PROP(FVMPFAOVelocity2PTestProblem, PreconditionerIterations, 2);
SET_INT_PROP(FVMPFAOVelocity2PTestProblem, LinearSolverPreconditionerIterations, 2);
SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TypeTag>);
// Set the grid type
SET_PROP(FVMPFAOVelocity2PTestProblem, Grid)
......
......@@ -83,7 +83,7 @@ public: typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\labe
SET_TYPE_PROP(TutorialProblemCoupled, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-coupled:set-fluidsystem}@*/
// Disable gravity
SET_BOOL_PROP(TutorialProblemCoupled, EnableGravity, false); /*@\label{tutorial-coupled:gravity}@*/
SET_BOOL_PROP(TutorialProblemCoupled, ProblemEnableGravity, false); /*@\label{tutorial-coupled:gravity}@*/
}
/*!
......
Supports Markdown
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