Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .integrated_tests.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr4005-17824-bac337a
baseline: integratedTests/baseline_integratedTests-pr4033-17830-ccd004a

allow_fail:
all: ''
Expand Down
4 changes: 4 additions & 0 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ This file is designed to track changes to the integrated test baselines.
Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining.
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).

PR #4033 (2026-10-24) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4033-17830-ccd004a.tar.gz>
=====================
Add new scatter strategies for initial mesh redistribution.

PR #4005 (2026-10-23) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr4005-17824-bac337a.tar.gz>
=====================
Added a `Group` statistics layer for sets statistics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,22 +153,30 @@ void expectEmptyArrayMetadata( vtkFieldData & data, std::initializer_list< Expec

template< class V >
void TestMeshImport( string const & meshFilePath, V const & validate, string const fractureName="",
int const partitionRefinement=0 )
int const partitionRefinement=0, string const scatterMethod="" )
{
// Automatically use global IDs when fractures are present
string const useGlobalIdsStr = fractureName.empty() ? "0" : "1";

string scatterAttr;
if( !scatterMethod.empty() )
{
scatterAttr = GEOS_FMT( "scatterMethod=\"{}\"", scatterMethod );
}

string const pattern = R"xml(
<Mesh>
<VTKMesh
name="mesh"
file="{}"
partitionRefinement="{}"
useGlobalIds="{}"
{}
{} />
</Mesh>
)xml";
string const meshNode = GEOS_FMT_RUNTIME( pattern, meshFilePath, partitionRefinement, useGlobalIdsStr,
scatterAttr,
fractureName.empty() ? "" : "faceBlocks=\"{" + fractureName + "}\"" );

xmlWrapper::xmlDocument xmlDocument;
Expand Down
7 changes: 7 additions & 0 deletions src/coreComponents/mesh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ if( ENABLE_VTK )
generators/VTKHierarchicalDataSource.hpp
generators/VTKMeshGenerator.hpp
generators/VTKMeshGeneratorTools.hpp
generators/VTKMeshScattering.hpp
generators/VTKWellGenerator.hpp
generators/VTKSuperCellPartitioning.hpp
generators/VTKUtilities.hpp
Expand All @@ -224,6 +225,7 @@ if( ENABLE_VTK )
generators/VTKHierarchicalDataSource.cpp
generators/VTKMeshGenerator.cpp
generators/VTKMeshGeneratorTools.cpp
generators/VTKMeshScattering.cpp
generators/VTKWellGenerator.cpp
generators/VTKSuperCellPartitioning.cpp
generators/VTKUtilities.cpp
Expand Down Expand Up @@ -285,3 +287,8 @@ endif()
if( GEOS_ENABLE_TESTS )
add_subdirectory( unitTests )
endif( )

# Add benchmarks subdirectory
if( ENABLE_VTK )
add_subdirectory( benchmarks )
endif()
15 changes: 15 additions & 0 deletions src/coreComponents/mesh/benchmarks/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#
# Mesh benchmarks
#

set( dependencyList mesh ${parallelDeps} ${tplDependencyList} )

blt_add_executable(
NAME benchmarkScatterMethods
SOURCES benchmarkScatterMethods.cpp
OUTPUT_DIR ${BENCHMARK_OUTPUT_DIRECTORY}
DEPENDS_ON ${dependencyList}
FOLDER coreComponents/mesh/benchmarks
)

install(TARGETS benchmarkScatterMethods DESTINATION ${CMAKE_INSTALL_PREFIX}/benchmarks)
Loading