Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
jonjenssen committed Mar 19, 2024
1 parent 33d4d9d commit b9cfdd7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions ApplicationLibCode/FileInterface/RifOpmGridTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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 );
}
}
}
Expand Down Expand Up @@ -202,7 +202,10 @@ std::vector<std::vector<int>> 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;
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/FileInterface/RifOpmGridTools.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class RifOpmGridTools

static std::vector<std::vector<int>> 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,
Expand Down

0 comments on commit b9cfdd7

Please sign in to comment.