Merge branch 'master' into gravity-in-wells

This commit is contained in:
Bård Skaflestad 2012-10-15 15:22:13 +02:00
commit e2a7d65c94

View File

@ -1130,6 +1130,7 @@ void EclipseGridParser::getNumericErtFields(const string& filename)
}
ecl_file_close(ecl_file);
#else
static_cast<void>(filename); // Suppress "unused variable" warning.
THROW("Cannot use IMPORT keyword without ert library support. Reconfigure opm-core with --with-ert and recompile.");
#endif // HAVE_ERT
}