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

Rename dirId() to faceDirFromDirId()

Browse Source
This commit is contained in:
Håkon Hægland 2022-09-16 09:22:17 +02:00
parent dc6141af13
commit 38add2ed66
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/models/blackoil/blackoillocalresidualtpfa.hh
View File

@ -271,7 +271,7 @@ public:
const auto& materialLawManager = problem.materialLawManager(); const auto& materialLawManager = problem.materialLawManager();
FaceDir::DirEnum facedir = FaceDir::DirEnum::Unknown; // Use an arbitrary FaceDir::DirEnum facedir = FaceDir::DirEnum::Unknown; // Use an arbitrary
if (materialLawManager->hasDirectionalRelperms()) { if (materialLawManager->hasDirectionalRelperms()) {
facedir = scvf.dirId(); facedir = scvf.faceDirFromDirId();
} }
Scalar thpres = problem.thresholdPressure(globalIndexIn, globalIndexEx); Scalar thpres = problem.thresholdPressure(globalIndexIn, globalIndexEx);

2
opm/models/discretization/common/tpfalinearizer.hh
View File

@ -337,7 +337,7 @@ private:
const double area = scvf.area(); const double area = scvf.area();
FaceDirection dirId = FaceDirection::Unknown; FaceDirection dirId = FaceDirection::Unknown;
if (materialLawManager->hasDirectionalRelperms()) { if (materialLawManager->hasDirectionalRelperms()) {
dirId = scvf.dirId(); dirId = scvf.faceDirFromDirId();
} }
loc_nbinfo[dofIdx - 1] = NeighborInfo{neighborIdx, trans, area, dirId}; loc_nbinfo[dofIdx - 1] = NeighborInfo{neighborIdx, trans, area, dirId};
} }

10
opm/models/discretization/ecfv/ecfvstencil.hh
View File

@ -212,7 +212,15 @@ public:
/*! /*!
* \brief Returns the direction of the face * \brief Returns the direction of the face
*/ */
FaceDir::DirEnum dirId() const int dirId() const
{
return dirId_;
}
/*!
* \brief Returns the direction of the face
*/
FaceDir::DirEnum faceDirFromDirId() const
{ {
if (dirId_ == -1) { if (dirId_ == -1) {
OPM_THROW(std::runtime_error, "NNC faces does not have a face id"); OPM_THROW(std::runtime_error, "NNC faces does not have a face id");