Skip to content

Commit

Permalink
Merge branch 'bug_fixing_LIE' into 'master'
Browse files Browse the repository at this point in the history 
[LIE] Fix a bug in LIE#HM when matrix is disabled for the flow process

Closes #3495

See merge request ogs/ogs!5078
  • Loading branch information
@endJunction
endJunction committed Aug 21, 2024
2 parents 570aec0 + 58cab9f commit 24d62b4
Show file tree
Hide file tree
Showing 43 changed files with 1,886 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ProcessLib/LIE/HydroMechanics/LocalAssembler/LocalDataInitializer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ class LocalDataInitializer final
getNodeIndex(mesh_item, k));
auto global_index =
_dof_table.getGlobalIndex(l, var_id, var_comp_id);
if (global_index != NumLib::MeshComponentMap::nop)
if (global_index != NumLib::MeshComponentMap::nop &&
dof_id < n_local_dof)
{
dofIndex_to_localIndex[dof_id++] = local_id;
}
Expand Down
22 changes: 22 additions & 0 deletions ProcessLib/LIE/HydroMechanics/Tests.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,3 +218,25 @@ AddTest(
single_fracture_3compartments_flow_CHZ_sigma0_ts_356_t_500.000000.vtu single_fracture_3compartments_flow_CHZ_sigma0_ts_356_t_500.000000.vtu fracture_aperture_avg fracture_aperture_avg 1e-15 1e-15
single_fracture_3compartments_flow_CHZ_sigma0_ts_356_t_500.000000.vtu single_fracture_3compartments_flow_CHZ_sigma0_ts_356_t_500.000000.vtu sigma_avg sigma_avg 5e-9 1e-15
)

AddTest(
NAME LIE_HM_great_cell_2D_embedded_fracture
PATH LIE/HydroMechanics/GreatCellWithTrianglularMesh
EXECUTABLE ogs
EXECUTABLE_ARGS great_cell_2d_HM_LIE_embedded_fracture.prj
WRAPPER time
TESTER vtkdiff
REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
RUNTIME 10
DIFF_DATA
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu pressure pressure 1e-10 1e-15
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu pressure_interpolated pressure_interpolated 1e-10 1e-15
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu displacement displacement 1e-15 1e-15
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu displacement_jump1 displacement_jump1 1e-15 1e-15
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu fracture_stress fracture_stress 1e-9 1e-11
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu fracture_permeability fracture_permeability 1e-15 1e-15
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu fracture_aperture fracture_aperture 1e-15 1e-15
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu sigma sigma 1e-8 5e-13
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu epsilon epsilon 1e-15 1e-15
great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu great_cell_2D_embedded_fracture_ts_64_t_2500.000000.vtu velocity velocity 1e-15 1e-15
)
24 changes: 24 additions & 0 deletions Tests/Data/LIE/HydroMechanics/GreatCellWithTrianglularMesh/2D_BAG1.vtu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
<Piece NumberOfPoints="5" NumberOfCells="4" >
<PointData>
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="0" RangeMax="139" offset="0" />
</PointData>
<CellData>
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="949" RangeMax="1045" offset="64" />
</CellData>
<Points>
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0.09894003955" RangeMax="0.1" offset="120" />
</Points>
<Cells>
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
<AppendedData encoding="base64">
_KAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAgAAAAAAAACKAAAAAAAAAIsAAAAAAAAAIAAAAAAAAAC1AwAAAAAAABQEAAAAAAAAFQQAAAAAAAC3AwAAAAAAAA==eAAAAAAAAADJkCFqIlS5P2UE5tVZvY2/AAAAAAAAAADJkCFqIlS5PwAAAAAAAAAAAAAAAAAAAADJkCFqIlS5P2UE5tVZvY0/AAAAAAAAAADJkCFqIlS5P81W5tVZvX2/AAAAAAAAAADJkCFqIlS5P72v5dVZvX0/AAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
</AppendedData>
</VTKFile>
24 changes: 24 additions & 0 deletions Tests/Data/LIE/HydroMechanics/GreatCellWithTrianglularMesh/2D_BAG10.vtu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
<Piece NumberOfPoints="5" NumberOfCells="4" >
<PointData>
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="28" RangeMax="153" offset="0" />
</PointData>
<CellData>
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="977" RangeMax="1059" offset="64" />
</CellData>
<Points>
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0.09894003955" RangeMax="0.1" offset="120" />
</Points>
<Cells>
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
<AppendedData encoding="base64">
_KAAAAAAAAAAcAAAAAAAAAB0AAAAAAAAAHgAAAAAAAACYAAAAAAAAAJkAAAAAAAAAIAAAAAAAAADRAwAAAAAAACIEAAAAAAAAIwQAAAAAAADTAwAAAAAAAA==eAAAAAAAAABzpaYFX/q1v/tNHUgyQao/AAAAAAAAAAAKV18gj2a3v1R/Kdy9YqM/AAAAAAAAAAChCBg7v9K4v1tha+CSCJk/AAAAAAAAAADJ/AITd7C2v7JtIxL40aY/AAAAAAAAAAD5rbstpxy4v/1BX0wH558/AAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
</AppendedData>
</VTKFile>
24 changes: 24 additions & 0 deletions Tests/Data/LIE/HydroMechanics/GreatCellWithTrianglularMesh/2D_BAG11.vtu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
<Piece NumberOfPoints="5" NumberOfCells="4" >
<PointData>
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="24" RangeMax="151" offset="0" />
</PointData>
<CellData>
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="973" RangeMax="1057" offset="64" />
</CellData>
<Points>
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0.09894003955" RangeMax="0.1" offset="120" />
</Points>
<Cells>
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
<AppendedData encoding="base64">
_KAAAAAAAAAAYAAAAAAAAABkAAAAAAAAAGgAAAAAAAACWAAAAAAAAAJcAAAAAAAAAIAAAAAAAAADNAwAAAAAAACAEAAAAAAAAIQQAAAAAAADPAwAAAAAAAA==eAAAAAAAAAD91I58FpCuvyWq4SzoibQ/AAAAAAAAAABSipS1+eixv1KKlLX56LE/AAAAAAAAAAAlquEs6Im0v/3UjnwWkK4/AAAAAAAAAABz9e15gpiwvzEfO/FwObM/AAAAAAAAAAAuFzvxcDmzv3X97XmCmLA/AAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
</AppendedData>
</VTKFile>
24 changes: 24 additions & 0 deletions Tests/Data/LIE/HydroMechanics/GreatCellWithTrianglularMesh/2D_BAG12.vtu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
<Piece NumberOfPoints="5" NumberOfCells="4" >
<PointData>
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="20" RangeMax="149" offset="0" />
</PointData>
<CellData>
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="969" RangeMax="1055" offset="64" />
</CellData>
<Points>
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0.09894003955" RangeMax="0.1" offset="120" />
</Points>
<Cells>
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
<AppendedData encoding="base64">
_KAAAAAAAAAAUAAAAAAAAABUAAAAAAAAAFgAAAAAAAACUAAAAAAAAAJUAAAAAAAAAIAAAAAAAAADJAwAAAAAAAB4EAAAAAAAAHwQAAAAAAADLAwAAAAAAAA==eAAAAAAAAABbYWvgkgiZv6EIGDu/0rg/AAAAAAAAAABUfyncvWKjvwpXXyCPZrc/AAAAAAAAAAD7TR1IMkGqv3OlpgVf+rU/AAAAAAAAAAC2HF9MB+efv9Wxuy2nHLg/AAAAAAAAAABiWyMS+NGmv5QAAxN3sLY/AAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
</AppendedData>
</VTKFile>
24 changes: 24 additions & 0 deletions Tests/Data/LIE/HydroMechanics/GreatCellWithTrianglularMesh/2D_BAG13.vtu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
<Piece NumberOfPoints="5" NumberOfCells="4" >
<PointData>
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="16" RangeMax="147" offset="0" />
</PointData>
<CellData>
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="965" RangeMax="1053" offset="64" />
</CellData>
<Points>
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0.09894003955" RangeMax="0.1" offset="120" />
</Points>
<Cells>
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
<AppendedData encoding="base64">
_KAAAAAAAAAAQAAAAAAAAABEAAAAAAAAAEgAAAAAAAACSAAAAAAAAAJMAAAAAAAAAIAAAAAAAAADFAwAAAAAAABwEAAAAAAAAHQQAAAAAAADHAwAAAAAAAA==eAAAAAAAAABlBObVWb2NP8mQIWoiVLk/AAAAAAAAAAABAAAAAABgPMmQIWoiVLk/AAAAAAAAAABlBObVWb2Nv8mQIWoiVLk/AAAAAAAAAACEVObVWb19P8mQIWoiVLk/AAAAAAAAAAAYsOXVWb19v8mQIWoiVLk/AAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
</AppendedData>
</VTKFile>
24 changes: 24 additions & 0 deletions Tests/Data/LIE/HydroMechanics/GreatCellWithTrianglularMesh/2D_BAG14.vtu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
<Piece NumberOfPoints="5" NumberOfCells="4" >
<PointData>
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="12" RangeMax="145" offset="0" />
</PointData>
<CellData>
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="961" RangeMax="1051" offset="64" />
</CellData>
<Points>
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0.09894003955" RangeMax="0.1" offset="120" />
</Points>
<Cells>
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
<AppendedData encoding="base64">
_KAAAAAAAAAAMAAAAAAAAAA0AAAAAAAAADgAAAAAAAACQAAAAAAAAAJEAAAAAAAAAIAAAAAAAAADBAwAAAAAAABoEAAAAAAAAGwQAAAAAAADDAwAAAAAAAA==eAAAAAAAAAD7TR1IMkGqP3OlpgVf+rU/AAAAAAAAAABUfyncvWKjPwpXXyCPZrc/AAAAAAAAAABbYWvgkgiZP6EIGDu/0rg/AAAAAAAAAACybSMS+NGmP8n8AhN3sLY/AAAAAAAAAAD9QV9MB+efP/mtuy2nHLg/AAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
</AppendedData>
</VTKFile>
24 changes: 24 additions & 0 deletions Tests/Data/LIE/HydroMechanics/GreatCellWithTrianglularMesh/2D_BAG15.vtu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
<Piece NumberOfPoints="5" NumberOfCells="4" >
<PointData>
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="8" RangeMax="143" offset="0" />
</PointData>
<CellData>
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="957" RangeMax="1049" offset="64" />
</CellData>
<Points>
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0.09894003955" RangeMax="0.1" offset="120" />
</Points>
<Cells>
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
<AppendedData encoding="base64">
_KAAAAAAAAAAIAAAAAAAAAAkAAAAAAAAACgAAAAAAAACOAAAAAAAAAI8AAAAAAAAAIAAAAAAAAAC9AwAAAAAAABgEAAAAAAAAGQQAAAAAAAC/AwAAAAAAAA==eAAAAAAAAAAlquEs6Im0P/3UjnwWkK4/AAAAAAAAAABSipS1+eixP1KKlLX56LE/AAAAAAAAAAD91I58FpCuPyWq4SzoibQ/AAAAAAAAAAAxHzvxcDmzP3P17XmCmLA/AAAAAAAAAAB1/e15gpiwPy4XO/FwObM/AAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
</AppendedData>
</VTKFile>
24 changes: 24 additions & 0 deletions Tests/Data/LIE/HydroMechanics/GreatCellWithTrianglularMesh/2D_BAG16.vtu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
<Piece NumberOfPoints="5" NumberOfCells="4" >
<PointData>
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="4" RangeMax="141" offset="0" />
</PointData>
<CellData>
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="953" RangeMax="1047" offset="64" />
</CellData>
<Points>
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0.09894003955" RangeMax="0.1" offset="120" />
</Points>
<Cells>
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
<AppendedData encoding="base64">
_KAAAAAAAAAAEAAAAAAAAAAUAAAAAAAAABgAAAAAAAACMAAAAAAAAAI0AAAAAAAAAIAAAAAAAAAC5AwAAAAAAABYEAAAAAAAAFwQAAAAAAAC7AwAAAAAAAA==eAAAAAAAAAChCBg7v9K4P3hha+CSCJk/AAAAAAAAAAAKV18gj2a3P1R/Kdy9YqM/AAAAAAAAAABzpaYFX/q1P/tNHUgyQao/AAAAAAAAAAA9srstpxy4P9kYX0wH558/AAAAAAAAAACUAAMTd7C2P2JbIxL40aY/AAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAABAAAAAAAAAAEAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
</AppendedData>
</VTKFile>
Loading

0 comments on commit 24d62b4

Please sign in to comment.