OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-30 11:06:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2028 from joakim-hove/rm-props-iget

Browse Source 
Adapt to removal of GridProperty::iget()
This commit is contained in:
Joakim Hove 2019-10-15 07:54:03 +02:00 committed by GitHub
commit 1777fc5a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ebos/ecltransmissibility.hh
View File

@ -502,6 +502,9 @@ private:
const auto& inputTranx = properties.getDoubleGridProperty("TRANX");
const auto& inputTrany = properties.getDoubleGridProperty("TRANY");
const auto& inputTranz = properties.getDoubleGridProperty("TRANZ");
const auto& inputTranxData = properties.getDoubleGridProperty("TRANX").getData();
const auto& inputTranyData = properties.getDoubleGridProperty("TRANY").getData();
const auto& inputTranzData = properties.getDoubleGridProperty("TRANZ").getData();
// compute the transmissibilities for all intersections
auto elemIt = gridView.template begin</*codim=*/ 0>();
@ -531,26 +534,26 @@ private:
if (gc2 - gc1 == 1) {
if (inputTranx.deckAssigned())
// set simulator internal transmissibilities to values from inputTranx
trans_[isId] = inputTranx.iget(gc1);
trans_[isId] = inputTranxData[gc1];
else
// Scale transmissibilities with scale factor from inputTranx
trans_[isId] *= inputTranx.iget(gc1);
trans_[isId] *= inputTranxData[gc1];
}
else if (gc2 - gc1 == cartDims[0]) {
if (inputTrany.deckAssigned())
// set simulator internal transmissibilities to values from inputTrany
trans_[isId] = inputTrany.iget(gc1);
trans_[isId] = inputTranyData[gc1];
else
// Scale transmissibilities with scale factor from inputTrany
trans_[isId] *= inputTrany.iget(gc1);
trans_[isId] *= inputTranyData[gc1];
}
else if (gc2 - gc1 == cartDims[0]*cartDims[1]) {
if (inputTranz.deckAssigned())
// set simulator internal transmissibilities to values from inputTranz
trans_[isId] = inputTranz.iget(gc1);
trans_[isId] = inputTranzData[gc1];
else
// Scale transmissibilities with scale factor from inputTranz
trans_[isId] *= inputTranz.iget(gc1);
trans_[isId] *= inputTranzData[gc1];
}
//else.. We don't support modification of NNC at the moment.
}

5
opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
View File

@ -56,12 +56,11 @@ namespace Opm {
scaledEpsInfo_.resize(nc);
EclEpsGridProperties epsGridProperties;
epsGridProperties.initFromDeck(deck, eclState, /*imbibition=*/false);
const auto& satnum = eclState.get3DProperties().getIntGridProperty("SATNUM");
const auto& satnumData = eclState.get3DProperties().getIntGridProperty("SATNUM").getData();
const std::string tag = "Scaled endpoints";
for (int c = 0; c < nc; ++c) {
const int cartIdx = compressedToCartesianIdx[c];
const std::string satnumIdx = std::to_string(satnum.iget(cartIdx));
const std::string satnumIdx = std::to_string(satnumData[cartIdx]);
std::array<int, 3> ijk;
ijk[0] = cartIdx % dims[0];
ijk[1] = (cartIdx / dims[0]) % dims[1];