OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104 from atgeirr/no-ert-conditional

Browse Source 
Made compilation of writeECLData.[ch]pp unconditional.
This commit is contained in:
Bård Skaflestad 2012-12-03 00:13:10 -08:00
commit 3419c69623
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.am
View File

@ -133,6 +133,7 @@ opm/core/utility/parameters/tinyxml/tinystr.cpp \
opm/core/utility/parameters/tinyxml/tinyxml.cpp \ opm/core/utility/parameters/tinyxml/tinyxml.cpp \
opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp \ opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp \
opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp \ opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp \
opm/core/utility/writeECLData.cpp \
opm/core/utility/writeVtkData.cpp \ opm/core/utility/writeVtkData.cpp \
opm/core/vag_format/vag.cpp \ opm/core/vag_format/vag.cpp \
opm/core/wells/InjectionSpecification.cpp \ opm/core/wells/InjectionSpecification.cpp \
@ -278,6 +279,7 @@ opm/core/utility/parameters/ParameterTools.hpp \
opm/core/utility/parameters/ParameterXML.hpp \ opm/core/utility/parameters/ParameterXML.hpp \
opm/core/utility/parameters/tinyxml/tinystr.h \ opm/core/utility/parameters/tinyxml/tinystr.h \
opm/core/utility/parameters/tinyxml/tinyxml.h \ opm/core/utility/parameters/tinyxml/tinyxml.h \
opm/core/utility/writeECLData.hpp \
opm/core/utility/writeVtkData.hpp \ opm/core/utility/writeVtkData.hpp \
opm/core/vag_format/vag.hpp \ opm/core/vag_format/vag.hpp \
opm/core/well.h \ opm/core/well.h \
@ -301,15 +303,6 @@ opm/core/linalg/LinearSolverUmfpack.hpp
endif endif
if HAVE_ERT
lib_libopmcore_la_SOURCES += \
opm/core/utility/writeECLData.cpp
nobase_include_HEADERS += \
opm/core/utility/writeECLData.hpp
endif
if DUNE_ISTL if DUNE_ISTL
lib_libopmcore_la_SOURCES += \ lib_libopmcore_la_SOURCES += \
opm/core/linalg/LinearSolverIstl.cpp opm/core/linalg/LinearSolverIstl.cpp

5
opm/core/utility/writeECLData.cpp
View File

@ -153,9 +153,12 @@ namespace Opm
namespace Opm namespace Opm
{ {
void writeECLData(const UnstructuredGrid&, void writeECLData(const UnstructuredGrid&,
const DataMap&, const DataMap&,
const SimulatorTimer&, const int,
const double,
const boost::posix_time::ptime&,
const std::string&, const std::string&,
const std::string&) const std::string&)
{ {