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

#1487 Small fixes after merge

Browse Source
This commit is contained in:
astridkbjorke
2017-05-30 10:00:04 +02:00
parent 68251f4b4e
commit 0458ac38d7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifFractureExportTools.cpp
View File

@@ -262,16 +262,16 @@ void RifFractureExportTools::exportWellPathFracturesToEclipseDataInputFile(const
////// //////
// Calculate Transmissibility in the fracture: From one StimPlan Cell to the other // Calculate Transmissibility in the fracture: From one StimPlan Cell to the other
for (size_t i = 0; i < fractureGrid.stimPlanGridNumberOfColums()-2; i++) for (size_t i = 0; i < fractureGrid.stimPlanGridNumberOfColums(); i++)
{ {
for (size_t j = 0; j < fractureGrid.stimPlanGridNumberOfRows()-2; j++) for (size_t j = 0; j < fractureGrid.stimPlanGridNumberOfRows(); j++)
{ {
size_t stimPlanCellIndex = fractureGrid.getGlobalIndexFromIJ(i, j); size_t stimPlanCellIndex = fractureGrid.getGlobalIndexFromIJ(i, j);
const RigStimPlanFracTemplateCell stimPlanCell = fractureGrid.stimPlanCellFromIndex(stimPlanCellIndex); const RigStimPlanFracTemplateCell stimPlanCell = fractureGrid.stimPlanCellFromIndex(stimPlanCellIndex);
if (stimPlanCell.getConductivtyValue() < 1e-7) continue; if (stimPlanCell.getConductivtyValue() < 1e-7) continue;
if (i < fractureGrid.stimPlanGridNumberOfColums() -2-1) if (i < fractureGrid.stimPlanGridNumberOfColums()-1)
{ {
size_t stimPlanCellNeighbourXIndex = fractureGrid.getGlobalIndexFromIJ(i + 1, j); size_t stimPlanCellNeighbourXIndex = fractureGrid.getGlobalIndexFromIJ(i + 1, j);
const RigStimPlanFracTemplateCell stimPlanCellNeighbourX = fractureGrid.stimPlanCellFromIndex(stimPlanCellNeighbourXIndex); const RigStimPlanFracTemplateCell stimPlanCellNeighbourX = fractureGrid.stimPlanCellFromIndex(stimPlanCellNeighbourXIndex);
@@ -291,7 +291,7 @@ void RifFractureExportTools::exportWellPathFracturesToEclipseDataInputFile(const
} }
if (j < fractureGrid.stimPlanGridNumberOfRows() - 2-1) if (j < fractureGrid.stimPlanGridNumberOfRows()-1)
{ {
size_t stimPlanCellNeighbourZIndex = fractureGrid.getGlobalIndexFromIJ(i, j + 1); size_t stimPlanCellNeighbourZIndex = fractureGrid.getGlobalIndexFromIJ(i, j + 1);
const RigStimPlanFracTemplateCell stimPlanCellNeighbourZ = fractureGrid.stimPlanCellFromIndex(stimPlanCellNeighbourZIndex); const RigStimPlanFracTemplateCell stimPlanCellNeighbourZ = fractureGrid.stimPlanCellFromIndex(stimPlanCellNeighbourZIndex);

2
ApplicationCode/ReservoirDataModel/RigTransmissibilityCondenser.cpp
View File

@@ -200,7 +200,7 @@ void printCellAddress(std::stringstream& str,
case CellAddress::STIMPLAN: case CellAddress::STIMPLAN:
{ {
str << "STP "; str << "STP ";
const RigStimPlanFracTemplateCell& stpCell = fractureGrid->stimPlanCellFromIndex(cellAddr.m_globalCellIdx); const RigStimPlanFracTemplateCell& stpCell = fractureGrid->fractureGrid().stimPlanCellFromIndex(cellAddr.m_globalCellIdx);
str << std::setw(5) << stpCell.getI()+1 << std::setw(5) << stpCell.getJ()+1 << std::setw(5) << " "; str << std::setw(5) << stpCell.getI()+1 << std::setw(5) << stpCell.getJ()+1 << std::setw(5) << " ";
} }
break; break;

2
ApplicationCode/ReservoirDataModel/RigWellPathStimplanIntersector.cpp
View File

@@ -26,7 +26,7 @@ RigWellPathStimplanIntersector::RigWellPathStimplanIntersector(const RigWellPath
fracturePolygonf = stimPlanFractureTemplate->fracturePolygon(rimFracture->fractureUnit()); fracturePolygonf = stimPlanFractureTemplate->fracturePolygon(rimFracture->fractureUnit());
{ {
const std::vector<RigStimPlanFracTemplateCell>& stpCells = stimPlanFractureTemplate->getStimPlanCells(); const std::vector<RigStimPlanFracTemplateCell>& stpCells = stimPlanFractureTemplate->fractureGrid().getStimPlanCells();
for ( const auto& stpCell: stpCells ) stpCellPolygons.push_back(stpCell.getPolygon()); for ( const auto& stpCell: stpCells ) stpCellPolygons.push_back(stpCell.getPolygon());
} }
} }