Skip to content

Commit

Permalink
build fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Tomin authored and Pavel Tomin committed Dec 9, 2024
1 parent 5caf9aa commit c84e27a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 33 deletions.
2 changes: 0 additions & 2 deletions src/coreComponents/mesh/generators/CellBlockManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,6 @@ void CellBlockManager::buildMaps()
buildNodeToEdges();

fillElementToEdgesOfCellBlocks( m_faceToEdges.toViewConst(), this->getCellBlocks() );

}

ArrayOfArrays< localIndex > CellBlockManager::getFaceToNodes() const
Expand Down Expand Up @@ -748,7 +747,6 @@ localIndex CellBlockManager::numFaces() const
return m_numFaces;
}


ArrayOfArrays< localIndex > CellBlockManager::getEdgeToFaces() const
{
return m_edgeToFaces;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,51 +135,40 @@ void EmbeddedSurfaceGenerator::initializePostSubGroups()

if( !faceBlockName.empty() )
{

CellBlockManagerABC const & cellBlockManager = meshBody.getCellBlockManager();
Group const & embSurfBlocks = cellBlockManager.getEmbeddedSurfaceBlocks();
if( embSurfBlocks.hasGroup( faceBlockName ))
{
EmbeddedSurfaceBlockABC const & embSurf = embSurfBlocks.getGroup< EmbeddedSurfaceBlockABC >( faceBlockName );


elemManager.forElementSubRegionsComplete< CellElementSubRegion >(
[&]( localIndex const er, localIndex const esr, ElementRegionBase &, CellElementSubRegion & subRegion )
{
arrayView2d< localIndex const, cells::NODE_MAP_USD > const cellToNodes = subRegion.nodeList();
FixedOneToManyRelation const & cellToEdges = subRegion.edgeList();

arrayView1d< integer const > const ghostRank = subRegion.ghostRank();
bool added = embeddedSurfaceSubRegion.addAllEmbeddedSurfaces( er,
esr,
nodeManager,
embSurfNodeManager,
edgeManager,
cellToEdges,
embSurf );

if( added )
{
bool added = embeddedSurfaceSubRegion.addAllEmbeddedSurfaces( er,
esr,
nodeManager,
embSurfNodeManager,
edgeManager,
cellToEdges,
embSurf );

if( added )
// Add all the fracture information to the CellElementSubRegion
for( localIndex edfmIndex=0; edfmIndex < embSurf.numEmbeddedSurfElem(); ++edfmIndex )
{
// Add all the fracture information to the CellElementSubRegion
for( localIndex edfmIndex=0; edfmIndex < embSurf.numEmbeddedSurfElem(); ++edfmIndex )
{
localIndex cellIndex = embSurf.getEmbeddedSurfElemTo3dElem().toCellIndex[edfmIndex][0];
subRegion.addFracturedElement( cellIndex, edfmIndex );
newObjects.newElements[ {embeddedSurfaceRegion.getIndexInParent(), embeddedSurfaceSubRegion.getIndexInParent()} ].insert( edfmIndex );
}
localIndex cellIndex = embSurf.getEmbeddedSurfElemTo3dElem().toCellIndex[edfmIndex][0];
subRegion.addFracturedElement( cellIndex, edfmIndex );
newObjects.newElements[ {embeddedSurfaceRegion.getIndexInParent(), embeddedSurfaceSubRegion.getIndexInParent()} ].insert( edfmIndex );
}
}
} );// end loop over subregions

} ); // end loop over subregions
}


}
else
{


// Loop over all the fracture planes
geometricObjManager.forGeometricObject< PlanarGeometricObject >( m_targetObjectsName, [&]( localIndex const,
PlanarGeometricObject & fracture )
Expand Down Expand Up @@ -228,6 +217,7 @@ void EmbeddedSurfaceGenerator::initializePostSubGroups()
isNegative = 1;
}
} // end loop over nodes

if( isPositive * isNegative == 1 )
{
bool added = embeddedSurfaceSubRegion.addNewEmbeddedSurface( cellIndex,
Expand All @@ -252,12 +242,11 @@ void EmbeddedSurfaceGenerator::initializePostSubGroups()
}
}
}
} );// end loop over subregions

} ); // end loop over subregions
} );
}
);
} );
}

// Launch kernel to compute connectivity index of each fractured element.
elemManager.forElementSubRegionsComplete< CellElementSubRegion >(
[&]( localIndex const, localIndex const, ElementRegionBase &, CellElementSubRegion & subRegion )
Expand Down
2 changes: 1 addition & 1 deletion src/docs/doxygen/GeosxConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
#define fmt_VERSION 10.0.0

/// Version information for python
#define Python3_VERSION 3.10.8
#define Python3_VERSION 3.10.6

/// Version information for CUDAToolkit
/* #undef CUDAToolkit_VERSION */
Expand Down

0 comments on commit c84e27a

Please sign in to comment.