Skip to content

struct reorg #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
magnesj wants to merge 18 commits into
base: dev
Choose a base branch
from
Open

struct reorg #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
037d78f
move defines to cvfStructGridDefines
magnesj Jul 27, 2024
9307c73
Rename to defines
magnesj Jul 27, 2024
457f6a2
Cleanup
magnesj Jul 27, 2024
7249f23
Fixes by clang-format
magnesj Jul 27, 2024
0aa22b0
add include
magnesj Jul 27, 2024
b17ca04
fix missing include
magnesj Jul 27, 2024
daf2def
simplifications
magnesj Jul 29, 2024
78668aa
Improve readability
magnesj Jul 29, 2024
6354263
Code fixes
magnesj Jul 30, 2024
60e3430
add range filter
magnesj Jul 30, 2024
d0a0d4e
Add CommonCode unit test
magnesj Jul 30, 2024
4185a72
Fix includes
magnesj Jul 30, 2024
dc6d87b
Use brace init
magnesj Jul 30, 2024
4f08e1f
avoid double namespace prefix
magnesj Jul 30, 2024
8d070fd
Fixes by clang-format
magnesj Jul 30, 2024
d2e1fbf
fix include
magnesj Jul 30, 2024
5928469
Fixes by clang-format
magnesj Jul 30, 2024
6a46865
simplification
magnesj Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,14 +1012,14 @@ std::vector<WellPathCellIntersectionInfo>
extraIntersection.endPoint = firstIntersection.startPoint;
extraIntersection.startMD = initialMD;
extraIntersection.endMD = firstIntersection.startMD;
extraIntersection.intersectedCellFaceIn = cvf::StructGridInterface::NO_FACE;
extraIntersection.intersectedCellFaceIn = cvf::StructGridDefines::NO_FACE;

if ( firstIntersection.intersectedCellFaceIn != cvf::StructGridInterface::NO_FACE )
if ( firstIntersection.intersectedCellFaceIn != cvf::StructGridDefines::NO_FACE )
Comment thread
magnesj marked this conversation as resolved.

{
extraIntersection.intersectedCellFaceOut = cvf::StructGridInterface::oppositeFace( firstIntersection.intersectedCellFaceIn );
extraIntersection.intersectedCellFaceOut = cvf::StructGridDefines::oppositeFace( firstIntersection.intersectedCellFaceIn );
}
else if ( firstIntersection.intersectedCellFaceOut != cvf::StructGridInterface::NO_FACE )
else if ( firstIntersection.intersectedCellFaceOut != cvf::StructGridDefines::NO_FACE )
{
extraIntersection.intersectedCellFaceOut = firstIntersection.intersectedCellFaceOut;
}
Expand Down Expand Up @@ -1056,7 +1056,7 @@ std::vector<WellPathCellIntersectionInfo>
extraIntersection.endPoint = intersection.endPoint;
extraIntersection.startMD = initialMD;
extraIntersection.endMD = intersection.endMD;
extraIntersection.intersectedCellFaceIn = cvf::StructGridInterface::NO_FACE;
extraIntersection.intersectedCellFaceIn = cvf::StructGridDefines::NO_FACE;
extraIntersection.intersectedCellFaceOut = intersection.intersectedCellFaceOut;

const RigMainGrid* grid = eclipseCase->mainGrid();
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/Commands/EclipseCommands/RicEclipseHideFaultFeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void RicEclipseHideFaultFeature::onActionTriggered( bool isChecked )
int currentFaceIndex = list[1].toInt();

const RigFault* fault =
eclView->mainGrid()->findFaultFromCellIndexAndCellFace( currentCellIndex, cvf::StructGridInterface::FaceType( currentFaceIndex ) );
eclView->mainGrid()->findFaultFromCellIndexAndCellFace( currentCellIndex, cvf::StructGridDefines::FaceType( currentFaceIndex ) );
if ( fault )
{
QString faultName = fault->name();
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/Commands/GeoMechCommands/RicNewFaultReactModelingFeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void RicNewFaultReactModelingFeature::onActionTriggered( bool isChecked )
size_t currentCellIndex = static_cast<size_t>( list[0].toULongLong() );
int currentFaceIndex = list[1].toInt();

auto face = cvf::StructGridInterface::FaceType( currentFaceIndex );
auto face = cvf::StructGridDefines::FaceType( currentFaceIndex );

const RigFault* fault = eclView->mainGrid()->findFaultFromCellIndexAndCellFace( currentCellIndex, face );
if ( fault )
Expand Down
84 changes: 42 additions & 42 deletions ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,11 +584,11 @@ void RifEclipseInputFileTools::saveFault( QTextStream&

if ( refinement != cvf::Vec3st( 1, 1, 1 ) )
{
auto gridAxis = cvf::StructGridInterface::gridAxisFromFace( faultCellAndFace.m_nativeFace );
auto gridAxis = cvf::StructGridDefines::gridAxisFromFace( faultCellAndFace.m_nativeFace );

if ( gridAxis == cvf::StructGridInterface::GridAxisType::AXIS_I )
if ( gridAxis == cvf::StructGridDefines::GridAxisType::AXIS_I )
{
if ( faultCellAndFace.m_nativeFace == cvf::StructGridInterface::POS_I )
if ( faultCellAndFace.m_nativeFace == cvf::StructGridDefines::POS_I )
{
shifted_i += refinement.x() - 1;
}
Expand All @@ -601,9 +601,9 @@ void RifEclipseInputFileTools::saveFault( QTextStream&
}
}
}
else if ( gridAxis == cvf::StructGridInterface::GridAxisType::AXIS_J )
else if ( gridAxis == cvf::StructGridDefines::GridAxisType::AXIS_J )
{
if ( faultCellAndFace.m_nativeFace == cvf::StructGridInterface::POS_J )
if ( faultCellAndFace.m_nativeFace == cvf::StructGridDefines::POS_J )
{
shifted_j += refinement.y() - 1;
}
Expand All @@ -617,9 +617,9 @@ void RifEclipseInputFileTools::saveFault( QTextStream&
}
}
}
else if ( gridAxis == cvf::StructGridInterface::GridAxisType::AXIS_K )
else if ( gridAxis == cvf::StructGridDefines::GridAxisType::AXIS_K )
{
if ( faultCellAndFace.m_nativeFace == cvf::StructGridInterface::POS_K )
if ( faultCellAndFace.m_nativeFace == cvf::StructGridDefines::POS_K )
{
shifted_k += refinement.z() - 1;
}
Expand All @@ -643,22 +643,22 @@ void RifEclipseInputFileTools::saveFault( QTextStream&
// Sort order: i, j, face then k.
std::sort( faultCellAndFaces.begin(), faultCellAndFaces.end(), RigFault::ordering );

size_t lastI = std::numeric_limits<size_t>::max();
size_t lastJ = std::numeric_limits<size_t>::max();
size_t lastK = std::numeric_limits<size_t>::max();
size_t startK = std::numeric_limits<size_t>::max();
cvf::StructGridInterface::FaceType lastFaceType = cvf::StructGridInterface::FaceType::NO_FACE;
size_t lastI = std::numeric_limits<size_t>::max();
size_t lastJ = std::numeric_limits<size_t>::max();
size_t lastK = std::numeric_limits<size_t>::max();
size_t startK = std::numeric_limits<size_t>::max();
cvf::StructGridDefines::FaceType lastFaceType = cvf::StructGridDefines::FaceType::NO_FACE;

for ( const RigFault::CellAndFace& faultCellAndFace : faultCellAndFaces )
{
size_t i, j, k;
cvf::StructGridInterface::FaceType faceType;
size_t i, j, k;
cvf::StructGridDefines::FaceType faceType;
std::tie( i, j, k, faceType ) = faultCellAndFace;

if ( i != lastI || j != lastJ || lastFaceType != faceType || k != lastK + 1 )
{
// No fault should have no face
if ( lastFaceType != cvf::StructGridInterface::FaceType::NO_FACE )
if ( lastFaceType != cvf::StructGridDefines::FaceType::NO_FACE )
{
writeFaultLine( stream, faultName, lastI, lastJ, startK, lastK, lastFaceType );
}
Expand All @@ -675,7 +675,7 @@ void RifEclipseInputFileTools::saveFault( QTextStream&
}

// No fault should have no face
if ( lastFaceType != cvf::StructGridInterface::FaceType::NO_FACE )
if ( lastFaceType != cvf::StructGridDefines::FaceType::NO_FACE )
{
writeFaultLine( stream, faultName, lastI, lastJ, startK, lastK, lastFaceType );
}
Expand Down Expand Up @@ -1009,13 +1009,13 @@ qint64 RifEclipseInputFileTools::findKeyword( const QString& keyword, QFile& fil
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifEclipseInputFileTools::writeFaultLine( QTextStream& stream,
QString faultName,
size_t i,
size_t j,
size_t startK,
size_t endK,
cvf::StructGridInterface::FaceType faceType )
void RifEclipseInputFileTools::writeFaultLine( QTextStream& stream,
QString faultName,
size_t i,
size_t j,
size_t startK,
size_t endK,
cvf::StructGridDefines::FaceType faceType )
{
// Convert indices to eclipse format
i++;
Expand All @@ -1032,21 +1032,21 @@ void RifEclipseInputFileTools::writeFaultLine( QTextStream&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RifEclipseInputFileTools::faultFaceText( cvf::StructGridInterface::FaceType faceType )
QString RifEclipseInputFileTools::faultFaceText( cvf::StructGridDefines::FaceType faceType )
{
switch ( faceType )
{
case cvf::StructGridInterface::POS_I:
case cvf::StructGridDefines::POS_I:
return QString( "I " );
case cvf::StructGridInterface::NEG_I:
case cvf::StructGridDefines::NEG_I:
return QString( "I-" );
case cvf::StructGridInterface::POS_J:
case cvf::StructGridDefines::POS_J:
return QString( "J " );
case cvf::StructGridInterface::NEG_J:
case cvf::StructGridDefines::NEG_J:
return QString( "J-" );
case cvf::StructGridInterface::POS_K:
case cvf::StructGridDefines::POS_K:
return QString( "K " );
case cvf::StructGridInterface::NEG_K:
case cvf::StructGridDefines::NEG_K:
return QString( "K-" );
default:
CVF_ASSERT( false );
Expand Down Expand Up @@ -1382,33 +1382,33 @@ RiaDefines::EclipseUnitSystem RifEclipseInputFileTools::readUnitSystem( QFile& f
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::StructGridInterface::FaceEnum RifEclipseInputFileTools::faceEnumFromText( const QString& faceString )
cvf::StructGridDefines::FaceEnum RifEclipseInputFileTools::faceEnumFromText( const QString& faceString )
{
QString upperCaseText = faceString.toUpper().trimmed();

if ( upperCaseText.size() > 1 )
{
QString firstTwoChars = upperCaseText.mid( 0, 2 );

if ( firstTwoChars == "X+" || firstTwoChars == "I+" ) return cvf::StructGridInterface::POS_I;
if ( firstTwoChars == "Y+" || firstTwoChars == "J+" ) return cvf::StructGridInterface::POS_J;
if ( firstTwoChars == "Z+" || firstTwoChars == "K+" ) return cvf::StructGridInterface::POS_K;
if ( firstTwoChars == "X+" || firstTwoChars == "I+" ) return cvf::StructGridDefines::POS_I;
if ( firstTwoChars == "Y+" || firstTwoChars == "J+" ) return cvf::StructGridDefines::POS_J;
if ( firstTwoChars == "Z+" || firstTwoChars == "K+" ) return cvf::StructGridDefines::POS_K;

if ( firstTwoChars == "X-" || firstTwoChars == "I-" ) return cvf::StructGridInterface::NEG_I;
if ( firstTwoChars == "Y-" || firstTwoChars == "J-" ) return cvf::StructGridInterface::NEG_J;
if ( firstTwoChars == "Z-" || firstTwoChars == "K-" ) return cvf::StructGridInterface::NEG_K;
if ( firstTwoChars == "X-" || firstTwoChars == "I-" ) return cvf::StructGridDefines::NEG_I;
if ( firstTwoChars == "Y-" || firstTwoChars == "J-" ) return cvf::StructGridDefines::NEG_J;
if ( firstTwoChars == "Z-" || firstTwoChars == "K-" ) return cvf::StructGridDefines::NEG_K;
}

if ( upperCaseText.size() > 0 )
{
QString firstChar = upperCaseText.mid( 0, 1 );

if ( firstChar == "X" || firstChar == "I" ) return cvf::StructGridInterface::POS_I;
if ( firstChar == "Y" || firstChar == "J" ) return cvf::StructGridInterface::POS_J;
if ( firstChar == "Z" || firstChar == "K" ) return cvf::StructGridInterface::POS_K;
if ( firstChar == "X" || firstChar == "I" ) return cvf::StructGridDefines::POS_I;
if ( firstChar == "Y" || firstChar == "J" ) return cvf::StructGridDefines::POS_J;
if ( firstChar == "Z" || firstChar == "K" ) return cvf::StructGridDefines::POS_K;
}

return cvf::StructGridInterface::NO_FACE;
return cvf::StructGridDefines::NO_FACE;
}

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1554,7 +1554,7 @@ void RifEclipseInputFileTools::readFaults( QFile& data, qint64 filePos, cvf::Col

QString faceString = entries[7];

cvf::StructGridInterface::FaceEnum cellFaceEnum = RifEclipseInputFileTools::faceEnumFromText( faceString );
cvf::StructGridDefines::FaceEnum cellFaceEnum = RifEclipseInputFileTools::faceEnumFromText( faceString );

// Adjust from 1-based to 0-based cell indices
// Guard against invalid cell ranges by limiting lowest possible range value to zero
Expand Down
18 changes: 9 additions & 9 deletions ApplicationLibCode/FileInterface/RifEclipseInputFileTools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class RifEclipseInputFileTools : public cvf::Object

static RiaDefines::EclipseUnitSystem readUnitSystem( QFile& file, qint64 gridunitPos );

static cvf::StructGridInterface::FaceEnum faceEnumFromText( const QString& faceString );
static cvf::StructGridDefines::FaceEnum faceEnumFromText( const QString& faceString );

static bool hasGridData( const QString& fileName );

Expand Down Expand Up @@ -152,13 +152,13 @@ class RifEclipseInputFileTools : public cvf::Object

static qint64 findKeyword( const QString& keyword, QFile& file, qint64 startPos );

static void writeFaultLine( QTextStream& stream,
QString faultName,
size_t i,
size_t j,
size_t startK,
size_t endK,
cvf::StructGridInterface::FaceType faceType );
static void writeFaultLine( QTextStream& stream,
QString faultName,
size_t i,
size_t j,
size_t startK,
size_t endK,
cvf::StructGridDefines::FaceType faceType );

static QString faultFaceText( cvf::StructGridInterface::FaceType faceType );
static QString faultFaceText( cvf::StructGridDefines::FaceType faceType );
};
2 changes: 1 addition & 1 deletion ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ cvf::Vec3d RigFemPartGrid::maxCoordinate() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigFemPartGrid::cellIJKNeighbor( size_t i, size_t j, size_t k, FaceType face, size_t* neighborCellIndex ) const
bool RigFemPartGrid::cellIJKNeighbor( size_t i, size_t j, size_t k, cvf::StructGridDefines::FaceType face, size_t* neighborCellIndex ) const
{
CVF_ASSERT( false );
return false;
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartGrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class RigFemPartGrid : public cvf::StructGridInterface
bool isCellValid( size_t i, size_t j, size_t k ) const override;
cvf::Vec3d minCoordinate() const override;
cvf::Vec3d maxCoordinate() const override;
bool cellIJKNeighbor( size_t i, size_t j, size_t k, FaceType face, size_t* neighborCellIndex ) const override;
bool cellIJKNeighbor( size_t i, size_t j, size_t k, cvf::StructGridDefines::FaceType face, size_t* neighborCellIndex ) const override;

bool cellIJKFromCoordinate( const cvf::Vec3d& coord, size_t* i, size_t* j, size_t* k ) const override;
void cellMinMaxCordinates( size_t cellIndex, cvf::Vec3d* minCoordinate, cvf::Vec3d* maxCoordinate ) const override;
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorCompaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void findReferenceElementForNode( const RigFemPart& part, size_t nodeIdx, size_t
if ( nodeToIntersectionDistance < refElement->intersectionPointToCurrentNodeDistance )
{
cvf::ubyte faceNodes[4];
RigFemPartGrid::cellFaceVertexIndices( intersection.m_face, faceNodes );
cvf::StructGridDefines::cellFaceVertexIndices( intersection.m_face, faceNodes );
std::vector<size_t> topFaceCoords(
{ nodeIndices[faceNodes[0]], nodeIndices[faceNodes[1]], nodeIndices[faceNodes[2]], nodeIndices[faceNodes[3]] } );

Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#include "RimViewController.h"
#include "RimViewLinker.h"

#include "cvfCellRangeFilter.h"
#include "cvfStructGrid.h"
#include "cvfStructGridGeometryGenerator.h"

#include <cmath>

Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#include "RivGeoMechPartMgrCache.h"
#include "RivReservoirViewPartMgr.h"

#include "cvfCellRangeFilter.h"
#include "cvfModelBasicList.h"
#include "cvfStructGridGeometryGenerator.h"

//--------------------------------------------------------------------------------------------------
///
Expand Down
Loading