From b9cfdd774ac3c5db32c6e4570d1eb9cf59a28f43 Mon Sep 17 00:00:00 2001 From: jonjenssen Date: Mon, 4 Mar 2024 13:46:07 +0100 Subject: [PATCH] Work in progress --- ApplicationLibCode/FileInterface/RifOpmGridTools.cpp | 9 ++++++--- ApplicationLibCode/FileInterface/RifOpmGridTools.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ApplicationLibCode/FileInterface/RifOpmGridTools.cpp b/ApplicationLibCode/FileInterface/RifOpmGridTools.cpp index 9c3886ccf6..6ee574993d 100644 --- a/ApplicationLibCode/FileInterface/RifOpmGridTools.cpp +++ b/ApplicationLibCode/FileInterface/RifOpmGridTools.cpp @@ -72,7 +72,7 @@ void RifOpmGridTools::importCoordinatesForRadialGrid( const std::string& gridFil if ( opmMainGrid.is_radial() ) { - transferCoordinates( opmMainGrid, opmMainGrid, riMainGrid, riMainGrid ); + transferCoordinatesRadial( opmMainGrid, opmMainGrid, riMainGrid, riMainGrid ); } auto lgrNames = opmMainGrid.list_of_lgrs(); @@ -87,7 +87,7 @@ void RifOpmGridTools::importCoordinatesForRadialGrid( const std::string& gridFil auto riLgrGrid = riMainGrid->gridByIndex( i ); if ( riLgrGrid->gridName() == lgrName ) { - transferCoordinates( opmMainGrid, opmLgrGrid, riMainGrid, riLgrGrid ); + transferCoordinatesRadial( opmMainGrid, opmLgrGrid, riMainGrid, riLgrGrid ); } } } @@ -202,7 +202,10 @@ std::vector> RifOpmGridTools::activeCellsFromActnumKeyword( Opm // 3. Find the closest point on this pillar, and use this point as the adjusted coordinate for the node // //-------------------------------------------------------------------------------------------------- -void RifOpmGridTools::transferCoordinates( Opm::EclIO::EGrid& opmMainGrid, Opm::EclIO::EGrid& opmGrid, RigMainGrid* riMainGrid, RigGridBase* riGrid ) +void RifOpmGridTools::transferCoordinatesRadial( Opm::EclIO::EGrid& opmMainGrid, + Opm::EclIO::EGrid& opmGrid, + RigMainGrid* riMainGrid, + RigGridBase* riGrid ) { size_t cellCount = opmGrid.totalNumberOfCells(); if ( cellCount != riGrid->cellCount() ) return; diff --git a/ApplicationLibCode/FileInterface/RifOpmGridTools.h b/ApplicationLibCode/FileInterface/RifOpmGridTools.h index d196f74a40..482211c7aa 100644 --- a/ApplicationLibCode/FileInterface/RifOpmGridTools.h +++ b/ApplicationLibCode/FileInterface/RifOpmGridTools.h @@ -49,7 +49,7 @@ class RifOpmGridTools static std::vector> activeCellsFromActnumKeyword( Opm::EclIO::EGrid& grid ); - static void transferCoordinates( Opm::EclIO::EGrid& opmMainGrid, Opm::EclIO::EGrid& opmGrid, RigMainGrid* riMainGrid, RigGridBase* riGrid ); + static void transferCoordinatesRadial( Opm::EclIO::EGrid& opmMainGrid, Opm::EclIO::EGrid& opmGrid, RigMainGrid* riMainGrid, RigGridBase* riGrid ); static void transferCoordinatesCartesian( Opm::EclIO::EGrid& opmMainGrid, Opm::EclIO::EGrid& opmGrid, RigMainGrid* riMainGrid,