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

Rename of GlobalCell to ReservoirCell

Browse Source
This commit is contained in:
Jacob Støren 2014-08-08 10:51:39 +02:00
parent 5c3a47e37d
commit 70dc296a13
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.cpp
View File

@ -163,12 +163,12 @@ void RivFaultGeometryGenerator::computeArrays()
#pragma omp parallel for #pragma omp parallel for
for (int fIdx = 0; fIdx < static_cast<int>(faultFaces.size()); fIdx++) for (int fIdx = 0; fIdx < static_cast<int>(faultFaces.size()); fIdx++)
{ {
size_t cellIndex = faultFaces[fIdx].m_nativeGlobalCellIndex; size_t cellIndex = faultFaces[fIdx].m_nativeReservoirCellIndex;
cvf::StructGridInterface::FaceType face = faultFaces[fIdx].m_nativeFace; cvf::StructGridInterface::FaceType face = faultFaces[fIdx].m_nativeFace;
if (!m_computeNativeFaultFaces) if (!m_computeNativeFaultFaces)
{ {
cellIndex = faultFaces[fIdx].m_oppositeGlobalCellIndex; cellIndex = faultFaces[fIdx].m_oppositeReservoirCellIndex;
face = cvf::StructGridInterface::oppositeFace(faultFaces[fIdx].m_nativeFace); face = cvf::StructGridInterface::oppositeFace(faultFaces[fIdx].m_nativeFace);
} }

6
ApplicationCode/ReservoirDataModel/RigFault.cpp
View File

@ -145,10 +145,10 @@ void RigFault::accumulateFaultsPrCell(RigFaultsPrCellAccumulator* faultsPrCellA
{ {
const FaultFace& ff = m_faultFaces[ffIdx]; const FaultFace& ff = m_faultFaces[ffIdx];
// Could detect overlapping faults here .... if (faultsPrCellAcc->faultIdx(ff.m_nativeGlobalCellIndex, ff.m_nativeFace) >= 0) // Could detect overlapping faults here .... if (faultsPrCellAcc->faultIdx(ff.m_nativeReservoirCellIndex, ff.m_nativeFace) >= 0)
faultsPrCellAcc->setFaultIdx(ff.m_nativeGlobalCellIndex, ff.m_nativeFace, faultIdx); faultsPrCellAcc->setFaultIdx(ff.m_nativeReservoirCellIndex, ff.m_nativeFace, faultIdx);
faultsPrCellAcc->setFaultIdx(ff.m_oppositeGlobalCellIndex, cvf::StructGridInterface::oppositeFace(ff.m_nativeFace), faultIdx); faultsPrCellAcc->setFaultIdx(ff.m_oppositeReservoirCellIndex, cvf::StructGridInterface::oppositeFace(ff.m_nativeFace), faultIdx);
} }
} }

10
ApplicationCode/ReservoirDataModel/RigFault.h
View File

@ -66,15 +66,15 @@ public:
struct FaultFace struct FaultFace
{ {
FaultFace(size_t nativeGlobalCellIndex, cvf::StructGridInterface::FaceType nativeFace, size_t oppositeGlobalCellIndex) : FaultFace(size_t nativeReservoirCellIndex, cvf::StructGridInterface::FaceType nativeFace, size_t oppositeReservoirCellIndex) :
m_nativeGlobalCellIndex(nativeGlobalCellIndex), m_nativeReservoirCellIndex(nativeReservoirCellIndex),
m_nativeFace(nativeFace), m_nativeFace(nativeFace),
m_oppositeGlobalCellIndex(oppositeGlobalCellIndex) m_oppositeReservoirCellIndex(oppositeReservoirCellIndex)
{ } { }
size_t m_nativeGlobalCellIndex; size_t m_nativeReservoirCellIndex;
cvf::StructGridInterface::FaceType m_nativeFace; cvf::StructGridInterface::FaceType m_nativeFace;
size_t m_oppositeGlobalCellIndex; size_t m_oppositeReservoirCellIndex;
}; };
public: public:

20
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@ -234,7 +234,7 @@ void RigMainGrid::calculateFaults()
continue; continue;
} }
size_t neighborGlobalCellIdx; size_t neighborReservoirCellIdx;
size_t neighborGridCellIdx; size_t neighborGridCellIdx;
size_t i, j, k; size_t i, j, k;
RigGridBase* hostGrid = NULL; RigGridBase* hostGrid = NULL;
@ -259,8 +259,8 @@ void RigMainGrid::calculateFaults()
continue; continue;
} }
neighborGlobalCellIdx = hostGrid->reservoirCellIndex(neighborGridCellIdx); neighborReservoirCellIdx = hostGrid->reservoirCellIndex(neighborGridCellIdx);
if (m_cells[neighborGlobalCellIdx].isInvalid()) if (m_cells[neighborReservoirCellIdx].isInvalid())
{ {
continue; continue;
} }
@ -271,7 +271,7 @@ void RigMainGrid::calculateFaults()
caf::SizeTArray4 faceIdxs; caf::SizeTArray4 faceIdxs;
m_cells[gcIdx].faceIndices(face, &faceIdxs); m_cells[gcIdx].faceIndices(face, &faceIdxs);
caf::SizeTArray4 nbFaceIdxs; caf::SizeTArray4 nbFaceIdxs;
m_cells[neighborGlobalCellIdx].faceIndices(StructGridInterface::oppositeFace(face), &nbFaceIdxs); m_cells[neighborReservoirCellIdx].faceIndices(StructGridInterface::oppositeFace(face), &nbFaceIdxs);
const std::vector<cvf::Vec3d>& vxs = m_mainGrid->nodes(); const std::vector<cvf::Vec3d>& vxs = m_mainGrid->nodes();
@ -289,17 +289,17 @@ void RigMainGrid::calculateFaults()
// To avoid doing this calculation for the opposite face // To avoid doing this calculation for the opposite face
faultsPrCellAcc->setFaultIdx(gcIdx, face, unNamedFaultIdx); faultsPrCellAcc->setFaultIdx(gcIdx, face, unNamedFaultIdx);
faultsPrCellAcc->setFaultIdx(neighborGlobalCellIdx, StructGridInterface::oppositeFace(face), unNamedFaultIdx); faultsPrCellAcc->setFaultIdx(neighborReservoirCellIdx, StructGridInterface::oppositeFace(face), unNamedFaultIdx);
//m_cells[gcIdx].setCellFaceFault(face); //m_cells[gcIdx].setCellFaceFault(face);
//m_cells[neighborGlobalCellIdx].setCellFaceFault(StructGridInterface::oppositeFace(face)); //m_cells[neighborReservoirCellIdx].setCellFaceFault(StructGridInterface::oppositeFace(face));
// Add as fault face only if the grid index is less than the neighbors // Add as fault face only if the grid index is less than the neighbors
if (static_cast<size_t>(gcIdx) < neighborGlobalCellIdx) if (static_cast<size_t>(gcIdx) < neighborReservoirCellIdx)
{ {
{ {
RigFault::FaultFace ff(gcIdx, cvf::StructGridInterface::FaceType(faceIdx), neighborGlobalCellIdx); RigFault::FaultFace ff(gcIdx, cvf::StructGridInterface::FaceType(faceIdx), neighborReservoirCellIdx);
unNamedFault->faultFaces().push_back(ff); unNamedFault->faultFaces().push_back(ff);
} }
@ -382,7 +382,7 @@ const RigFault* RigMainGrid::findFaultFromCellIndexAndCellFace(size_t cellIndex,
for (size_t fIdx = 0; fIdx < faultFaces.size(); fIdx++) for (size_t fIdx = 0; fIdx < faultFaces.size(); fIdx++)
{ {
if (faultFaces[fIdx].m_nativeGlobalCellIndex == cellIndex) if (faultFaces[fIdx].m_nativeReservoirCellIndex == cellIndex)
{ {
if (face == faultFaces[fIdx].m_nativeFace ) if (face == faultFaces[fIdx].m_nativeFace )
{ {
@ -390,7 +390,7 @@ const RigFault* RigMainGrid::findFaultFromCellIndexAndCellFace(size_t cellIndex,
} }
} }
if (faultFaces[fIdx].m_oppositeGlobalCellIndex == cellIndex) if (faultFaces[fIdx].m_oppositeReservoirCellIndex == cellIndex)
{ {
if (face == cvf::StructGridInterface::oppositeFace(faultFaces[fIdx].m_nativeFace)) if (face == cvf::StructGridInterface::oppositeFace(faultFaces[fIdx].m_nativeFace))
{ {