Commit 2a842470 authored by Gabi Seitz's avatar Gabi Seitz
Browse files

Runtime params:

specified in inputfiles instead of the problem files whenever possible.
Reviewed by Johannes


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14320 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 0c259817
......@@ -65,11 +65,6 @@ SET_TYPE_PROP(OnePNIConductionProblem,
SpatialParams,
Dumux::OnePNISpatialParams<TypeTag>);
// Enable velocity output
SET_BOOL_PROP(OnePNIConductionProblem, VtkAddVelocity, true);
// Disable gravity
SET_BOOL_PROP(OnePNIConductionProblem, ProblemEnableGravity, false);
}
......
......@@ -64,11 +64,6 @@ SET_TYPE_PROP(OnePNIConvectionProblem,
SpatialParams,
Dumux::OnePNISpatialParams<TypeTag>);
// Enable velocity output
SET_BOOL_PROP(OnePNIConvectionProblem, VtkAddVelocity, true);
// Disable gravity
SET_BOOL_PROP(OnePNIConvectionProblem, ProblemEnableGravity, false);
}
......
......@@ -77,9 +77,6 @@ SET_TYPE_PROP(OnePTestProblem, SpatialParams, Dumux::OnePTestSpatialParams<TypeT
// Linear solver settings
SET_TYPE_PROP(OnePTestProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
SET_INT_PROP(OnePTestProblem, LinearSolverVerbosity, 0);
SET_INT_PROP(OnePTestProblem, LinearSolverPreconditionerIterations, 1);
SET_SCALAR_PROP(OnePTestProblem, LinearSolverPreconditionerRelaxation, 1.0);
NEW_TYPE_TAG(OnePTestBoxProblemWithAMG, INHERITS_FROM(OnePTestBoxProblem));
NEW_TYPE_TAG(OnePTestCCProblemWithAMG, INHERITS_FROM(OnePTestCCProblem));
......
......@@ -9,4 +9,7 @@ File = ./grids/test_1pniconduction.dgf
[Problem]
Name = box1pniconduction # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity= 1 # enable velocity output
......@@ -10,4 +10,7 @@ File = ./grids/test_1pniconvection.dgf
Name = box1pniconvection # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
EnableGravity = 0 # Disable gravity
[Vtk]
AddVelocity = 1 # enable velocity output
......@@ -9,4 +9,7 @@ File = ./grids/test_1pniconduction.dgf
[Problem]
Name = cc1pniconduction # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity= 1 # enable velocity output
......@@ -10,4 +10,7 @@ File = ./grids/test_1pniconvection.dgf
Name = cc1pniconvection # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
EnableGravity = 0 # Disable gravity
[Vtk]
AddVelocity = 1 # enable velocity output
......@@ -68,11 +68,6 @@ SET_TYPE_PROP(OnePTwoCNIConvectionProblem,
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP(OnePTwoCNIConvectionProblem, UseMoles, true);
// Enable velocity output
SET_BOOL_PROP(OnePTwoCNIConvectionProblem, VtkAddVelocity, true);
// Disable gravity
SET_BOOL_PROP(OnePTwoCNIConvectionProblem, ProblemEnableGravity, false);
}
......
......@@ -7,4 +7,7 @@ File = ./grids/test_1p2c.dgf
[Problem]
Name = outflowbox # name passed to the output routines
EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity = 1 # enable velocity output
......@@ -9,4 +9,7 @@ File = ./grids/test_1p2cniconduction.dgf
[Problem]
Name = box1p2cniconduction # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity = 1 # Enable velocity output
......@@ -10,4 +10,7 @@ File = ./grids/test_1p2cniconvection.dgf
Name = box1p2cniconvection # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity = 1 # enable velocity output
......@@ -7,4 +7,7 @@ File = ./grids/test_1p2c.dgf
[Problem]
Name = outflowcc # name passed to the output routines
EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity = 1 # enable velocity output
......@@ -9,4 +9,7 @@ File = ./grids/test_1p2cniconduction.dgf
[Problem]
Name = cc1p2cniconduction # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity = 1 # enable velocity output
......@@ -10,4 +10,7 @@ File = ./grids/test_1p2cniconvection.dgf
Name = cc1p2cniconvection # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity = 1 # enable velocity output
......@@ -94,12 +94,6 @@ SET_TYPE_PROP(InjectionProblem2PNI,
Dumux::GasPhase<GET_PROP_TYPE(TypeTag, Scalar) Scalar,
Dumux::N2<GET_PROP_TYPE(TypeTag, Scalar) Scalar> >);
#endif
// Enable gravity
SET_BOOL_PROP(InjectionProblem2PNI, ProblemEnableGravity, true);
// write convergence behaviour to disk?
SET_BOOL_PROP(InjectionProblem2PNI, NewtonWriteConvergence, true);
}
/*!
......
......@@ -83,26 +83,8 @@ public:
typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
};
// Enable partial reassembly of the jacobian matrix?
SET_BOOL_PROP(LensProblem, ImplicitEnablePartialReassemble, true);
// Enable reuse of jacobian matrices?
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, ImplicitNumericDifferenceMethod, +1);
// Linear solver settings
SET_TYPE_PROP(LensProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
SET_INT_PROP(LensProblem, LinearSolverVerbosity, 0);
SET_INT_PROP(LensProblem, LinearSolverPreconditionerIterations, 1);
SET_SCALAR_PROP(LensProblem, LinearSolverPreconditionerRelaxation, 1.0);
// Enable gravity
SET_BOOL_PROP(LensProblem, ProblemEnableGravity, true);
NEW_PROP_TAG(BaseProblem);
SET_TYPE_PROP(LensBoxProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
......
......@@ -14,3 +14,6 @@ LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
[Problem]
Name = lensbox # name passed to the output routines
[Implicit]
EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix?
EnableJacobianRecycling = 1 # Enable reuse of jacobian matrices?
......@@ -12,3 +12,5 @@ UpperRightY = 40 # [m] height of the domain
[Problem]
Name = injection2pnibox
[Newton]
WriteConvergence = 1 # write convergence behaviour to disk?
......@@ -14,3 +14,6 @@ LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
[Problem]
Name = lenscc # name passed to the output routines
[Implicit]
EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix?
EnableJacobianRecycling = 1 # Enable reuse of jacobian matrices?
......@@ -12,3 +12,5 @@ UpperRightY = 40 # [m] height of the domain
[Problem]
Name = injection2pnicc
[Newton]
WriteConvergence = 1 # write convergence behaviour to disk?
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