OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes by misspell-fixer

Browse Source
This commit is contained in:
github-actions[bot]
2020-06-04 08:24:58 +02:00
committed by Magne Sjaastad
parent 490dc1aa05
commit 674b764cb6
63 changed files with 143 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/GeoMech/GeoMechDataModel/RigFemClosestResultIndexCalculator.cpp
+4 -4
View File
@@ -37,15 +37,15 @@ RigFemClosestResultIndexCalculator::RigFemClosestResultIndexCalculator( RigFemPa
if ( resultPosition != RIG_ELEMENT_NODAL_FACE || m_face == -1 )
{
RigElementType elmType = femPart->elementType( elementIndex );
const int* elmentConn = femPart->connectivities( elementIndex );
int elmNodeCount = RigFemTypes::elmentNodeCount( elmType );
const int* elementConn = femPart->connectivities( elementIndex );
int elmNodeCount = RigFemTypes::elementNodeCount( elmType );
// Find the closest node
int closestLocalNode = -1;
float minDist = std::numeric_limits<float>::infinity();
for ( int lNodeIdx = 0; lNodeIdx < elmNodeCount; ++lNodeIdx )
{
int nodeIdx = elmentConn[lNodeIdx];
int nodeIdx = elementConn[lNodeIdx];
cvf::Vec3f nodePosInDomain = femPart->nodes().coordinates[nodeIdx];
float dist = ( nodePosInDomain - cvf::Vec3f( intersectionPointInDomain ) ).lengthSquared();
if ( dist < minDist )
@@ -57,7 +57,7 @@ RigFemClosestResultIndexCalculator::RigFemClosestResultIndexCalculator( RigFemPa
if ( closestLocalNode >= 0 )
{
int nodeIdx = elmentConn[closestLocalNode];
int nodeIdx = elementConn[closestLocalNode];
m_closestElementNodeResIdx =
static_cast<int>( femPart->elementNodeResultIdx( elementIndex, closestLocalNode ) );
ApplicationCode/GeoMech/GeoMechDataModel/RigFemNativeVisibleCellsStatCalc.h
+2 -2
View File
@@ -73,7 +73,7 @@ private:
{
if ( !( *m_cellVisibilities )[elmIdx] ) continue;
int elmNodeCount = RigFemTypes::elmentNodeCount( part->elementType( elmIdx ) );
int elmNodeCount = RigFemTypes::elementNodeCount( part->elementType( elmIdx ) );
for ( int elmLocIdx = 0; elmLocIdx < elmNodeCount; ++elmLocIdx )
{
size_t elmNodeResIdx = part->elementNodeResultIdx( elmIdx, elmLocIdx );
@@ -119,7 +119,7 @@ private:
{
if ( !( *m_cellVisibilities )[elmIdx] ) continue;
int elmNodeCount = RigFemTypes::elmentNodeCount( part->elementType( elmIdx ) );
int elmNodeCount = RigFemTypes::elementNodeCount( part->elementType( elmIdx ) );
for ( int elmLocIdx = 0; elmLocIdx < elmNodeCount; ++elmLocIdx )
{
size_t elmNodeResIdx = part->elementNodeResultIdx( elmIdx, elmLocIdx );
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPart.cpp
+10 -10
View File
@@ -60,7 +60,7 @@ void RigFemPart::appendElement( RigElementType elmType, int id, const int* conne
m_elementTypes.push_back( elmType );
m_elementConnectivityStartIndices.push_back( m_allElementConnectivities.size() );
int nodeCount = RigFemTypes::elmentNodeCount( elmType );
int nodeCount = RigFemTypes::elementNodeCount( elmType );
for ( int lnIdx = 0; lnIdx < nodeCount; ++lnIdx )
{
m_allElementConnectivities.push_back( connectivities[lnIdx] );
@@ -102,7 +102,7 @@ void RigFemPart::calculateNodeToElmRefs()
for ( int eIdx = 0; eIdx < static_cast<int>( m_elementId.size() ); ++eIdx )
{
int elmNodeCount = RigFemTypes::elmentNodeCount( elementType( eIdx ) );
int elmNodeCount = RigFemTypes::elementNodeCount( elementType( eIdx ) );
const int* elmNodes = connectivities( eIdx );
for ( int localIdx = 0; localIdx < elmNodeCount; ++localIdx )
{
@@ -158,7 +158,7 @@ void RigFemPart::calculateElmNeighbors()
RigElementType elmType = this->elementType( eIdx );
const int* elmNodes = this->connectivities( eIdx );
int faceCount = RigFemTypes::elmentFaceCount( elmType );
int faceCount = RigFemTypes::elementFaceCount( elmType );
int neighborCount = 0;
for ( int faceIdx = 0; faceIdx < faceCount; ++faceIdx )
{
@@ -225,7 +225,7 @@ void RigFemPart::calculateElmNeighbors()
RigElementType nbcElmType = this->elementType( nbcElmIdx );
const int* nbcElmNodes = this->connectivities( nbcElmIdx );
int nbcFaceCount = RigFemTypes::elmentFaceCount( nbcElmType );
int nbcFaceCount = RigFemTypes::elementFaceCount( nbcElmType );
bool isNeighborFound = false;
for ( int nbcFaceIdx = 0; nbcFaceIdx < nbcFaceCount; ++nbcFaceIdx )
{
@@ -307,11 +307,11 @@ float RigFemPart::characteristicElementSize() const
if ( eType == HEX8P )
{
const int* elmentConn = this->connectivities( elmIdx );
cvf::Vec3f nodePos0 = this->nodes().coordinates[elmentConn[0]];
cvf::Vec3f nodePos1 = this->nodes().coordinates[elmentConn[1]];
cvf::Vec3f nodePos3 = this->nodes().coordinates[elmentConn[3]];
cvf::Vec3f nodePos4 = this->nodes().coordinates[elmentConn[4]];
const int* elementConn = this->connectivities( elmIdx );
cvf::Vec3f nodePos0 = this->nodes().coordinates[elementConn[0]];
cvf::Vec3f nodePos1 = this->nodes().coordinates[elementConn[1]];
cvf::Vec3f nodePos3 = this->nodes().coordinates[elementConn[3]];
cvf::Vec3f nodePos4 = this->nodes().coordinates[elementConn[4]];
float l1 = ( nodePos1 - nodePos0 ).length();
float l3 = ( nodePos3 - nodePos0 ).length();
@@ -407,7 +407,7 @@ size_t RigFemPart::elementNodeResultCount() const
int lastElmIdx = this->elementCount() - 1;
if ( lastElmIdx < 0 ) return 0;
RigElementType elmType = this->elementType( lastElmIdx );
int elmNodeCount = RigFemTypes::elmentNodeCount( elmType );
int elmNodeCount = RigFemTypes::elementNodeCount( elmType );
size_t lastElmResultIdx = this->elementNodeResultIdx( lastElmIdx, elmNodeCount - 1 );
return lastElmResultIdx + 1;
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPart.h
+1 -1
View File
@@ -100,7 +100,7 @@ public:
void ensureIntersectionSearchTreeIsBuilt() const;
cvf::Vec3f faceNormal( int elmentIndex, int faceIndex ) const;
cvf::Vec3f faceNormal( int elementIndex, int faceIndex ) const;
const RigFemPartGrid* getOrCreateStructGrid() const;
const std::vector<int>& elementIdxToId() const { return m_elementId; }
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp
+10 -10
View File
@@ -90,7 +90,7 @@ void RigFemPartGrid::generateStructGridData()
int posJFaceIdx = ijkMainFaceIndices[1];
int posKFaceIdx = ijkMainFaceIndices[2];
m_elmentIJKCounts = cvf::Vec3st( 0, 0, 0 );
m_elementIJKCounts = cvf::Vec3st( 0, 0, 0 );
int elmIdxInK = elmIdxForIJK_000;
cvf::Vec3f posKNormal = m_femPart->faceNormal( elmIdxInK, posKFaceIdx );
@@ -131,7 +131,7 @@ void RigFemPartGrid::generateStructGridData()
// Scoped to show that nothing bleeds further to K-loop
{
if ( iCoord > static_cast<int>( m_elmentIJKCounts[0] ) ) m_elmentIJKCounts[0] = iCoord;
if ( iCoord > static_cast<int>( m_elementIJKCounts[0] ) ) m_elementIJKCounts[0] = iCoord;
++jCoord;
@@ -154,7 +154,7 @@ void RigFemPartGrid::generateStructGridData()
}
{
if ( jCoord > static_cast<int>( m_elmentIJKCounts[1] ) ) m_elmentIJKCounts[1] = jCoord;
if ( jCoord > static_cast<int>( m_elementIJKCounts[1] ) ) m_elementIJKCounts[1] = jCoord;
++kCoord;
@@ -177,10 +177,10 @@ void RigFemPartGrid::generateStructGridData()
}
}
if ( kCoord > static_cast<int>( m_elmentIJKCounts[2] ) ) m_elmentIJKCounts[2] = kCoord;
if ( kCoord > static_cast<int>( m_elementIJKCounts[2] ) ) m_elementIJKCounts[2] = kCoord;
}
m_elmIdxPrIJK.resize( m_elmentIJKCounts[0], m_elmentIJKCounts[1], m_elmentIJKCounts[2] );
m_elmIdxPrIJK.resize( m_elementIJKCounts[0], m_elementIJKCounts[1], m_elementIJKCounts[2] );
for ( int elmIdx = 0; elmIdx < m_femPart->elementCount(); ++elmIdx )
{
@@ -247,7 +247,7 @@ cvf::Vec3i RigFemPartGrid::findMainIJKFaces( int elementIndex ) const
cvf::Vec3i ijkMainFaceIndices = cvf::Vec3i( -1, -1, -1 );
RigElementType eType = m_femPart->elementType( elementIndex );
int faceCount = RigFemTypes::elmentFaceCount( eType );
int faceCount = RigFemTypes::elementFaceCount( eType );
std::vector<cvf::Vec3f> normals( faceCount );
for ( int faceIdx = 0; faceIdx < faceCount; ++faceIdx )
{
@@ -340,7 +340,7 @@ std::pair<cvf::Vec3st, cvf::Vec3st> RigFemPartGrid::reservoirIJKBoundingBox() co
int RigFemPartGrid::perpendicularFaceInDirection( cvf::Vec3f direction, int perpFaceIdx, int elmIdx )
{
RigElementType eType = m_femPart->elementType( elmIdx );
int faceCount = RigFemTypes::elmentFaceCount( eType );
int faceCount = RigFemTypes::elementFaceCount( eType );
int oppFace = RigFemTypes::oppositeFace( eType, perpFaceIdx );
@@ -370,7 +370,7 @@ int RigFemPartGrid::perpendicularFaceInDirection( cvf::Vec3f direction, int perp
//--------------------------------------------------------------------------------------------------
size_t RigFemPartGrid::gridPointCountI() const
{
return m_elmentIJKCounts[0] + 1;
return m_elementIJKCounts[0] + 1;
}
//--------------------------------------------------------------------------------------------------
@@ -378,7 +378,7 @@ size_t RigFemPartGrid::gridPointCountI() const
//--------------------------------------------------------------------------------------------------
size_t RigFemPartGrid::gridPointCountJ() const
{
return m_elmentIJKCounts[1] + 1;
return m_elementIJKCounts[1] + 1;
}
//--------------------------------------------------------------------------------------------------
@@ -386,7 +386,7 @@ size_t RigFemPartGrid::gridPointCountJ() const
//--------------------------------------------------------------------------------------------------
size_t RigFemPartGrid::gridPointCountK() const
{
return m_elmentIJKCounts[2] + 1;
return m_elementIJKCounts[2] + 1;
}
//--------------------------------------------------------------------------------------------------
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartGrid.h
+1 -1
View File
@@ -52,7 +52,7 @@ private:
const RigFemPart* m_femPart;
std::vector<cvf::Vec3i> m_ijkPrElement;
cvf::Vec3st m_elmentIJKCounts;
cvf::Vec3st m_elementIJKCounts;
private: // Unused, Not implemented
bool isCellValid( size_t i, size_t j, size_t k ) const override;
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorEnIpPorBar.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ bool RigFemPartResultCalculatorEnIpPorBar::isMatching( const RigFemResultAddress
}
//--------------------------------------------------------------------------------------------------
/// Convert POR NODAL result to POR-Bar Elment Nodal result
/// Convert POR NODAL result to POR-Bar Element Nodal result
//--------------------------------------------------------------------------------------------------
RigFemScalarResultFrames* RigFemPartResultCalculatorEnIpPorBar::calculate( int partIndex,
const RigFemResultAddress& resVarAddr )
@@ -92,7 +92,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorEnIpPorBar::calculate( int
if ( elmType == HEX8P )
{
int elmNodeCount = RigFemTypes::elmentNodeCount( elmType );
int elmNodeCount = RigFemTypes::elementNodeCount( elmType );
for ( int elmNodIdx = 0; elmNodIdx < elmNodeCount; ++elmNodIdx )
{
size_t elmNodResIdx = femPart->elementNodeResultIdx( elmIdx, elmNodIdx );
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorFormationIndices.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorFormationIndices::calculate(
for ( int elmIdx = 0; elmIdx < elementCount; ++elmIdx )
{
RigElementType elmType = femPart->elementType( elmIdx );
int elmNodeCount = RigFemTypes::elmentNodeCount( elmType );
int elmNodeCount = RigFemTypes::elementNodeCount( elmType );
size_t i, j, k;
bool validIndex = structGrid->ijkFromCellIndex( elmIdx, &i, &j, &k );
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorGamma.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ void RigFemPartResultCalculatorGamma::calculateGammaFromFrames( int
{
RigElementType elmType = femPart->elementType( elmIdx );
int elmNodeCount = RigFemTypes::elmentNodeCount( femPart->elementType( elmIdx ) );
int elmNodeCount = RigFemTypes::elementNodeCount( femPart->elementType( elmIdx ) );
if ( elmType == HEX8P )
{
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNodalGradients.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorNodalGradients::calculate( i
std::array<cvf::Vec3d, 8> hexCorners;
std::array<double, 8> cornerValues;
int elmNodeCount = RigFemTypes::elmentNodeCount( elmType );
int elmNodeCount = RigFemTypes::elementNodeCount( elmType );
for ( int elmNodIdx = 0; elmNodIdx < elmNodeCount; ++elmNodIdx )
{
size_t elmNodResIdx = femPart->elementNodeResultIdx( elmIdx, elmNodIdx );
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalSE.cpp
+1 -1
View File
@@ -120,7 +120,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorNormalSE::calculate( int
{
RigElementType elmType = femPart->elementType( elmIdx );
int elmNodeCount = RigFemTypes::elmentNodeCount( femPart->elementType( elmIdx ) );
int elmNodeCount = RigFemTypes::elementNodeCount( femPart->elementType( elmIdx ) );
if ( elmType == HEX8P )
{
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorNormalST.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorNormalST::calculate( int
{
RigElementType elmType = femPart->elementType( elmIdx );
int elmNodeCount = RigFemTypes::elmentNodeCount( femPart->elementType( elmIdx ) );
int elmNodeCount = RigFemTypes::elementNodeCount( femPart->elementType( elmIdx ) );
if ( elmType == HEX8P )
{
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp
+1 -1
View File
@@ -178,7 +178,7 @@ RigFemScalarResultFrames*
{
RigElementType elmType = femPart->elementType( elmIdx );
int elmNodeCount = RigFemTypes::elmentNodeCount( femPart->elementType( elmIdx ) );
int elmNodeCount = RigFemTypes::elementNodeCount( femPart->elementType( elmIdx ) );
if ( elmType == HEX8P )
{
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSE.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorShearSE::calculate( int part
{
RigElementType elmType = femPart->elementType( elmIdx );
int elmNodeCount = RigFemTypes::elmentNodeCount( femPart->elementType( elmIdx ) );
int elmNodeCount = RigFemTypes::elementNodeCount( femPart->elementType( elmIdx ) );
if ( elmType == HEX8P )
{
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorStressGradients.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorStressGradients::calculate(
// Find the corresponding corner values for the element
std::array<double, 8> cornerValues;
int elmNodeCount = RigFemTypes::elmentNodeCount( elmType );
int elmNodeCount = RigFemTypes::elementNodeCount( elmType );
for ( int elmNodIdx = 0; elmNodIdx < elmNodeCount; ++elmNodIdx )
{
size_t elmNodResIdx = femPart->elementNodeResultIdx( elmIdx, elmNodIdx );
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAlignedStress.cpp
+1 -1
View File
@@ -183,7 +183,7 @@ RigFemScalarResultFrames*
for ( int elmIdx = 0; elmIdx < elementCount; ++elmIdx )
{
RigElementType elmType = femPart->elementType( elmIdx );
int faceCount = RigFemTypes::elmentFaceCount( elmType );
int faceCount = RigFemTypes::elementFaceCount( elmType );
const int* elmNodeIndices = femPart->connectivities( elmIdx );
int elmNodFaceResIdxElmStart = elmIdx * 24; // HACK should get from part
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorSurfaceAngles.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ RigFemScalarResultFrames* RigFemPartResultCalculatorSurfaceAngles::calculate( in
for ( int elmIdx = 0; elmIdx < elementCount; ++elmIdx )
{
RigElementType elmType = femPart->elementType( elmIdx );
int faceCount = RigFemTypes::elmentFaceCount( elmType );
int faceCount = RigFemTypes::elementFaceCount( elmType );
const int* elmNodeIndices = femPart->connectivities( elmIdx );
int elmNodFaceResIdxElmStart = elmIdx * 24; // HACK should get from part
ApplicationCode/GeoMech/GeoMechDataModel/RigFemTypes.cpp
+2 -2
View File
@@ -26,7 +26,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RigFemTypes::elmentNodeCount( RigElementType elmType )
int RigFemTypes::elementNodeCount( RigElementType elmType )
{
static int elementTypeCounts[3] = {8, 8, 4};
@@ -36,7 +36,7 @@ int RigFemTypes::elmentNodeCount( RigElementType elmType )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RigFemTypes::elmentFaceCount( RigElementType elmType )
int RigFemTypes::elementFaceCount( RigElementType elmType )
{
const static int elementFaceCounts[3] = {6, 6, 1};
ApplicationCode/GeoMech/GeoMechDataModel/RigFemTypes.h
+2 -2
View File
@@ -32,8 +32,8 @@ enum RigElementType
class RigFemTypes
{
public:
static int elmentNodeCount( RigElementType elmType );
static int elmentFaceCount( RigElementType elmType );
static int elementNodeCount( RigElementType elmType );
static int elementFaceCount( RigElementType elmType );
static const int* localElmNodeIndicesForFace( RigElementType elmType, int faceIdx, int* faceNodeCount );
static int oppositeFace( RigElementType elmType, int faceIdx );
static const int* localElmNodeToIntegrationPointMapping( RigElementType elmType );
ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp
+1 -1
View File
@@ -197,7 +197,7 @@ void RivFemElmVisibilityCalculator::computePropertyVisibility( cvf::UByteArray*
if ( !( *cellVisibility )[cellIndex] ) continue;
RigElementType eType = grid->elementType( cellIndex );
int elmNodeCount = RigFemTypes::elmentNodeCount( eType );
int elmNodeCount = RigFemTypes::elementNodeCount( eType );
const int* elmNodeIndices = grid->connectivities( cellIndex );
for ( int enIdx = 0; enIdx < elmNodeCount; ++enIdx )
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.cpp
+2 -2
View File
@@ -188,7 +188,7 @@ void RivFemPartGeometryGenerator::computeArrays()
if ( m_elmVisibility.isNull() || ( *m_elmVisibility )[elmIdx] )
{
RigElementType eType = m_part->elementType( elmIdx );
int faceCount = RigFemTypes::elmentFaceCount( eType );
int faceCount = RigFemTypes::elementFaceCount( eType );
const int* elmNodeIndices = m_part->connectivities( elmIdx );
@@ -300,7 +300,7 @@ cvf::ref<cvf::DrawableGeo>
const std::vector<cvf::Vec3f>& nodeCoordinates = part->nodes().coordinates;
RigElementType eType = part->elementType( elmIdx );
int faceCount = RigFemTypes::elmentFaceCount( eType );
int faceCount = RigFemTypes::elementFaceCount( eType );
const int* elmNodeIndices = part->connectivities( elmIdx );
ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp
+1 -1
View File
@@ -396,7 +396,7 @@ bool RifOdbReader::readFemParts( RigFemPartCollection* femParts )
int nodeCount = 0;
const int* idBasedConnectivities = odbElm.connectivity( nodeCount );
CVF_TIGHT_ASSERT( nodeCount == RigFemTypes::elmentNodeCount( elmType ) );
CVF_TIGHT_ASSERT( nodeCount == RigFemTypes::elementNodeCount( elmType ) );
indexBasedConnectivities.resize( nodeCount );
for ( int lnIdx = 0; lnIdx < nodeCount; ++lnIdx )