diff --git a/.gitignore b/.gitignore index c58e004e..fe215fb1 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/examples/import_rewrite.cpp b/examples/import_rewrite.cpp index ef652f70..edf708e0 100644 --- a/examples/import_rewrite.cpp +++ b/examples/import_rewrite.cpp @@ -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"; { diff --git a/tests/Makefile.am b/tests/Makefile.am index 6cd55301..dc0d0103 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -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