From 77c8edf3482fa79830d1eed3f7d9eb98e3559ba2 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sat, 9 Aug 2014 14:51:00 +0200 Subject: [PATCH] Removed obsolete code --- .../ModelVisualization/RivGridPartMgr.cpp | 118 ------------------ .../ModelVisualization/RivGridPartMgr.h | 5 - 2 files changed, 123 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp index 21ef0d7169..712c4e1e45 100644 --- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp @@ -394,124 +394,6 @@ cvf::ref RivGridPartMgr::createPerVertexColoringEffect(float opacit } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RivTransmissibilityColorMapper::updateCombinedTransmissibilityTextureCoordinates(RimResultSlot* cellResultSlot, - const RigGridBase* grid, - cvf::Vec2fArray* textureCoords, - const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper) -{ - const cvf::ScalarMapper* mapper = cellResultSlot->legendConfig()->scalarMapper(); - if (!mapper) return; - - const RimReservoirCellResultsStorage* gridCellResults = cellResultSlot->currentGridCellResults(); - if (!gridCellResults) return; - - RigCaseData* eclipseCase = cellResultSlot->reservoirView()->eclipseCase()->reservoirData(); - if (!eclipseCase) return; - - size_t tranPosXScalarSetIndex, tranPosYScalarSetIndex, tranPosZScalarSetIndex; - if (!gridCellResults->cellResults()->findTransmissibilityResults(tranPosXScalarSetIndex, tranPosYScalarSetIndex, tranPosZScalarSetIndex)) return; - - // If the result is static, only read that. - size_t resTimeStepIdx = 0; - - RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResultSlot->porosityModel()); - - cvf::ref dataAccessObjectTranX = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, resTimeStepIdx, tranPosXScalarSetIndex); - cvf::ref dataAccessObjectTranY = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, resTimeStepIdx, tranPosYScalarSetIndex); - cvf::ref dataAccessObjectTranZ = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, resTimeStepIdx, tranPosZScalarSetIndex); - - - int quadCount = static_cast(quadToCellFaceMapper->quadCount()); - size_t numVertices = quadCount*4; - - textureCoords->resize(numVertices); - cvf::Vec2f* rawPtr = textureCoords->ptr(); - - double cellScalarValue; - cvf::Vec2f texCoord; - -#pragma omp parallel for private(texCoord, cellScalarValue) - for (int quadIdx = 0; quadIdx < quadCount; quadIdx++) - { - cellScalarValue = HUGE_VAL; - - size_t cellIndex = quadToCellFaceMapper->cellIndex(quadIdx); - cvf::StructGridInterface::FaceType cellFace = quadToCellFaceMapper->cellFace(quadIdx); - - switch (cellFace) - { - case cvf::StructGridInterface::POS_I: - { - cellScalarValue = dataAccessObjectTranX->cellScalar(cellIndex); - } - break; - case cvf::StructGridInterface::NEG_I: - { - size_t i, j, k, neighborGridCellIdx; - grid->ijkFromCellIndex(cellIndex, &i, &j, &k); - - if(grid->cellIJKNeighbor(i, j, k, cvf::StructGridInterface::NEG_I, &neighborGridCellIdx)) - { - cellScalarValue = dataAccessObjectTranX->cellScalar(neighborGridCellIdx); - } - } - break; - case cvf::StructGridInterface::POS_J: - { - cellScalarValue = dataAccessObjectTranY->cellScalar(cellIndex); - } - break; - case cvf::StructGridInterface::NEG_J: - { - size_t i, j, k, neighborGridCellIdx; - grid->ijkFromCellIndex(cellIndex, &i, &j, &k); - - if(grid->cellIJKNeighbor(i, j, k, cvf::StructGridInterface::NEG_J, &neighborGridCellIdx)) - { - cellScalarValue = dataAccessObjectTranY->cellScalar(neighborGridCellIdx); - } - } - break; - case cvf::StructGridInterface::POS_K: - { - cellScalarValue = dataAccessObjectTranZ->cellScalar(cellIndex); - } - break; - case cvf::StructGridInterface::NEG_K: - { - size_t i, j, k, neighborGridCellIdx; - grid->ijkFromCellIndex(cellIndex, &i, &j, &k); - - if(grid->cellIJKNeighbor(i, j, k, cvf::StructGridInterface::NEG_K, &neighborGridCellIdx)) - { - cellScalarValue = dataAccessObjectTranZ->cellScalar(neighborGridCellIdx); - } - } - break; - default: - CVF_ASSERT(false); - } - - - texCoord = mapper->mapToTextureCoord(cellScalarValue); - if (cellScalarValue == HUGE_VAL || cellScalarValue != cellScalarValue) // a != a is true for NAN's - { - texCoord[1] = 1.0f; - } - - size_t j; - for (j = 0; j < 4; j++) - { - rawPtr[quadIdx*4 + j] = texCoord; - } - } - -} - - //-------------------------------------------------------------------------------------------------- /// Helper class used to provide zero for all cells /// This way we can avoid to test if a StructGridScalarDataAccess object is valid before reading out the value. diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.h b/ApplicationCode/ModelVisualization/RivGridPartMgr.h index ed6efb4c11..4985a360bf 100644 --- a/ApplicationCode/ModelVisualization/RivGridPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.h @@ -44,11 +44,6 @@ class RimCellEdgeResultSlot; class RivTransmissibilityColorMapper { public: - static void updateCombinedTransmissibilityTextureCoordinates( - RimResultSlot* cellResultSlot, - const RigGridBase* grid, - cvf::Vec2fArray* textureCoords, - const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper); static void updateTernarySaturationColorArray( size_t timeStepIndex,