OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

do the rename job properly, remove the smooth upwinding stuff and central differences for the test of the Richards model

Browse Source
This commit is contained in:
Andreas Lauser 2014-03-07 17:05:28 +01:00
parent 61b177aef4
commit 6b3b2ad281
6 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/problems/co2injectionproblem.hh
View File

@ -136,11 +136,8 @@ SET_BOOL_PROP(Co2InjectionBaseProblem, NewtonWriteConvergence, false);
// Enable gravity // Enable gravity
SET_BOOL_PROP(Co2InjectionBaseProblem, EnableGravity, true); SET_BOOL_PROP(Co2InjectionBaseProblem, EnableGravity, true);
// Reuse Jacobian matrices if possible? // Reuse linearizations if possible?
SET_BOOL_PROP(Co2InjectionBaseProblem, EnableJacobianRecycling, true); SET_BOOL_PROP(Co2InjectionBaseProblem, EnableLinearizationRecycling, true);
// Smoothen the upwinding method?
SET_BOOL_PROP(Co2InjectionBaseProblem, EnableSmoothUpwinding, false);
// set the defaults for the problem specific properties // set the defaults for the problem specific properties
SET_SCALAR_PROP(Co2InjectionBaseProblem, FluidSystemPressureLow, 3e7); SET_SCALAR_PROP(Co2InjectionBaseProblem, FluidSystemPressureLow, 3e7);

3
examples/problems/cuvetteproblem.hh
View File

@ -55,9 +55,6 @@ namespace Properties {
// create a new type tag for the cuvette steam injection problem // create a new type tag for the cuvette steam injection problem
NEW_TYPE_TAG(CuvetteBaseProblem); NEW_TYPE_TAG(CuvetteBaseProblem);
SET_BOOL_PROP(CuvetteBaseProblem, EnablePartialReassemble, true);
SET_BOOL_PROP(CuvetteBaseProblem, EnableJacobianRecycling, true);
// Set the grid type // Set the grid type
SET_TYPE_PROP(CuvetteBaseProblem, Grid, Dune::YaspGrid<2>); SET_TYPE_PROP(CuvetteBaseProblem, Grid, Dune::YaspGrid<2>);

9
examples/problems/fingerproblem.hh
View File

@ -103,21 +103,12 @@ SET_PROP(FingerBaseProblem, MaterialLaw)
typedef ParkerLenhard type; 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? // Write the solutions of individual newton iterations?
SET_BOOL_PROP(FingerBaseProblem, NewtonWriteConvergence, false); SET_BOOL_PROP(FingerBaseProblem, NewtonWriteConvergence, false);
// Use forward differences instead of central differences // Use forward differences instead of central differences
SET_INT_PROP(FingerBaseProblem, NumericDifferenceMethod, +1); SET_INT_PROP(FingerBaseProblem, NumericDifferenceMethod, +1);
// Enable smooth upwinding
SET_INT_PROP(FingerBaseProblem, EnableSmoothUpwinding, true);
// Enable constraints // Enable constraints
SET_INT_PROP(FingerBaseProblem, EnableConstraints, true); SET_INT_PROP(FingerBaseProblem, EnableConstraints, true);

6
examples/problems/lensproblem.hh
View File

@ -119,12 +119,6 @@ public:
// Use the algebraic multi-grid linear solver for this problem // Use the algebraic multi-grid linear solver for this problem
SET_TAG_PROP(LensBaseProblem, LinearSolverSplice, ParallelAmgBackend); 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? // Write the solutions of individual newton iterations?
SET_BOOL_PROP(LensBaseProblem, NewtonWriteConvergence, false); SET_BOOL_PROP(LensBaseProblem, NewtonWriteConvergence, false);

7
examples/problems/reservoirproblem.hh
View File

@ -86,11 +86,8 @@ SET_BOOL_PROP(ReservoirBaseProblem, NewtonWriteConvergence, false);
// Enable gravity // Enable gravity
SET_BOOL_PROP(ReservoirBaseProblem, EnableGravity, true); SET_BOOL_PROP(ReservoirBaseProblem, EnableGravity, true);
// Reuse Jacobian matrices if possible? // Reuse the last linearization if possible?
SET_BOOL_PROP(ReservoirBaseProblem, EnableJacobianRecycling, true); SET_BOOL_PROP(ReservoirBaseProblem, EnableLinearizationRecycling, true);
// Smoothen the upwinding method?
SET_BOOL_PROP(ReservoirBaseProblem, EnableSmoothUpwinding, false);
// Enable constraint DOFs? // Enable constraint DOFs?
SET_BOOL_PROP(ReservoirBaseProblem, EnableConstraints, true); SET_BOOL_PROP(ReservoirBaseProblem, EnableConstraints, true);

10
examples/problems/richardslensproblem.hh
View File

@ -93,15 +93,15 @@ public:
// Enable gravitational acceleration // Enable gravitational acceleration
SET_BOOL_PROP(RichardsLensProblem, EnableGravity, true); 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); 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? // 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 // Use central differences to approximate the Jacobian matrix
SET_INT_PROP(RichardsLensProblem, NumericDifferenceMethod, +1); SET_INT_PROP(RichardsLensProblem, NumericDifferenceMethod, 0);
// Set the maximum number of newton iterations of a time step // Set the maximum number of newton iterations of a time step
SET_INT_PROP(RichardsLensProblem, NewtonMaxIterations, 28); SET_INT_PROP(RichardsLensProblem, NewtonMaxIterations, 28);