mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-01-12 01:11:55 -06:00
do the rename job properly, remove the smooth upwinding stuff and central differences for the test of the Richards model
This commit is contained in:
parent
61b177aef4
commit
6b3b2ad281
@ -136,11 +136,8 @@ SET_BOOL_PROP(Co2InjectionBaseProblem, NewtonWriteConvergence, false);
|
||||
// Enable gravity
|
||||
SET_BOOL_PROP(Co2InjectionBaseProblem, EnableGravity, true);
|
||||
|
||||
// Reuse Jacobian matrices if possible?
|
||||
SET_BOOL_PROP(Co2InjectionBaseProblem, EnableJacobianRecycling, true);
|
||||
|
||||
// Smoothen the upwinding method?
|
||||
SET_BOOL_PROP(Co2InjectionBaseProblem, EnableSmoothUpwinding, false);
|
||||
// Reuse linearizations if possible?
|
||||
SET_BOOL_PROP(Co2InjectionBaseProblem, EnableLinearizationRecycling, true);
|
||||
|
||||
// set the defaults for the problem specific properties
|
||||
SET_SCALAR_PROP(Co2InjectionBaseProblem, FluidSystemPressureLow, 3e7);
|
||||
|
@ -55,9 +55,6 @@ namespace Properties {
|
||||
// create a new type tag for the cuvette steam injection problem
|
||||
NEW_TYPE_TAG(CuvetteBaseProblem);
|
||||
|
||||
SET_BOOL_PROP(CuvetteBaseProblem, EnablePartialReassemble, true);
|
||||
SET_BOOL_PROP(CuvetteBaseProblem, EnableJacobianRecycling, true);
|
||||
|
||||
// Set the grid type
|
||||
SET_TYPE_PROP(CuvetteBaseProblem, Grid, Dune::YaspGrid<2>);
|
||||
|
||||
|
@ -103,21 +103,12 @@ SET_PROP(FingerBaseProblem, MaterialLaw)
|
||||
typedef ParkerLenhard type;
|
||||
};
|
||||
|
||||
// Enable partial reassembly of the jacobian matrix?
|
||||
// SET_BOOL_PROP(FingerBaseProblem, EnablePartialReassemble, true);
|
||||
|
||||
// Enable reuse of jacobian matrices?
|
||||
// SET_BOOL_PROP(FingerBaseProblem, EnableJacobianRecycling, true);
|
||||
|
||||
// Write the solutions of individual newton iterations?
|
||||
SET_BOOL_PROP(FingerBaseProblem, NewtonWriteConvergence, false);
|
||||
|
||||
// Use forward differences instead of central differences
|
||||
SET_INT_PROP(FingerBaseProblem, NumericDifferenceMethod, +1);
|
||||
|
||||
// Enable smooth upwinding
|
||||
SET_INT_PROP(FingerBaseProblem, EnableSmoothUpwinding, true);
|
||||
|
||||
// Enable constraints
|
||||
SET_INT_PROP(FingerBaseProblem, EnableConstraints, true);
|
||||
|
||||
|
@ -119,12 +119,6 @@ public:
|
||||
// Use the algebraic multi-grid linear solver for this problem
|
||||
SET_TAG_PROP(LensBaseProblem, LinearSolverSplice, ParallelAmgBackend);
|
||||
|
||||
// Enable partial reassembly of the jacobian matrix?
|
||||
// SET_BOOL_PROP(LensBaseProblem, EnablePartialReassemble, true);
|
||||
|
||||
// Enable reuse of jacobian matrices?
|
||||
// SET_BOOL_PROP(LensBaseProblem, EnableJacobianRecycling, true);
|
||||
|
||||
// Write the solutions of individual newton iterations?
|
||||
SET_BOOL_PROP(LensBaseProblem, NewtonWriteConvergence, false);
|
||||
|
||||
|
@ -86,11 +86,8 @@ SET_BOOL_PROP(ReservoirBaseProblem, NewtonWriteConvergence, false);
|
||||
// Enable gravity
|
||||
SET_BOOL_PROP(ReservoirBaseProblem, EnableGravity, true);
|
||||
|
||||
// Reuse Jacobian matrices if possible?
|
||||
SET_BOOL_PROP(ReservoirBaseProblem, EnableJacobianRecycling, true);
|
||||
|
||||
// Smoothen the upwinding method?
|
||||
SET_BOOL_PROP(ReservoirBaseProblem, EnableSmoothUpwinding, false);
|
||||
// Reuse the last linearization if possible?
|
||||
SET_BOOL_PROP(ReservoirBaseProblem, EnableLinearizationRecycling, true);
|
||||
|
||||
// Enable constraint DOFs?
|
||||
SET_BOOL_PROP(ReservoirBaseProblem, EnableConstraints, true);
|
||||
|
@ -93,15 +93,15 @@ public:
|
||||
// Enable gravitational acceleration
|
||||
SET_BOOL_PROP(RichardsLensProblem, EnableGravity, true);
|
||||
|
||||
// Enable partial reassembly of the Jacobian matrix
|
||||
// Enable partial reassembly of the linearization
|
||||
SET_BOOL_PROP(RichardsLensProblem, EnablePartialReassemble, true);
|
||||
|
||||
// Enable re-use of the Jacobian matrix of the last iteration of the
|
||||
// Enable re-use of the linearization of the last iteration of the
|
||||
// previous for the first iteration of the current time step?
|
||||
SET_BOOL_PROP(RichardsLensProblem, EnableJacobianRecycling, true);
|
||||
SET_BOOL_PROP(RichardsLensProblem, EnableLinearizationRecycling, true);
|
||||
|
||||
// Use forward differences to approximate the Jacobian matrix
|
||||
SET_INT_PROP(RichardsLensProblem, NumericDifferenceMethod, +1);
|
||||
// Use central differences to approximate the Jacobian matrix
|
||||
SET_INT_PROP(RichardsLensProblem, NumericDifferenceMethod, 0);
|
||||
|
||||
// Set the maximum number of newton iterations of a time step
|
||||
SET_INT_PROP(RichardsLensProblem, NewtonMaxIterations, 28);
|
||||
|
Loading…
Reference in New Issue
Block a user