Skip to content

Commit

Permalink
Node/cell ordering in InternalMesh (#2881)
Browse files Browse the repository at this point in the history 
* XYZ ordering for internal mesh generator
* Updating testMeshGeneration unit test
* Fix for periodic boundary
* Adding check for setConnectivityForPeriodicBoundary
* Adding IJK logic to cell block ordering
* Updating doc (Advanced Cell Block Specification)
* Updating input files
* Typo in integrated tests documentation
* Updating the integratedTests hash
* Switching to direct solver for validationCase
* Updating the integratedTests hash

---------

Co-authored-by: Pavel Tomin <[email protected]>
  • Loading branch information
@castelletto1 @paveltomin
castelletto1 and paveltomin authored Mar 19, 2024
1 parent 63ad3e9 commit 9a94d80
Show file tree
Hide file tree
Showing 35 changed files with 563 additions and 562 deletions.
30 changes: 12 additions & 18 deletions ...sitionalMultiphaseFlow/benchmarks/isothermalLeakyWell/isothermalLeakyWell_base_direct.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
target="/Solvers/compflow"/>
<PeriodicEvent
name="solverApplications2"
beginTime="1e5"
beginTime="1e5"
forceDt="1e5"
target="/Solvers/compflow"/>
<PeriodicEvent
Expand All @@ -72,36 +72,30 @@
<ElementRegions>
<CellElementRegion
name="aquiferBottom"
cellBlocks="{ aquiferBottom00, aquiferBottom01, aquiferBottom02,
aquiferBottom10, aquiferBottom12,
aquiferBottom20, aquiferBottom21, aquiferBottom22,
aquiferBottom30, aquiferBottom32,
aquiferBottom40, aquiferBottom41, aquiferBottom42 }"
cellBlocks="{ aquiferBottom00, aquiferBottom10, aquiferBottom20, aquiferBottom30, aquiferBottom40,
aquiferBottom01, aquiferBottom21, aquiferBottom41,
aquiferBottom02, aquiferBottom12, aquiferBottom22, aquiferBottom32, aquiferBottom42 }"
materialList="{ fluid, rock, relperm }"/>
<CellElementRegion
name="aquiferTop"
cellBlocks="{ aquiferTop00, aquiferTop01, aquiferTop02,
aquiferTop10, aquiferTop12,
aquiferTop20, aquiferTop21, aquiferTop22,
aquiferTop30, aquiferTop32,
aquiferTop40, aquiferTop41, aquiferTop42 }"
cellBlocks="{ aquiferTop00, aquiferTop10, aquiferTop20, aquiferTop30, aquiferTop40,
aquiferTop01, aquiferTop21, aquiferTop41,
aquiferTop02, aquiferTop12, aquiferTop22, aquiferTop32, aquiferTop42 }"
materialList="{ fluid, rock, relperm }"/>
<CellElementRegion
name="injectionWell"
cellBlocks="{ aquiferBottom31 }"
materialList="{ fluid, rockWell, relperm }"/>
<CellElementRegion
name="leakyWell"
cellBlocks="{ aquiferTop11, aquitard11, aquiferBottom11 }"
cellBlocks="{ aquiferBottom11, aquitard11, aquiferTop11 }"
materialList="{ fluid, rockWell, relperm }"/>
<CellElementRegion
name="barrier"
cellBlocks="{ aquitard00, aquitard01, aquitard02,
aquitard10, aquitard12,
aquitard20, aquitard21, aquitard22,
aquitard30, aquitard31, aquitard32,
aquitard40, aquitard41, aquitard42,
aquiferTop31 }"
cellBlocks="{ aquitard00, aquitard10, aquitard20, aquitard30, aquitard40,
aquitard01, aquitard21, aquitard31, aquitard41,
aquitard02, aquitard12, aquitard22, aquitard32, aquitard42,
aquiferTop31 }"
materialList="{ }"/>
</ElementRegions>
<!-- SPHINX_ELEMENT_REGIONS_END -->
Expand Down
30 changes: 12 additions & 18 deletions ...ionalMultiphaseFlow/benchmarks/isothermalLeakyWell/isothermalLeakyWell_base_iterative.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Problem>

<!-- SPHINX_SOLVER -->
<!-- SPHINX_SOLVER -->
<Solvers>
<CompositionalMultiphaseFVM
name="compflow"
Expand Down Expand Up @@ -60,36 +60,30 @@
<ElementRegions>
<CellElementRegion
name="aquiferBottom"
cellBlocks="{ aquiferBottom00, aquiferBottom01, aquiferBottom02,
aquiferBottom10, aquiferBottom12,
aquiferBottom20, aquiferBottom21, aquiferBottom22,
aquiferBottom30, aquiferBottom32,
aquiferBottom40, aquiferBottom41, aquiferBottom42 }"
cellBlocks="{ aquiferBottom00, aquiferBottom10, aquiferBottom20, aquiferBottom30, aquiferBottom40,
aquiferBottom01, aquiferBottom21, aquiferBottom41,
aquiferBottom02, aquiferBottom12, aquiferBottom22, aquiferBottom32, aquiferBottom42 }"
materialList="{ fluid, rock, relperm }"/>
<CellElementRegion
name="aquiferTop"
cellBlocks="{ aquiferTop00, aquiferTop01, aquiferTop02,
aquiferTop10, aquiferTop12,
aquiferTop20, aquiferTop21, aquiferTop22,
aquiferTop30, aquiferTop32,
aquiferTop40, aquiferTop41, aquiferTop42 }"
cellBlocks="{ aquiferTop00, aquiferTop10, aquiferTop20, aquiferTop30, aquiferTop40,
aquiferTop01, aquiferTop21, aquiferTop41,
aquiferTop02, aquiferTop12, aquiferTop22, aquiferTop32, aquiferTop42 }"
materialList="{ fluid, rock, relperm }"/>
<CellElementRegion
name="injectionWell"
cellBlocks="{ aquiferBottom31 }"
materialList="{ fluid, rockWell, relperm }"/>
<CellElementRegion
name="leakyWell"
cellBlocks="{ aquiferTop11, aquitard11, aquiferBottom11 }"
cellBlocks="{ aquiferBottom11, aquitard11, aquiferTop11 }"
materialList="{ fluid, rockWell, relperm }"/>
<CellElementRegion
name="barrier"
cellBlocks="{ aquitard00, aquitard01, aquitard02,
aquitard10, aquitard12,
aquitard20, aquitard21, aquitard22,
aquitard30, aquitard31, aquitard32,
aquitard40, aquitard41, aquitard42,
aquiferTop31 }"
cellBlocks="{ aquitard00, aquitard10, aquitard20, aquitard30, aquitard40,
aquitard01, aquitard21, aquitard31, aquitard41,
aquitard02, aquitard12, aquitard22, aquitard32, aquitard42,
aquiferTop31 }"
materialList="{ }"/>
</ElementRegions>
<!-- SPHINX_ELEMENT_REGIONS_END -->
Expand Down
24 changes: 9 additions & 15 deletions ...positionalMultiphaseFlow/benchmarks/isothermalLeakyWell/isothermalLeakyWell_benchmark.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,15 @@
nx="{ 50, 1, 20, 1, 40 }"
ny="{ 50, 1, 50 }"
nz="{ 20, 30, 10 }"
cellBlockNames="{ aquiferBottom00, aquitard00, aquiferTop00,
aquiferBottom01, aquitard01, aquiferTop01,
aquiferBottom02, aquitard02, aquiferTop02,
aquiferBottom10, aquitard10, aquiferTop10,
aquiferBottom11, aquitard11, aquiferTop11,
aquiferBottom12, aquitard12, aquiferTop12,
aquiferBottom20, aquitard20, aquiferTop20,
aquiferBottom21, aquitard21, aquiferTop21,
aquiferBottom22, aquitard22, aquiferTop22,
aquiferBottom30, aquitard30, aquiferTop30,
aquiferBottom31, aquitard31, aquiferTop31,
aquiferBottom32, aquitard32, aquiferTop32,
aquiferBottom40, aquitard40, aquiferTop40,
aquiferBottom41, aquitard41, aquiferTop41,
aquiferBottom42, aquitard42, aquiferTop42 }"/>
cellBlockNames="{ aquiferBottom00, aquiferBottom10, aquiferBottom20, aquiferBottom30, aquiferBottom40,
aquiferBottom01, aquiferBottom11, aquiferBottom21, aquiferBottom31, aquiferBottom41,
aquiferBottom02, aquiferBottom12, aquiferBottom22, aquiferBottom32, aquiferBottom42,
aquitard00, aquitard10, aquitard20, aquitard30, aquitard40,
aquitard01, aquitard11, aquitard21, aquitard31, aquitard41,
aquitard02, aquitard12, aquitard22, aquitard32, aquitard42,
aquiferTop00, aquiferTop10, aquiferTop20, aquiferTop30, aquiferTop40,
aquiferTop01, aquiferTop11, aquiferTop21, aquiferTop31, aquiferTop41,
aquiferTop02, aquiferTop12, aquiferTop22, aquiferTop32, aquiferTop42 }"/>
</Mesh>
<!-- SPHINX_MESH_END -->

Expand Down
24 changes: 9 additions & 15 deletions ...mpositionalMultiphaseFlow/benchmarks/isothermalLeakyWell/isothermalLeakyWell_smoke_3d.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,15 @@
nx="{ 5, 1, 2, 1, 4 }"
ny="{ 5, 1, 5 }"
nz="{ 5, 30, 5 }"
cellBlockNames="{ aquiferBottom00, aquitard00, aquiferTop00,
aquiferBottom01, aquitard01, aquiferTop01,
aquiferBottom02, aquitard02, aquiferTop02,
aquiferBottom10, aquitard10, aquiferTop10,
aquiferBottom11, aquitard11, aquiferTop11,
aquiferBottom12, aquitard12, aquiferTop12,
aquiferBottom20, aquitard20, aquiferTop20,
aquiferBottom21, aquitard21, aquiferTop21,
aquiferBottom22, aquitard22, aquiferTop22,
aquiferBottom30, aquitard30, aquiferTop30,
aquiferBottom31, aquitard31, aquiferTop31,
aquiferBottom32, aquitard32, aquiferTop32,
aquiferBottom40, aquitard40, aquiferTop40,
aquiferBottom41, aquitard41, aquiferTop41,
aquiferBottom42, aquitard42, aquiferTop42 }"/>
cellBlockNames="{ aquiferBottom00, aquiferBottom10, aquiferBottom20, aquiferBottom30, aquiferBottom40,
aquiferBottom01, aquiferBottom11, aquiferBottom21, aquiferBottom31, aquiferBottom41,
aquiferBottom02, aquiferBottom12, aquiferBottom22, aquiferBottom32, aquiferBottom42,
aquitard00, aquitard10, aquitard20, aquitard30, aquitard40,
aquitard01, aquitard11, aquitard21, aquitard31, aquitard41,
aquitard02, aquitard12, aquitard22, aquitard32, aquitard42,
aquiferTop00, aquiferTop10, aquiferTop20, aquiferTop30, aquiferTop40,
aquiferTop01, aquiferTop11, aquiferTop21, aquiferTop31, aquiferTop41,
aquiferTop02, aquiferTop12, aquiferTop22, aquiferTop32, aquiferTop42 }"/>
</Mesh>
<!-- SPHINX_MESH_END -->

Expand Down
28 changes: 11 additions & 17 deletions .../compositionalMultiphaseFlow/benchmarks/thermalLeakyWell/thermalLeakyWell_base_direct.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,36 +73,30 @@
<ElementRegions>
<CellElementRegion
name="aquiferBottom"
cellBlocks="{ aquiferBottom00, aquiferBottom01, aquiferBottom02,
aquiferBottom10, aquiferBottom12,
aquiferBottom20, aquiferBottom21, aquiferBottom22,
aquiferBottom30, aquiferBottom32,
aquiferBottom40, aquiferBottom41, aquiferBottom42 }"
cellBlocks="{ aquiferBottom00, aquiferBottom10, aquiferBottom20, aquiferBottom30, aquiferBottom40,
aquiferBottom01, aquiferBottom21, aquiferBottom41,
aquiferBottom02, aquiferBottom12, aquiferBottom22, aquiferBottom32, aquiferBottom42 }"
materialList="{ fluid, rock, relperm, cappres }"/>
<CellElementRegion
name="aquiferTop"
cellBlocks="{ aquiferTop00, aquiferTop01, aquiferTop02,
aquiferTop10, aquiferTop12,
aquiferTop20, aquiferTop21, aquiferTop22,
aquiferTop30, aquiferTop32,
aquiferTop40, aquiferTop41, aquiferTop42 }"
cellBlocks="{ aquiferTop00, aquiferTop10, aquiferTop20, aquiferTop30, aquiferTop40,
aquiferTop01, aquiferTop21, aquiferTop41,
aquiferTop02, aquiferTop12, aquiferTop22, aquiferTop32, aquiferTop42 }"
materialList="{ fluid, rock, relperm, cappres }"/>
<CellElementRegion
name="injectionWell"
cellBlocks="{ aquiferBottom31 }"
materialList="{ fluid, rockWell, relperm, cappres }"/>
<CellElementRegion
name="leakyWell"
cellBlocks="{ aquiferTop11, aquitard11, aquiferBottom11 }"
cellBlocks="{ aquiferBottom11, aquitard11, aquiferTop11 }"
materialList="{ fluid, rockWell, relperm, cappres }"/>
<CellElementRegion
name="barrier"
cellBlocks="{ aquitard00, aquitard01, aquitard02,
aquitard10, aquitard12,
aquitard20, aquitard21, aquitard22,
aquitard30, aquitard31, aquitard32,
aquitard40, aquitard41, aquitard42,
aquiferTop31 }"
cellBlocks="{ aquitard00, aquitard10, aquitard20, aquitard30, aquitard40,
aquitard01, aquitard21, aquitard31, aquitard41,
aquitard02, aquitard12, aquitard22, aquitard32, aquitard42,
aquiferTop31 }"
materialList="{ }"/>
</ElementRegions>
<!-- SPHINX_ELEMENT_REGIONS_END -->
Expand Down
28 changes: 11 additions & 17 deletions ...mpositionalMultiphaseFlow/benchmarks/thermalLeakyWell/thermalLeakyWell_base_iterative.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,36 +61,30 @@
<ElementRegions>
<CellElementRegion
name="aquiferBottom"
cellBlocks="{ aquiferBottom00, aquiferBottom01, aquiferBottom02,
aquiferBottom10, aquiferBottom12,
aquiferBottom20, aquiferBottom21, aquiferBottom22,
aquiferBottom30, aquiferBottom32,
aquiferBottom40, aquiferBottom41, aquiferBottom42 }"
cellBlocks="{ aquiferBottom00, aquiferBottom10, aquiferBottom20, aquiferBottom30, aquiferBottom40,
aquiferBottom01, aquiferBottom21, aquiferBottom41,
aquiferBottom02, aquiferBottom12, aquiferBottom22, aquiferBottom32, aquiferBottom42 }"
materialList="{ fluid, rock, relperm, cappres }"/>
<CellElementRegion
name="aquiferTop"
cellBlocks="{ aquiferTop00, aquiferTop01, aquiferTop02,
aquiferTop10, aquiferTop12,
aquiferTop20, aquiferTop21, aquiferTop22,
aquiferTop30, aquiferTop32,
aquiferTop40, aquiferTop41, aquiferTop42 }"
cellBlocks="{ aquiferTop00, aquiferTop10, aquiferTop20, aquiferTop30, aquiferTop40,
aquiferTop01, aquiferTop21, aquiferTop41,
aquiferTop02, aquiferTop12, aquiferTop22, aquiferTop32, aquiferTop42 }"
materialList="{ fluid, rock, relperm, cappres }"/>
<CellElementRegion
name="injectionWell"
cellBlocks="{ aquiferBottom31 }"
materialList="{ fluid, rockWell, relperm, cappres }"/>
<CellElementRegion
name="leakyWell"
cellBlocks="{ aquiferTop11, aquitard11, aquiferBottom11 }"
cellBlocks="{ aquiferBottom11, aquitard11, aquiferTop11 }"
materialList="{ fluid, rockWell, relperm, cappres }"/>
<CellElementRegion
name="barrier"
cellBlocks="{ aquitard00, aquitard01, aquitard02,
aquitard10, aquitard12,
aquitard20, aquitard21, aquitard22,
aquitard30, aquitard31, aquitard32,
aquitard40, aquitard41, aquitard42,
aquiferTop31 }"
cellBlocks="{ aquitard00, aquitard10, aquitard20, aquitard30, aquitard40,
aquitard01, aquitard21, aquitard31, aquitard41,
aquitard02, aquitard12, aquitard22, aquitard32, aquitard42,
aquiferTop31 }"
materialList="{ }"/>
</ElementRegions>
<!-- SPHINX_ELEMENT_REGIONS_END -->
Expand Down
24 changes: 9 additions & 15 deletions ...es/compositionalMultiphaseFlow/benchmarks/thermalLeakyWell/thermalLeakyWell_benchmark.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,15 @@
nx="{ 50, 1, 20, 1, 40 }"
ny="{ 50, 1, 50 }"
nz="{ 20, 30, 10 }"
cellBlockNames="{ aquiferBottom00, aquitard00, aquiferTop00,
aquiferBottom01, aquitard01, aquiferTop01,
aquiferBottom02, aquitard02, aquiferTop02,
aquiferBottom10, aquitard10, aquiferTop10,
aquiferBottom11, aquitard11, aquiferTop11,
aquiferBottom12, aquitard12, aquiferTop12,
aquiferBottom20, aquitard20, aquiferTop20,
aquiferBottom21, aquitard21, aquiferTop21,
aquiferBottom22, aquitard22, aquiferTop22,
aquiferBottom30, aquitard30, aquiferTop30,
aquiferBottom31, aquitard31, aquiferTop31,
aquiferBottom32, aquitard32, aquiferTop32,
aquiferBottom40, aquitard40, aquiferTop40,
aquiferBottom41, aquitard41, aquiferTop41,
aquiferBottom42, aquitard42, aquiferTop42 }"/>
cellBlockNames="{ aquiferBottom00, aquiferBottom10, aquiferBottom20, aquiferBottom30, aquiferBottom40,
aquiferBottom01, aquiferBottom11, aquiferBottom21, aquiferBottom31, aquiferBottom41,
aquiferBottom02, aquiferBottom12, aquiferBottom22, aquiferBottom32, aquiferBottom42,
aquitard00, aquitard10, aquitard20, aquitard30, aquitard40,
aquitard01, aquitard11, aquitard21, aquitard31, aquitard41,
aquitard02, aquitard12, aquitard22, aquitard32, aquitard42,
aquiferTop00, aquiferTop10, aquiferTop20, aquiferTop30, aquiferTop40,
aquiferTop01, aquiferTop11, aquiferTop21, aquiferTop31, aquiferTop41,
aquiferTop02, aquiferTop12, aquiferTop22, aquiferTop32, aquiferTop42 }"/>
</Mesh>
<!-- SPHINX_MESH_END -->

Expand Down
24 changes: 9 additions & 15 deletions ...les/compositionalMultiphaseFlow/benchmarks/thermalLeakyWell/thermalLeakyWell_smoke_3d.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,15 @@
nx="{ 5, 1, 2, 1, 4 }"
ny="{ 5, 1, 5 }"
nz="{ 5, 30, 5 }"
cellBlockNames="{ aquiferBottom00, aquitard00, aquiferTop00,
aquiferBottom01, aquitard01, aquiferTop01,
aquiferBottom02, aquitard02, aquiferTop02,
aquiferBottom10, aquitard10, aquiferTop10,
aquiferBottom11, aquitard11, aquiferTop11,
aquiferBottom12, aquitard12, aquiferTop12,
aquiferBottom20, aquitard20, aquiferTop20,
aquiferBottom21, aquitard21, aquiferTop21,
aquiferBottom22, aquitard22, aquiferTop22,
aquiferBottom30, aquitard30, aquiferTop30,
aquiferBottom31, aquitard31, aquiferTop31,
aquiferBottom32, aquitard32, aquiferTop32,
aquiferBottom40, aquitard40, aquiferTop40,
aquiferBottom41, aquitard41, aquiferTop41,
aquiferBottom42, aquitard42, aquiferTop42 }"/>
cellBlockNames="{ aquiferBottom00, aquiferBottom10, aquiferBottom20, aquiferBottom30, aquiferBottom40,
aquiferBottom01, aquiferBottom11, aquiferBottom21, aquiferBottom31, aquiferBottom41,
aquiferBottom02, aquiferBottom12, aquiferBottom22, aquiferBottom32, aquiferBottom42,
aquitard00, aquitard10, aquitard20, aquitard30, aquitard40,
aquitard01, aquitard11, aquitard21, aquitard31, aquitard41,
aquitard02, aquitard12, aquitard22, aquitard32, aquitard42,
aquiferTop00, aquiferTop10, aquiferTop20, aquiferTop30, aquiferTop40,
aquiferTop01, aquiferTop11, aquiferTop21, aquiferTop31, aquiferTop41,
aquiferTop02, aquiferTop12, aquiferTop22, aquiferTop32, aquiferTop42 }"/>
</Mesh>
<!-- SPHINX_MESH_END -->

Expand Down
9 changes: 6 additions & 3 deletions inputFiles/compositionalMultiphaseFlow/deadoil_2ph_staircase_gravity_segregation_3d.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
nx="{ 5, 5 }"
ny="{ 5, 5 }"
nz="{ 3, 3, 3, 3 }"
cellBlockNames="{ b00, b01, b02, b03, b04, b05, b06, b07, b08, b09, b10, b11, b12, b13, b14, b15 }"/>
cellBlockNames="{ cb-0_0_0, cb-1_0_0, cb-0_1_0, cb-1_1_0,
cb-0_0_1, cb-1_0_1, cb-0_1_1, cb-1_1_1,
cb-0_0_2, cb-1_0_2, cb-0_1_2, cb-1_1_2,
cb-0_0_3, cb-1_0_3, cb-0_1_3, cb-1_1_3 }"/>
</Mesh>

<Geometry>
Expand Down Expand Up @@ -71,12 +74,12 @@
<ElementRegions>
<CellElementRegion
name="Channel"
cellBlocks="{ b08, b00, b01, b05, b06, b14, b15, b11 }"
cellBlocks="{ cb-1_0_0, cb-0_0_0, cb-0_0_1, cb-0_1_1, cb-0_1_2, cb-1_1_2, cb-1_1_3, cb-1_0_3 }"
materialList="{ fluid, rock, relperm }"/>

<CellElementRegion
name="Barrier"
cellBlocks="{ b04, b12, b13, b09, b10, b02, b03, b07 }"
cellBlocks="{ cb-0_1_0, cb-1_1_0, cb-1_1_1, cb-1_0_1, cb-1_0_2, cb-0_0_2, cb-0_0_3, cb-0_1_3 }"
materialList="{ }"/>
</ElementRegions>

Expand Down
Loading

0 comments on commit 9a94d80

Please sign in to comment.