ebos: get rid of HAVE_ECL_{IN,OUT}PUT

there are about a trillion places within ebos where the availability
of the ECL I/O routines is hardcoded, so it does not make sense to
pretent that the EclWriter can be useful without them.

(in fact, ebos is deactivated at build system level if the ECL I/O
routines have not been detected.)
This commit is contained in:
Andreas Lauser
2018-07-12 13:47:00 +02:00
parent b5ac85b5d0
commit 29e113f1fd
2 changed files with 0 additions and 17 deletions

View File

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

View File

@@ -35,11 +35,8 @@
#include <ewoms/io/baseoutputwriter.hh>
#include <ewoms/parallel/tasklets.hh>
#if HAVE_ECL_OUTPUT
#include <opm/output/eclipse/EclipseIO.hpp>
#include <opm/output/eclipse/RestartValue.hpp>
#endif
#include <opm/parser/eclipse/Units/UnitSystem.hpp>
#include <opm/grid/GridHelpers.hpp>
@@ -135,16 +132,12 @@ public:
void writeInit()
{
#if !HAVE_ECL_OUTPUT
throw std::runtime_error("Eclipse output support not available in opm-common, unable to write ECL output!");
#else
if (collectToIORank_.isIORank()) {
std::map<std::string, std::vector<int> > integerVectors;
if (collectToIORank_.isParallel())
integerVectors.emplace("MPI_RANK", collectToIORank_.globalRanks());
eclIO_->writeInitial(computeTrans_(), integerVectors, exportNncStructure_());
}
#endif
}
/*!
@@ -152,10 +145,6 @@ public:
*/
void writeOutput(bool isSubStep)
{
#if !HAVE_ECL_INPUT
throw std::runtime_error("Unit support not available in opm-common.");
#endif
Scalar curTime = simulator_.time() + simulator_.timeStepSize();
Scalar totalSolverTime = simulator_.executionTimer().realTimeElapsed();
Scalar nextStepSize = simulator_.problem().nextTimeStepSize();