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

adjustments for eclipse support in opm-common

Browse Source
This commit is contained in:
Arne Morten Kvarving 2018-03-05 13:00:51 +01:00
parent 21cce7514e
commit a1601afd21
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebos/ecloutputblackoilmodule.hh
View File

@ -33,10 +33,16 @@
#include <ewoms/common/parametersystem.hh> #include <ewoms/common/parametersystem.hh>
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>
#if HAVE_ECL_INPUT
#include <opm/parser/eclipse/Units/Units.hpp> #include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp> #include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#endif
#if HAVE_ECL_OUTPUT
#include <opm/output/data/Cells.hpp> #include <opm/output/data/Cells.hpp>
#include <opm/output/eclipse/EclipseIO.hpp> #include <opm/output/eclipse/EclipseIO.hpp>
#endif
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>

11
ebos/eclwriter.hh
View File

@ -34,7 +34,10 @@
#include <ewoms/disc/ecfv/ecfvdiscretization.hh> #include <ewoms/disc/ecfv/ecfvdiscretization.hh>
#include <ewoms/io/baseoutputwriter.hh> #include <ewoms/io/baseoutputwriter.hh>
#include <ebos/threadhandle.hh> #include <ebos/threadhandle.hh>
#if HAVE_ECL_OUTPUT
#include <opm/output/eclipse/EclipseIO.hpp> #include <opm/output/eclipse/EclipseIO.hpp>
#endif
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Exceptions.hpp> #include <opm/material/common/Exceptions.hpp>
@ -132,8 +135,8 @@ public:
void writeInit() void writeInit()
{ {
#if !HAVE_OPM_OUTPUT #if !HAVE_ECL_OUTPUT
throw std::runtime_error("opm-output must be available to write ECL output!"); throw std::runtime_error("Eclipse output support not available in opm-common, unable to write ECL output!");
#else #else
if (collectToIORank_.isIORank()) { if (collectToIORank_.isIORank()) {
std::map<std::string, std::vector<int> > integerVectors; std::map<std::string, std::vector<int> > integerVectors;
@ -149,8 +152,8 @@ public:
*/ */
void writeOutput(Opm::data::Wells& localWellData, Scalar t, bool substep, Scalar totalSolverTime, Scalar nextstep) void writeOutput(Opm::data::Wells& localWellData, Scalar t, bool substep, Scalar totalSolverTime, Scalar nextstep)
{ {
#if !HAVE_OPM_OUTPUT #if !HAVE_ECL_OUTPUT
throw std::runtime_error("opm-output must be available to write ECL output!"); throw std::runtime_error("Eclipse output support not available in opm-common, unable to write ECL output!");
#else #else
int episodeIdx = simulator_.episodeIndex() + 1; int episodeIdx = simulator_.episodeIndex() + 1;