From 0458ac38d76e36739882713f8c48104ca9728026 Mon Sep 17 00:00:00 2001 From: astridkbjorke Date: Tue, 30 May 2017 10:00:04 +0200 Subject: [PATCH] #1487 Small fixes after merge --- ApplicationCode/FileInterface/RifFractureExportTools.cpp | 8 ++++---- .../ReservoirDataModel/RigTransmissibilityCondenser.cpp | 2 +- .../ReservoirDataModel/RigWellPathStimplanIntersector.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ApplicationCode/FileInterface/RifFractureExportTools.cpp b/ApplicationCode/FileInterface/RifFractureExportTools.cpp index b1977c8bb5..e5e6211279 100644 --- a/ApplicationCode/FileInterface/RifFractureExportTools.cpp +++ b/ApplicationCode/FileInterface/RifFractureExportTools.cpp @@ -262,16 +262,16 @@ void RifFractureExportTools::exportWellPathFracturesToEclipseDataInputFile(const ////// // 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); const RigStimPlanFracTemplateCell stimPlanCell = fractureGrid.stimPlanCellFromIndex(stimPlanCellIndex); 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); 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); const RigStimPlanFracTemplateCell stimPlanCellNeighbourZ = fractureGrid.stimPlanCellFromIndex(stimPlanCellNeighbourZIndex); diff --git a/ApplicationCode/ReservoirDataModel/RigTransmissibilityCondenser.cpp b/ApplicationCode/ReservoirDataModel/RigTransmissibilityCondenser.cpp index 7be0b77179..d9e9e1b71f 100644 --- a/ApplicationCode/ReservoirDataModel/RigTransmissibilityCondenser.cpp +++ b/ApplicationCode/ReservoirDataModel/RigTransmissibilityCondenser.cpp @@ -200,7 +200,7 @@ void printCellAddress(std::stringstream& str, case CellAddress::STIMPLAN: { 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) << " "; } break; diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathStimplanIntersector.cpp b/ApplicationCode/ReservoirDataModel/RigWellPathStimplanIntersector.cpp index 186337b552..2d0cf3f925 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathStimplanIntersector.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellPathStimplanIntersector.cpp @@ -26,7 +26,7 @@ RigWellPathStimplanIntersector::RigWellPathStimplanIntersector(const RigWellPath fracturePolygonf = stimPlanFractureTemplate->fracturePolygon(rimFracture->fractureUnit()); { - const std::vector& stpCells = stimPlanFractureTemplate->getStimPlanCells(); + const std::vector& stpCells = stimPlanFractureTemplate->fractureGrid().getStimPlanCells(); for ( const auto& stpCell: stpCells ) stpCellPolygons.push_back(stpCell.getPolygon()); } }