Skip to content

Unify linear solvers #2848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blattms merged 11 commits into from
Oct 13, 2020
Merged

Unify linear solvers #2848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
65817c9
Removed old amg/cpr code that can be replaced.
atgeirr Jul 8, 2020
1c208e9
Avoid unnecessary extra matrix manipulation.
atgeirr Oct 10, 2020
0a70d95
Refactor shouldCreateSolver().
atgeirr Oct 11, 2020
00438c4
Remove unused parts (not just comment out).
atgeirr Oct 11, 2020
842afd3
Refactor setupPropertyTree().
atgeirr Oct 11, 2020
30a4fe5
Add "amg" option to --linear-solver-configuration.
atgeirr Oct 11, 2020
3858804
Fix logic of shouldCreateSolver().
atgeirr Oct 11, 2020
f169cf9
Remove --linear-solver-configuration-file parameter.
atgeirr Oct 12, 2020
316b289
Rename parameter --linear-solver-configuration to --linsolver.
atgeirr Oct 12, 2020
dedbe78
Copyright additions.
atgeirr Oct 12, 2020
ea0abd1
Bugfix: do not substr() on too small strings.
atgeirr Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakeLists_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/linalg/FlexibleSolver2.cpp
opm/simulators/linalg/FlexibleSolver3.cpp
opm/simulators/linalg/FlexibleSolver4.cpp
opm/simulators/linalg/setupPropertyTree.cpp
opm/simulators/utils/readDeck.cpp
opm/simulators/timestepping/TimeStepControl.cpp
opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
Expand Down Expand Up @@ -170,10 +171,8 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/linalg/bda/openclSolverBackend.hpp
opm/simulators/linalg/bda/MultisegmentWellContribution.hpp
opm/simulators/linalg/bda/WellContributions.hpp
opm/simulators/linalg/BlackoilAmg.hpp
opm/simulators/linalg/amgcpr.hh
opm/simulators/linalg/twolevelmethodcpr.hh
opm/simulators/linalg/CPRPreconditioner.hpp
opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp
opm/simulators/linalg/FlexibleSolver.hpp
opm/simulators/linalg/FlexibleSolver_impl.hpp
Expand Down
18 changes: 1 addition & 17 deletions flow/flow_blackoil_dunecpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,6 @@ namespace Opm {
static constexpr int value = 100;
};
template<class TypeTag>
struct UseAmg<TypeTag, TTag::EclFlowProblemSimple> { // probably not used
static constexpr bool value = true;
};
template<class TypeTag>
struct UseCpr<TypeTag, TTag::EclFlowProblemSimple> {
static constexpr bool value = true;
};
template<class TypeTag>
struct CprMaxEllIter<TypeTag,TTag::EclFlowProblemSimple> {
static constexpr int value = 1;
};
Expand All @@ -70,17 +62,9 @@ namespace Opm {
static constexpr int value = 3;
};
template<class TypeTag>
struct CprSolverVerbose<TypeTag, TTag::EclFlowProblemSimple> {
static constexpr int value = 0;
};
template<class TypeTag>
struct LinearSolverConfiguration<TypeTag, TTag::EclFlowProblemSimple> {
struct Linsolver<TypeTag, TTag::EclFlowProblemSimple> {
static constexpr auto value = "ilu0";
};
template<class TypeTag>
struct SystemStrategy<TypeTag, TTag::EclFlowProblemSimple> {
static constexpr auto value = "quasiimpes";
};

template<class TypeTag>
struct FluidSystem<TypeTag, TTag::EclFlowProblemSimple>
Expand Down
3 changes: 0 additions & 3 deletions flow/flow_ebos_blackoil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
*/
#include "config.h"

// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1

#include <flow/flow_ebos_blackoil.hpp>

#include <opm/material/common/ResetLocale.hpp>
Expand Down
3 changes: 0 additions & 3 deletions flow/flow_ebos_gasoil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
*/
#include "config.h"

// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1

#include <flow/flow_ebos_gasoil.hpp>

#include <opm/material/common/ResetLocale.hpp>
Expand Down
3 changes: 0 additions & 3 deletions flow/flow_ebos_oilwater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
*/
#include "config.h"

// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1

#include <flow/flow_ebos_oilwater.hpp>

#include <opm/material/common/ResetLocale.hpp>
Expand Down
3 changes: 0 additions & 3 deletions flow/flow_ebos_oilwater_brine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
*/
#include "config.h"

// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1

#include <flow/flow_ebos_oilwater_brine.hpp>

#include <opm/material/common/ResetLocale.hpp>
Expand Down
3 changes: 0 additions & 3 deletions flow/flow_ebos_oilwater_polymer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
*/
#include "config.h"

// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1

#include <flow/flow_ebos_oilwater_polymer.hpp>

#include <opm/material/common/ResetLocale.hpp>
Expand Down
3 changes: 0 additions & 3 deletions flow/flow_ebos_oilwater_polymer_injectivity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
*/
#include "config.h"

// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1

#include <flow/flow_ebos_oilwater_polymer_injectivity.hpp>

#include <opm/material/common/ResetLocale.hpp>
Expand Down
Loading