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

remove the modified version of the linear solvers from dune-istl

Browse Source 
i.e., the solvers.hh file is removed. The main reason for this is that
it avoids having to distribute a file with a potentially incompatible
license (i.e., GPLv2 + template exception vs GPLv2+), but the
home-brewn bicgstab solver also seems to perform a tiny bit better.
This commit is contained in:
Andreas Lauser
2016-12-29 12:03:31 +01:00
parent aa194cddbb
commit d514667977
6 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/co2injection_flash_ecfv.cpp
View File

@@ -60,7 +60,7 @@ SET_TYPE_PROP(Co2InjectionFlashEcfvProblem, Scalar, quad);
// the default linear solver used for this problem (-> AMG) cannot be used with quadruple // the default linear solver used for this problem (-> AMG) cannot be used with quadruple
// precision scalars... (this seems to only apply to Dune >= 2.4) // precision scalars... (this seems to only apply to Dune >= 2.4)
SET_TAG_PROP(Co2InjectionFlashEcfvProblem, LinearSolverSplice, ParallelIterativeLinearSolver); SET_TAG_PROP(Co2InjectionFlashEcfvProblem, LinearSolverSplice, ParallelBiCGStabLinearSolver);
#else #else
SET_SCALAR_PROP(Co2InjectionFlashEcfvProblem, NewtonRawTolerance, 1e-5); SET_SCALAR_PROP(Co2InjectionFlashEcfvProblem, NewtonRawTolerance, 1e-5);
#endif #endif

2
examples/co2injection_flash_ni_ecfv.cpp
View File

@@ -59,7 +59,7 @@ SET_TYPE_PROP(Co2InjectionFlashNiEcfvProblem, Scalar, quad);
// the default linear solver used for this problem (-> AMG) cannot be used with quadruple // the default linear solver used for this problem (-> AMG) cannot be used with quadruple
// precision scalars... (this seems to only apply to Dune >= 2.4) // precision scalars... (this seems to only apply to Dune >= 2.4)
SET_TAG_PROP(Co2InjectionFlashNiEcfvProblem, LinearSolverSplice, ParallelIterativeLinearSolver); SET_TAG_PROP(Co2InjectionFlashNiEcfvProblem, LinearSolverSplice, ParallelBiCGStabLinearSolver);
#else #else
SET_SCALAR_PROP(Co2InjectionFlashNiEcfvProblem, NewtonRawTolerance, 1e-5); SET_SCALAR_PROP(Co2InjectionFlashNiEcfvProblem, NewtonRawTolerance, 1e-5);
#endif #endif

2
examples/co2injection_flash_ni_vcfv.cpp
View File

@@ -56,7 +56,7 @@ SET_TYPE_PROP(Co2InjectionFlashNiVcfvProblem, Scalar, quad);
// the default linear solver used for this problem (-> AMG) cannot be used with quadruple // the default linear solver used for this problem (-> AMG) cannot be used with quadruple
// precision scalars... (this seems to only apply to Dune >= 2.4) // precision scalars... (this seems to only apply to Dune >= 2.4)
SET_TAG_PROP(Co2InjectionFlashNiVcfvProblem, LinearSolverSplice, ParallelIterativeLinearSolver); SET_TAG_PROP(Co2InjectionFlashNiVcfvProblem, LinearSolverSplice, ParallelBiCGStabLinearSolver);
#else #else
SET_SCALAR_PROP(Co2InjectionFlashNiVcfvProblem, NewtonRawTolerance, 1e-5); SET_SCALAR_PROP(Co2InjectionFlashNiVcfvProblem, NewtonRawTolerance, 1e-5);
#endif #endif

2
examples/co2injection_flash_vcfv.cpp
View File

@@ -57,7 +57,7 @@ SET_TYPE_PROP(Co2InjectionFlashVcfvProblem, Scalar, quad);
// the default linear solver used for this problem (-> AMG) cannot be used with quadruple // the default linear solver used for this problem (-> AMG) cannot be used with quadruple
// precision scalars... (this seems to only apply to Dune >= 2.4) // precision scalars... (this seems to only apply to Dune >= 2.4)
SET_TAG_PROP(Co2InjectionFlashVcfvProblem, LinearSolverSplice, ParallelIterativeLinearSolver); SET_TAG_PROP(Co2InjectionFlashVcfvProblem, LinearSolverSplice, ParallelBiCGStabLinearSolver);
#else #else
SET_SCALAR_PROP(Co2InjectionFlashVcfvProblem, NewtonRawTolerance, 1e-5); SET_SCALAR_PROP(Co2InjectionFlashVcfvProblem, NewtonRawTolerance, 1e-5);
#endif #endif

7
examples/problems/groundwaterproblem.hh
View File

@@ -28,7 +28,6 @@
#ifndef EWOMS_GROUND_WATER_PROBLEM_HH #ifndef EWOMS_GROUND_WATER_PROBLEM_HH
#define EWOMS_GROUND_WATER_PROBLEM_HH #define EWOMS_GROUND_WATER_PROBLEM_HH
#include <ewoms/linear/paralleliterativebackend.hh>
#include <ewoms/models/immiscible/immiscibleproperties.hh> #include <ewoms/models/immiscible/immiscibleproperties.hh>
#include <opm/material/components/SimpleH2O.hpp> #include <opm/material/components/SimpleH2O.hpp>
@@ -88,12 +87,6 @@ SET_SCALAR_PROP(GroundWaterBaseProblem, LensUpperRightY, 0.75);
SET_SCALAR_PROP(GroundWaterBaseProblem, LensUpperRightZ, 0.75); SET_SCALAR_PROP(GroundWaterBaseProblem, LensUpperRightZ, 0.75);
SET_SCALAR_PROP(GroundWaterBaseProblem, Permeability, 1e-10); SET_SCALAR_PROP(GroundWaterBaseProblem, Permeability, 1e-10);
SET_SCALAR_PROP(GroundWaterBaseProblem, PermeabilityLens, 1e-12); SET_SCALAR_PROP(GroundWaterBaseProblem, PermeabilityLens, 1e-12);
// Linear solver settings
SET_TYPE_PROP(GroundWaterBaseProblem, LinearSolverWrapper,
Ewoms::Linear::SolverWrapperConjugatedGradients<TypeTag>);
SET_TYPE_PROP(GroundWaterBaseProblem, PreconditionerWrapper,
Ewoms::Linear::PreconditionerWrapperILU0<TypeTag>);
SET_INT_PROP(GroundWaterBaseProblem, LinearSolverVerbosity, 0);
// Enable gravity // Enable gravity
SET_BOOL_PROP(GroundWaterBaseProblem, EnableGravity, true); SET_BOOL_PROP(GroundWaterBaseProblem, EnableGravity, true);

1
examples/problems/lensproblem.hh
View File

@@ -29,7 +29,6 @@
#define EWOMS_LENS_PROBLEM_HH #define EWOMS_LENS_PROBLEM_HH
#include <ewoms/io/structuredgridmanager.hh> #include <ewoms/io/structuredgridmanager.hh>
#include <ewoms/models/immiscible/immiscibleproperties.hh> #include <ewoms/models/immiscible/immiscibleproperties.hh>
#include <opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp> #include <opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp>