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

Resort to setting one define for AMG support in the main simulator

Browse Source
This commit is contained in:
Markus Blatt
2017-05-19 13:34:51 +02:00
parent 98e2eeb4dc
commit 5a6ace9063
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/FlowMain.hpp
View File

@@ -23,6 +23,8 @@
#ifndef OPM_FLOWMAIN_HEADER_INCLUDED #ifndef OPM_FLOWMAIN_HEADER_INCLUDED
#define OPM_FLOWMAIN_HEADER_INCLUDED #define OPM_FLOWMAIN_HEADER_INCLUDED
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG !defined(HAVE_UMFPACK)
#include <opm/common/utility/platform_dependent/disable_warnings.h> #include <opm/common/utility/platform_dependent/disable_warnings.h>

4
opm/autodiff/FlowMainEbos.hpp
View File

@@ -23,8 +23,12 @@
#ifndef OPM_FLOW_MAIN_EBOS_HEADER_INCLUDED #ifndef OPM_FLOW_MAIN_EBOS_HEADER_INCLUDED
#define OPM_FLOW_MAIN_EBOS_HEADER_INCLUDED #define OPM_FLOW_MAIN_EBOS_HEADER_INCLUDED
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG
#include <sys/utsname.h> #include <sys/utsname.h>
#include <opm/simulators/ParallelFileMerger.hpp> #include <opm/simulators/ParallelFileMerger.hpp>
#include <opm/simulators/ensureDirectoryExists.hpp> #include <opm/simulators/ensureDirectoryExists.hpp>

2
opm/autodiff/ISTLSolver.hpp
View File

@@ -249,7 +249,7 @@ namespace Opm
// Communicate if parallel. // Communicate if parallel.
parallelInformation_arg.copyOwnerToAll(istlb, istlb); parallelInformation_arg.copyOwnerToAll(istlb, istlb);
#if defined(OPM_FLOW_MAIN_EBOS_HEADER_INCLUDED) || ! HAVE_UMFPACK // activate AMG if either flow_ebos is used or UMFPack is not available #if FLOW_SUPPORT_AMG // activate AMG if either flow_ebos is used or UMFPack is not available
if( parameters_.linear_solver_use_amg_ ) if( parameters_.linear_solver_use_amg_ )
{ {
typedef ISTLUtility::CPRSelector< Matrix, Vector, Vector, POrComm> CPRSelectorType; typedef ISTLUtility::CPRSelector< Matrix, Vector, Vector, POrComm> CPRSelectorType;