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

Merge branch 'master' into gravity-in-wells

Browse Source
This commit is contained in:
Bård Skaflestad 2012-10-23 16:39:18 +02:00
commit ff8665017c
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -58,5 +58,6 @@ tests/test_column_extract
tests/test_lapack
tests/test_read_vag
tests/test_readpolymer
tests/test_velocityinterpolation
tests/test_wells
tests/test_writeVtkData

3
examples/import_rewrite.cpp
View File

@ -112,7 +112,6 @@ static ecl_kw_type * loadFromcstdio( const std::string& filename , std::ios::pos
static bool convertKeyword( const std::string& inputFile , const std::string& outputPath , std::ifstream& is , FieldType fieldType , std::ofstream& os ) {
bool convert = true;
ecl_type_enum ecl_type;
ecl_kw_type * ecl_kw;
if (fieldType == Integer)
ecl_type = ECL_INT_TYPE;
@ -148,7 +147,7 @@ static bool convertKeyword( const std::string& inputFile , const std::string& ou
bool parseFile(const std::string& inputFile, std::string& outputFile, const std::string& indent = "") {
static bool parseFile(const std::string& inputFile, std::string& outputFile, const std::string& indent = "") {
bool updateFile = false;
std::cout << indent << "Parsing " << inputFile << "\n";
{

1
tests/Makefile.am
View File

@ -61,6 +61,7 @@ test_read_vag_SOURCES = test_read_vag.cpp
test_sf2p_SOURCES = test_sf2p.cpp
test_velocityinterpolation_SOURCES = test_velocityinterpolation.cpp
test_velocityinterpolation_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
test_writeVtkData_SOURCES = test_writeVtkData.cpp