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 FLOW_BLACKOIL_ONLY hack from Main.hpp

Browse Source 
now that the python simulator uses runStatic, the
runDynamic template is never instanced, and thus there
are no linker issues.
This commit is contained in:
Arne Morten Kvarving 2021-11-10 09:55:25 +01:00
parent 3a512c0f20
commit 7f7fbab2f4
3 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/simulators/flow/Main.hpp
View File

@ -24,7 +24,6 @@
#include <flow/flow_ebos_blackoil.hpp>
# ifndef FLOW_BLACKOIL_ONLY
#include <flow/flow_ebos_gasoil.hpp>
#include <flow/flow_ebos_oilwater.hpp>
#include <flow/flow_ebos_gaswater.hpp>
@ -38,7 +37,6 @@
#include <flow/flow_ebos_oilwater_polymer.hpp>
#include <flow/flow_ebos_oilwater_polymer_injectivity.hpp>
#include <flow/flow_ebos_micp.hpp>
# endif
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
@ -288,11 +286,8 @@ namespace Opm
// TODO: make sure that no illegal combinations like thermal and
// twophase are requested.
if (false) {}
#ifndef FLOW_BLACKOIL_ONLY
// Single-phase case
else if (rspec.micp()) {
if (rspec.micp()) {
return this->runMICP(phases);
}
@ -330,7 +325,6 @@ namespace Opm
else if (eclipseState_->getSimulationConfig().isThermal()) {
return this->runThermal();
}
#endif // FLOW_BLACKOIL_ONLY
// Blackoil case
else if (phases.size() == 3) {
@ -546,7 +540,6 @@ namespace Opm
}
}
#ifndef FLOW_BLACKOIL_ONLY
int runMICP(const Phases& phases)
{
if (!phases.active(Phase::WATER) || (phases.size() > 2)) {
@ -684,7 +677,6 @@ namespace Opm
return flowEbosEnergyMain(argc_, argv_, outputCout_, outputFiles_);
}
#endif // FLOW_BLACKOIL_ONLY
int runBlackOil()
{

1
python/simulators/PyBlackOilSimulator.cpp
View File

@ -22,7 +22,6 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#define FLOW_BLACKOIL_ONLY
#include <opm/simulators/flow/Main.hpp>
#include <opm/simulators/flow/FlowMainEbos.hpp>
// NOTE: EXIT_SUCCESS, EXIT_FAILURE is defined in cstdlib

1
python/simulators/simulators.cpp
View File

@ -22,7 +22,6 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#define FLOW_BLACKOIL_ONLY
#include <opm/simulators/flow/Main.hpp>
#include <opm/simulators/flow/FlowMainEbos.hpp>
#include <opm/simulators/flow/python/PyMaterialState.hpp>