Skip to content

Commit

Permalink
Merge branch 'develop' into swaziri/configLoop_acceleration
Browse files Browse the repository at this point in the history
  • Loading branch information
paveltomin authored Dec 2, 2024
2 parents f72951b + 2586344 commit 49ceff0
Show file tree
Hide file tree
Showing 48 changed files with 2,519 additions and 208 deletions.
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-pr2957-9029-ff99ac0
baseline: integratedTests/baseline_integratedTests-pr3381-9063-399123c
allow_fail:
all: ''
streak: ''
5 changes: 5 additions & 0 deletions BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ 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 #3381 (2024-12-01)
=====================
A few baseline diffs for order FaceElementSubRegion::m_toFacesRelation map. Not sure why this was changed by this PR, but the previous order seems incorrect for a couple of cases.


PR #2957 (2024-11-27)
=====================
Added ExternalDataRepository.
Expand Down
2 changes: 1 addition & 1 deletion host-configs/apple/macOS_base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set(ENABLE_DOXYGEN ON CACHE BOOL "" FORCE)
set(ENABLE_SPHINX ON CACHE BOOL "" FORCE)
set(ENABLE_MATHPRESSO ON CACHE BOOL "" FORCE )

set(GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
set(GEOS_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@
plotLevel="2"
format="binary"
plotFileRoot="bubbleStab"/>
</Outputs>

<Restart
name="restartOutput"/>
</Outputs>

</Problem>
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Mesh>
<VTKMesh
name="SyntheticMesh"
repositoryName="synthetic">
dataSourceName="synthetic">
<Region
name="Region1"
id="1"
Expand Down
84 changes: 84 additions & 0 deletions inputFiles/surfaceGeneration/cube_8.vtu
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfPoints="27" NumberOfCells="8">
<PointData GlobalIds="GLOBAL_IDS_POINTS">
<DataArray type="Int64" IdType="1" Name="GLOBAL_IDS_POINTS" format="ascii">
0 1 2
3 4 5
6 7 8
9 10 11
12 13 14
15 16 17
18 19 20
21 22 23
24 25 26
</DataArray>
</PointData>
<CellData GlobalIds="GLOBAL_IDS_CELLS" Scalars="attribute">
<DataArray type="Int64" IdType="1" Name="GLOBAL_IDS_CELLS" format="ascii">
0 1 2 3 4 5 6 7
</DataArray>
<DataArray type="Int32" Name="attribute" format="ascii">
3 3 3 3 3 3
3 3 3 3 3 3
</DataArray>
</CellData>
<Points>
<DataArray type="Float32" Name="coordinates" NumberOfComponents="3" format="ascii">
-1 -1 -1
0 -1 -1
1 -1 -1
-1 0 -1
0 0 -1
1 0 -1
-1 1 -1
0 1 -1
1 1 -1
-1 -1 0
0 -1 0
1 -1 0
-1 0 0
0 0 0
1 0 0
-1 1 0
0 1 0
1 1 0
-1 -1 1
0 -1 1
1 -1 1
-1 0 1
0 0 1
1 0 1
-1 1 1
0 1 1
1 1 1
</DataArray>
</Points>
<Cells>
<DataArray type="Int32" Name="connectivity" format="ascii">
0 1 4 3 9 10 13 12
1 2 5 4 10 11 14 13
3 4 7 6 12 13 16 15
4 5 8 7 13 14 17 16
9 10 13 12 18 19 22 21
10 11 14 13 19 20 23 22
12 13 16 15 21 22 25 24
13 14 17 16 22 23 26 25
</DataArray>
<DataArray type="Int32" Name="offsets" format="ascii">
8
16
24
32
40
48
56
64
</DataArray>
<DataArray type="UInt8" Name="types" format="ascii">
12 12 12 12 12 12 12 12
</DataArray>
</Cells>
</Piece>
</UnstructuredGrid>
</VTKFile>
235 changes: 235 additions & 0 deletions inputFiles/surfaceGeneration/cube_8.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
<?xml version="1.0" ?>

<Problem>
<Solvers
gravityVector="{ 0.0, 0.0, 0.0 }">
<SolidMechanicsLagrangianSSLE
name="lagSolve"
timeIntegrationOption="QuasiStatic"
discretization="FE1"
targetRegions="{ Region2 }"
>
<NonlinearSolverParameters
newtonTol="1.0e-3"
maxAllowedResidualNorm="1e10"
newtonMaxIter="8" />
<LinearSolverParameters
directParallel="0" />
</SolidMechanicsLagrangianSSLE>

<SurfaceGenerator
name="SurfaceGen"
logLevel="1"
targetRegions="{ Region2 }"
rockToughness="1e60"
mpiCommOrder="1" />
</Solvers>

<Mesh>
<!--VTKMesh
name="cube8"
file="cube_8.vtu"/-->

<InternalMesh
name="mesh1"
elementTypes="{ C3D8 }"
xCoords="{ -1, 1 }"
yCoords="{ -1, 1 }"
zCoords="{ -1, 1 }"
nx="{ 2 }"
ny="{ 2 }"
nz="{ 2 }"
cellBlockNames="{ 3_hexahedra }"/>
</Mesh>

<Geometry>
<Box
name="fracPlaneX"
xMin="{ -0.1, -1e3, -1e3 }"
xMax="{ 0.1, 1e3, 1e3 }"/>

<Box
name="fracPlaneY"
xMin="{ -1e3, -0.1, -1e3 }"
xMax="{ 1e3, 0.1, 1e3 }"/>

<Box
name="fracPlaneZ"
xMin="{ -1e3, -1e3, -0.1 }"
xMax="{ 1e3, 1e3, 0.1 }"/>

<Box
name="xneg"
xMin="{ -1e3, -1e3, -1e3 }"
xMax="{ -0.9, 1e3, 1e3 }"/>

<Box
name="xpos"
xMin="{ 0.9, -1e3, -1e3 }"
xMax="{ 1e3, 1e3, 1e3 }"/>

<Box
name="zneg"
xMin="{ -1e3, -1e3, -1e3 }"
xMax="{ 1e3, 1e3, -0.9 }"/>

<Box
name="zpos"
xMin="{ -1e3, -1e3, 0.9 }"
xMax="{ 1e3, 1e3, 1e3 }"/>

<Box
name="yneg"
xMin="{ -1e3, -1e3, -1e3 }"
xMax="{ 1e3, -0.9, 1e3 }"/>

<Box
name="ypos"
xMin="{ -1e3, 0.9, -1e3 }"
xMax="{ 1e3, 1e3, 1e3 }"/>
</Geometry>

<Events
maxTime="4.0">

<SoloEvent
name="initialPlot"
target="/Outputs/siloOutput"/>

<SoloEvent
name="fracture1"
target="/Solvers/SurfaceGen"/>

<PeriodicEvent
name="solverApplications1"
forceDt="1.0"
beginTime="0.0"
endTime="4.0"
target="/Solvers/lagSolve"/>


<!--SoloEvent
name="preFracturePlot"
target="/Outputs/siloOutput"/>
<SoloEvent
name="preFracture2"
target="/Solvers/SurfaceGen"/>
<SoloEvent
name="preFracturePlot2"
target="/Outputs/siloOutput"/> -->

<PeriodicEvent
name="outputs"
timeFrequency="1.0"
targetExactTimestep="0"
target="/Outputs/siloOutput"/>

</Events>

<NumericalMethods>
<FiniteElements>
<FiniteElementSpace
name="FE1"
order="1"/>
</FiniteElements>
</NumericalMethods>

<ElementRegions>
<CellElementRegion
name="Region2"
cellBlocks="{ 3_hexahedra }"
materialList="{ granite }"/>

<SurfaceElementRegion
name="Fracture"
defaultAperture="1.0e-4"
materialList="{ granite }"/>
</ElementRegions>

<Constitutive>
<ElasticIsotropic
name="granite"
defaultDensity="2700"
defaultBulkModulus="5.5556e9"
defaultShearModulus="4.16667e9"/>
</Constitutive>

<FieldSpecifications>
<FieldSpecification
name="frac"
initialCondition="1"
setNames="{ fracPlaneX, fracPlaneY, fracPlaneZ }"
objectPath="faceManager"
fieldName="ruptureState"
scale="1"/>

<FieldSpecification
name="xneg"
component="0"
objectPath="nodeManager"
fieldName="totalDisplacement"
scale="-0.2"
setNames="{ xneg }"/>

<FieldSpecification
name="xpos"
component="0"
objectPath="nodeManager"
fieldName="totalDisplacement"
scale="0.2"
setNames="{ xpos }"/>

<FieldSpecification
name="zneg"
component="2"
objectPath="nodeManager"
fieldName="totalDisplacement"
scale="-0.2"
setNames="{ zneg }"/>

<FieldSpecification
name="zpos"
component="2"
objectPath="nodeManager"
fieldName="totalDisplacement"
scale="0.2"
setNames="{ zpos }"/>

<FieldSpecification
name="bot"
component="1"
objectPath="nodeManager"
fieldName="totalDisplacement"
scale="-0.2"
setNames="{ yneg }"/>

<FieldSpecification
name="top"
component="1"
objectPath="nodeManager"
fieldName="totalDisplacement"
scale="0.2"
setNames="{ ypos }"/>
</FieldSpecifications>

<Functions>
<TableFunction
name="timeFunction"
inputVarNames="{ time }"
coordinates="{ 0.0, 1.0, 1.0e9 }"
values="{ 0.0, 1.0, 1.0 }"/>
</Functions>

<Outputs>
<Silo
name="siloOutput"
plotLevel="3"/>

<Restart
name="restartOutput"/>
</Outputs>

<!-- <Fracture failCriterion="1" failGap="0.0004" fractureFlag="100" preFractureSetName="perf" rockToughness="1e6" separableSet="all"/> -->
</Problem>
10 changes: 8 additions & 2 deletions src/coreComponents/dataRepository/BufferOps_inline.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1527,7 +1527,10 @@ Unpack( buffer_unit_type const * & buffer,
relatedObjectGlobalToLocalMap,
clearFlag );

unmappedGlobalIndices[li].insert( unmappedIndices.data(), unmappedIndices.size() );
if( unmappedIndices.size() > 0 )
{
unmappedGlobalIndices[li].insert( unmappedIndices.data(), unmappedIndices.size() );
}
}
return sizeOfUnpackedChars;
}
Expand Down Expand Up @@ -1644,7 +1647,10 @@ Unpack( buffer_unit_type const * & buffer,

// insert unknown global indices related to the local index into an additional mapping to resolve externally
unmapped.resize( LvArray::sortedArrayManipulation::makeSortedUnique( unmapped.begin(), unmapped.end() ) );
unmappedGlobalIndices[li].insert( unmapped.begin(), unmapped.end() );
if( unmapped.size() > 0 )
{
unmappedGlobalIndices[li].insert( unmapped.begin(), unmapped.end() );
}
}

// If there were element lists that didn't fit in the map, rebuild the whole thing
Expand Down
Loading

0 comments on commit 49ceff0

Please sign in to comment.