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

Check NSCONZ before reading CFKind value from SCON

Browse Source
This commit is contained in:
Joakim Hove
2020-03-27 10:20:58 +01:00
parent bbc87beed5
commit f59fec133d
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/io/eclipse/rst/connection.hpp
View File

@@ -31,7 +31,7 @@ namespace RestartIO {
class Header;
struct RstConnection {
RstConnection(const ::Opm::UnitSystem& unit_system, std::size_t rst_index, const int* icon, const float* scon, const double *xcon);
RstConnection(const ::Opm::UnitSystem& unit_system, std::size_t rst_index, int nsconz, const int* icon, const float* scon, const double *xcon);
static double inverse_peaceman(double cf, double kh, double rw, double skin);
std::size_t rst_index;

9
src/opm/io/eclipse/rst/connection.cpp
View File

@@ -75,7 +75,7 @@ double RstConnection::inverse_peaceman(double cf, double kh, double rw, double s
using M = ::Opm::UnitSystem::measure;
RstConnection::RstConnection(const ::Opm::UnitSystem& unit_system, std::size_t rst_index_, const int* icon, const float* scon, const double* xcon) :
RstConnection::RstConnection(const ::Opm::UnitSystem& unit_system, std::size_t rst_index_, int nsconz, const int* icon, const float* scon, const double* xcon) :
rst_index( rst_index_),
ijk( {icon[VI::IConn::CellI] - 1, icon[VI::IConn::CellJ] - 1, icon[VI::IConn::CellK] - 1}),
state( from_int<Connection::State>(icon[VI::IConn::ConnStat])),
@@ -84,7 +84,7 @@ RstConnection::RstConnection(const ::Opm::UnitSystem& unit_system, std::size_t r
completion( icon[VI::IConn::ComplNum]),
dir( from_int<Connection::Direction>(icon[VI::IConn::ConnDir])),
segment( icon[VI::IConn::Segment]),
cf_kind( from_float(scon[VI::SConn::CFInDeck])),
cf_kind( from_float(1.0)),
skin_factor( scon[VI::SConn::SkinFactor]),
cf( unit_system.to_si(M::transmissibility, scon[VI::SConn::ConnTrans])),
depth( unit_system.to_si(M::length, scon[VI::SConn::Depth])),
@@ -104,7 +104,10 @@ RstConnection::RstConnection(const ::Opm::UnitSystem& unit_system, std::size_t r
to give a value which is not consistent with the Peaceman formula -
that value will be lost when loading back from a restart file.
*/
{ }
{
if (nsconz > VI::SConn::CFInDeck)
this->cf_kind = from_float(scon[VI::SConn::CFInDeck]);
}
}
}

2
src/opm/io/eclipse/rst/well.cpp
View File

@@ -109,7 +109,7 @@ RstWell::RstWell(const ::Opm::UnitSystem& unit_system,
std::size_t icon_offset = ic * header.niconz;
std::size_t scon_offset = ic * header.nsconz;
std::size_t xcon_offset = ic * header.nxconz;
this->connections.emplace_back( unit_system, ic, icon + icon_offset, scon + scon_offset, xcon + xcon_offset);
this->connections.emplace_back( unit_system, ic, header.nsconz, icon + icon_offset, scon + scon_offset, xcon + xcon_offset);
}
}