OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #387 from atgeirr/adapt-to-removed-legacy-fileformat

Browse Source 
Remove support for legacy file format.
This commit is contained in:
Bård Skaflestad 2024-06-28 14:30:25 +02:00 committed by GitHub
commit e88e13c3e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/porsol/common/setupGridAndProps.hpp
View File

@ -75,12 +75,7 @@ namespace Opm
// Initialize grid and reservoir properties. // Initialize grid and reservoir properties.
// Parts copied from Dune::CpGrid::init(). // Parts copied from Dune::CpGrid::init().
std::string fileformat = param.getDefault<std::string>("fileformat", "cartesian"); std::string fileformat = param.getDefault<std::string>("fileformat", "cartesian");
if (fileformat == "sintef_legacy") { if (fileformat == "eclipse") {
std::string grid_prefix = param.get<std::string>("grid_prefix");
grid.readSintefLegacyFormat(grid_prefix);
OPM_MESSAGE("Warning: We do not yet read legacy reservoir properties. Using defaults.");
res_prop.init(grid.size(0));
} else if (fileformat == "eclipse") {
std::string ecl_file = param.get<std::string>("filename"); std::string ecl_file = param.get<std::string>("filename");
Opm::Parser parser; Opm::Parser parser;

5
opm/upscaling/initCPGrid.cpp
View File

@ -45,10 +45,7 @@
void Opm::initCPGrid(Dune::CpGrid& grid, const Opm::ParameterGroup& param) { void Opm::initCPGrid(Dune::CpGrid& grid, const Opm::ParameterGroup& param) {
std::string fileformat = param.get<std::string>("fileformat"); std::string fileformat = param.get<std::string>("fileformat");
if (fileformat == "sintef_legacy") { if (fileformat == "eclipse") {
std::string grid_prefix = param.get<std::string>("grid_prefix");
grid.readSintefLegacyFormat(grid_prefix);
} else if (fileformat == "eclipse") {
std::string filename = param.get<std::string>("filename"); std::string filename = param.get<std::string>("filename");
if (param.has("z_tolerance")) { if (param.has("z_tolerance")) {
std::cerr << "****** Warning: z_tolerance parameter is obsolete, use PINCH in deck input instead\n"; std::cerr << "****** Warning: z_tolerance parameter is obsolete, use PINCH in deck input instead\n";