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

Set defines in *.cpp files.

Browse Source 
That way we can keep the old order of includes which seems to be needed for compilation.
This commit is contained in:
Markus Blatt 2017-05-24 12:08:20 +02:00
parent e8d89bcf48
commit 8759c3a89a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/flow_ebos.cpp
View File

@ -24,13 +24,14 @@
#include "config.h" #include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
// Include of opm/autodiff/FlowMainEbos.hpp has to come first // Define making clear that the simulator supports AMG
#include <opm/autodiff/FlowMainEbos.hpp> #define FLOW_SUPPORT_AMG 1
#include <opm/material/densead/Evaluation.hpp> #include <opm/material/densead/Evaluation.hpp>
#include <opm/autodiff/DuneMatrix.hpp> #include <opm/autodiff/DuneMatrix.hpp>
#include <dune/grid/CpGrid.hpp> #include <dune/grid/CpGrid.hpp>
#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp> #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/autodiff/FlowMainEbos.hpp>
// ----------------- Main program ----------------- // ----------------- Main program -----------------

2
examples/flow_legacy.cpp
View File

@ -24,6 +24,8 @@
#include "config.h" #include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG !defined(HAVE_UMFPACK)
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp> #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>

2
examples/flow_mpi.cpp
View File

@ -24,6 +24,8 @@
#include "config.h" #include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG !defined(HAVE_UMFPACK)
#include <dune/grid/CpGrid.hpp> #include <dune/grid/CpGrid.hpp>
#include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp> #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>

3
opm/autodiff/FlowMain.hpp
View File

@ -23,9 +23,6 @@
#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>

2
opm/autodiff/FlowMainEbos.hpp
View File

@ -23,8 +23,6 @@
#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 1
#include <sys/utsname.h> #include <sys/utsname.h>