Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Simplification & consolidation of CellElementRegion definition #2878

Merged
merged 146 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from 105 commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
3408008
Added :
MelReyCG Dec 4, 2023
a81babf
forgotten "const"
MelReyCG Dec 8, 2023
38607b1
cellblock docs & exemple update (for existing and new functionnalities)
MelReyCG Dec 12, 2023
99ab6de
update schema
MelReyCG Dec 12, 2023
5c86cf3
Merge remote-tracking branch 'origin/develop' into feature/rey/cellbl…
MelReyCG Dec 12, 2023
b4454fe
This reverts commit a81babfc29acb477194ef4a92f9c961ed46cdf6f.
MelReyCG Dec 12, 2023
c8f92a8
docs modification to mix usage of region and sub-region
MelReyCG Dec 12, 2023
f32ea08
started to use the new cellBlocks practices as much as possible in th…
MelReyCG Dec 12, 2023
33c3c7d
element types documentation
MelReyCG Dec 13, 2023
72d3f46
Updated Sphinx building & good pratices documentation
MelReyCG Dec 15, 2023
dddbed8
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Feb 20, 2024
25b9b74
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Feb 26, 2024
a34d3c6
simple renaming
MelReyCG Feb 27, 2024
c64ca40
adding a test to check cellBlocks syntax on a loaded VTK
MelReyCG Mar 7, 2024
5cc2e1d
renaming + removed test logs
MelReyCG Mar 7, 2024
f116454
generated rst
MelReyCG Mar 7, 2024
4992fda
useless methods in test
MelReyCG Mar 8, 2024
3220762
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Mar 8, 2024
5f0cc35
We want to select all cells here, no need for precise cellBlock naming
MelReyCG Mar 11, 2024
a7e3ea4
registerSubRegion function -> CellElementRegion method
MelReyCG Mar 11, 2024
6a8f948
centralized "all" pattern
MelReyCG Mar 13, 2024
bf4b601
cellBlocks must not be aware of a futur parent region
MelReyCG Mar 13, 2024
cebe580
removal of "all" keyword
MelReyCG Mar 14, 2024
3851105
added cellBlockAttributeValues & cellBlocksMatch + log msgs + testing
MelReyCG Mar 27, 2024
37e27ea
added documentation
MelReyCG Apr 3, 2024
89ff287
updated exemples
MelReyCG Apr 5, 2024
d107870
a few refactorings
MelReyCG Apr 5, 2024
279c905
return string value instead of tricky sub-string_view
MelReyCG Apr 25, 2024
27ee11d
Merge commit '8ec9d992135fa2b8bec53b22d463cddb33edaef6' into feature/…
MelReyCG Apr 25, 2024
9315677
used `cellBlocksMatch="{ * }"` in all unique region in the tests
MelReyCG Apr 25, 2024
84d3038
forgotten one
MelReyCG Apr 25, 2024
c87ea22
missed one more
MelReyCG Apr 26, 2024
1b63330
doc updating
MelReyCG Apr 26, 2024
3c7531c
last doc update
MelReyCG Apr 26, 2024
4a74073
generated docs & schema
MelReyCG Apr 26, 2024
7d14bd3
refactored cellBlock registering process
MelReyCG Apr 26, 2024
4a50918
generated docs & schema
MelReyCG Apr 26, 2024
9eadbba
keeping explicit syntax in some tests
MelReyCG May 29, 2024
399aaba
little doc format fix
MelReyCG May 29, 2024
8490162
Few documentation fixes
MelReyCG May 29, 2024
7e427d2
Merge commit 'd3783ad15edb16510fed6f4eef214e01ff14ffde' into feature/…
MelReyCG May 29, 2024
76c877a
Merge remote-tracking branch 'origin/develop' into feature/rey/cellbl…
MelReyCG Jun 4, 2024
d598c0b
worked on clarifying the code as much as possible
MelReyCG Jun 4, 2024
01a558a
test fix
MelReyCG Jun 4, 2024
03cfe9d
generated files
MelReyCG Jun 4, 2024
66c1558
Missing include
MelReyCG Jun 4, 2024
a65ca1e
few docs typo
MelReyCG Jun 27, 2024
1df1050
reducing function visibility
MelReyCG Jun 27, 2024
8b9e1ce
removing cyclic dependancy + removing dead code
MelReyCG Jun 27, 2024
a413f88
dead code
MelReyCG Jun 27, 2024
ea1844a
Starting to simplify the CellElementRegionSelector methods.
MelReyCG Jun 27, 2024
ba89c65
Working on code clarification (naming, comments)
MelReyCG Jun 28, 2024
bd343dd
method rename
MelReyCG Jul 1, 2024
d8c0ae4
added joinLamda() to avoid creating lists to feed join()
MelReyCG Jul 1, 2024
ed1ba30
joinLambda docs
MelReyCG Jul 1, 2024
5ed9e6d
accumulating errors
MelReyCG Jul 1, 2024
b6e7ded
useless local variable
MelReyCG Jul 1, 2024
9672520
improving code comments
MelReyCG Jul 2, 2024
054dd51
Worked on clarifying joinLambda
MelReyCG Jul 5, 2024
65b655c
Merge commit '9a144b870567192f669eca49ff8606d52d559ffa' into feature/…
MelReyCG Jul 16, 2024
8903b3c
new merged cases adaptations
MelReyCG Jul 16, 2024
e797afb
Merge branch 'develop' into fileIO-refactor-start
MelReyCG Jul 22, 2024
42a04c0
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Jul 23, 2024
117ff6b
todos
MelReyCG Jul 23, 2024
2e70623
error formatting
MelReyCG Jul 25, 2024
61d5dd6
uncrustify & docs
MelReyCG Jul 25, 2024
ee5411a
formatting & throwing bugfixes
MelReyCG Jul 25, 2024
21fbaac
Merge branch 'feature/rey/cellblocks-easier-naming' of https://github…
MelReyCG Jul 25, 2024
3583018
🐛 fixing some joinLambda() calls
MelReyCG Jul 25, 2024
18837ec
removing debug logs
MelReyCG Jul 25, 2024
5817ab8
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Jul 25, 2024
d9a76c8
⚰️ removing dead code
MelReyCG Jul 25, 2024
a8639e2
⚰️ remove dead code
MelReyCG Jul 25, 2024
4e16a41
DataTypes.hpp now only manage static types
MelReyCG Jul 26, 2024
99c20c8
generated files
MelReyCG Jul 26, 2024
d0c8bbb
Merge remote-tracking branch 'origin/develop' into fileIO-refactor-ba…
MelReyCG Jul 26, 2024
008f8e8
sharper todos
MelReyCG Jul 26, 2024
56a4db2
more todo
MelReyCG Jul 26, 2024
fb447b8
removing common -> fileIO
MelReyCG Jul 26, 2024
78afee2
last common->fileIO ref
MelReyCG Jul 26, 2024
675f6a6
removing common->codingUtilities
MelReyCG Jul 26, 2024
ef68fd0
logger has now a dedicated folder for upcoming files (future PRs)
MelReyCG Jul 26, 2024
71d9dbc
🐛 compil fix (dynamicCast)
MelReyCG Jul 29, 2024
e660950
📝 missed docs (where not previously catched by the CI)
MelReyCG Jul 29, 2024
df1be47
🐛 compil fix fix (dynamicCast)
MelReyCG Jul 29, 2024
9bb911a
📝 docs fix
MelReyCG Jul 29, 2024
4388b5d
Merge branch 'develop' into feature/rey/remove-circular-fileIO&common…
MelReyCG Jul 29, 2024
ce8269e
Merge remote-tracking branch 'origin/develop' into feature/rey/cellbl…
MelReyCG Jul 30, 2024
6981b3b
Merge remote-tracking branch 'origin/develop' into feature/rey/remove…
MelReyCG Jul 31, 2024
35dcf20
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Aug 1, 2024
4084a46
Merge remote-tracking branch 'origin/develop' into feature/rey/remove…
MelReyCG Aug 2, 2024
cca83e0
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Aug 2, 2024
9cc8eba
Merge branch 'feature/rey/remove-circular-fileIO&common-dependancies'…
MelReyCG Aug 2, 2024
75b6156
Moving EnumStrings.hpp from codingUtilities to common/format
MelReyCG Aug 2, 2024
8d673e6
moving the regex in codingUtilities as it is related to rtTypes / reg…
MelReyCG Aug 2, 2024
bb14d9a
adding docs
MelReyCG Aug 2, 2024
9ab5f99
removing dependency with TypeName<T>
MelReyCG Aug 2, 2024
de439f4
uncrustify
MelReyCG Aug 2, 2024
9456395
Merge remote-tracking branch 'origin/feature/rey/remove-circular-file…
MelReyCG Aug 2, 2024
08357a5
Merge commit 'de439f46c8b9e96ba5eb276661994acba3fd3828' into feature/…
MelReyCG Aug 2, 2024
a3522af
Merge branch 'feature/rey/cellblocks-easier-naming' of https://github…
MelReyCG Aug 2, 2024
4f53eca
Revert "Merge commit 'de439f46c8b9e96ba5eb276661994acba3fd3828' into …
MelReyCG Aug 2, 2024
fbeb75b
📝 doc fix
MelReyCG Aug 2, 2024
91822e5
Merge remote-tracking branch 'origin/develop' into feature/rey/cellbl…
MelReyCG Aug 20, 2024
e179804
forgotten impacted files by PR ##3278
MelReyCG Aug 20, 2024
c37637c
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Aug 22, 2024
321b843
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Aug 26, 2024
888eef9
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Aug 27, 2024
310a56b
🎨 renamed iteratorFormatter -> formattingFunc
MelReyCG Aug 28, 2024
9a73652
added CellElementRegionSelector::cellBlockTypeSeparator to prevent hi…
MelReyCG Aug 28, 2024
a25dbe9
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
rrsettgast Aug 29, 2024
3bac273
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
rrsettgast Aug 30, 2024
1d30fdc
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
CusiniM Sep 5, 2024
1f43541
Merge remote-tracking branch 'origin/develop' into feature/rey/cellbl…
MelReyCG Sep 5, 2024
0c6796c
Merge remote-tracking branch 'origin/develop' into feature/rey/cellbl…
MelReyCG Sep 9, 2024
b10f0c6
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Sep 11, 2024
831a297
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Sep 12, 2024
dc8a011
removing dead code
MelReyCG Sep 26, 2024
3f8700c
✅ test update
MelReyCG Oct 1, 2024
c9c31e1
merged `cellBlocksAttributeValues` and `cellBlocksMatchPattern` in `c…
MelReyCG Oct 1, 2024
3400e72
✅ merged `cellBlocksAttributeValues` and `cellBlocksMatchPattern` in …
MelReyCG Oct 1, 2024
e089eff
📝 merged `cellBlocksAttributeValues` and `cellBlocksMatchPattern` in …
MelReyCG Oct 1, 2024
5ec6956
Merge commit 'c225416b8ca7efcc08e13503f96dbc08e3c925f3' into feature/…
MelReyCG Oct 1, 2024
d8cb67a
🐛 exemples merge fixes
MelReyCG Oct 2, 2024
4f3bd60
📦 generated schema
MelReyCG Oct 2, 2024
c49a6a2
changing unit test mesh for a smaller one (size/14)
MelReyCG Oct 2, 2024
6d69126
🔇 removing debug logs
MelReyCG Oct 2, 2024
8275ea7
⚰️ removing dead code
MelReyCG Oct 2, 2024
92e8f22
💡 added comment
MelReyCG Oct 2, 2024
f6b9c74
Merge remote-tracking branch 'origin/develop' into feature/rey/cellbl…
MelReyCG Oct 2, 2024
37ae0f9
📝 docs docs
MelReyCG Oct 2, 2024
d68c64c
🔥removed the big unclipped mesh
MelReyCG Oct 2, 2024
3a7f581
kepping integer type for region attribute outside of CellElementRegio…
MelReyCG Oct 2, 2024
32fd5a8
unit test bugfix: problem was cellblocks were re-written, which was n…
MelReyCG Oct 3, 2024
e401f98
uncrustify
MelReyCG Oct 3, 2024
8960c52
schema update
MelReyCG Oct 3, 2024
74b4e4b
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Oct 3, 2024
4b78fc5
🐛 small docs bugfix
MelReyCG Oct 3, 2024
f22e444
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Oct 4, 2024
53fa7cd
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Oct 8, 2024
fc1ed32
simplified CellElementRegion to only one "cellBlockNames" attribute s…
MelReyCG Oct 9, 2024
278c120
Merge remote-tracking branch 'origin/develop' into feature/rey/cellbl…
MelReyCG Oct 16, 2024
155ee8d
Merge branch 'develop' into feature/rey/cellblocks-easier-naming
MelReyCG Oct 17, 2024
0d6be41
rebaseline
MelReyCG Oct 17, 2024
ed2ded2
✅ failing test fix
MelReyCG Oct 17, 2024
410b9d5
rebaseline (2nd attempt)
MelReyCG Oct 17, 2024
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 examples/GPU/beamBending.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<ElementRegions>
<CellElementRegion
name="Region2"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ shale }"/>
</ElementRegions>

Expand Down
2 changes: 1 addition & 1 deletion examples/advanced_xml_features/included/included_b.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ water, rock }"/>
</ElementRegions>

Expand Down
2 changes: 1 addition & 1 deletion examples/advanced_xml_features/parameters_example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ XML Units:
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ water, rock }"/>
</ElementRegions>

Expand Down
2 changes: 1 addition & 1 deletion examples/advanced_xml_features/symbolic_math_example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ XML Symbolic Math:
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ water, rock }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<ElementRegions>
<CellElementRegion
name="Domain"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ water, rock }"/>

<SurfaceElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<ElementRegions>
<CellElementRegion
name="Region2"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ shale }"/>
</ElementRegions>

Expand Down
2 changes: 1 addition & 1 deletion examples/sedovKernelTest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<ElementRegions>
<CellElementRegion
name="Region2"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ shale }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid1, rock, relperm, cappres }"/>
</ElementRegions>

Expand Down
2 changes: 1 addition & 1 deletion inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid1, rock, relperm }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid1, rock, relperm, capPressure }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ block }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>
<!-- SPHINX_TUT_DEAD_OIL_BOTTOM_SPE10_ELEMENT_REGIONS_END -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ block }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>
<!-- SPHINX_TUT_DEAD_OIL_BOTTOM_SPE10_ELEMENT_REGIONS_END -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>
<!-- SPHINX_ELEMENTREGIONS_END -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>
<!-- SPHINX_ELEMENTREGIONS_END -->
Expand Down
2 changes: 1 addition & 1 deletion inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>
</ElementRegions>

Expand Down
2 changes: 1 addition & 1 deletion inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cb }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>
<!-- SPHINX_ELEMENTREGIONS_END -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>
<!-- SPHINX_ELEMENTREGIONS_END -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>
</ElementRegions>
<!-- materialList="{ fluid, rock, relperm }" -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>
</ElementRegions>
<!-- materialList="{ fluid, rock, relperm }" -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<ElementRegions>
<CellElementRegion
name="Domain"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid1, rock, relperm }"/>

<SurfaceElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ block1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
</ElementRegions>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ 1_hexahedra }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ 1_hexahedra }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ 1_hexahedra }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ 1_hexahedra }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ DEFAULT_HEX }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ hexahedra }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cb }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>
<WellElementRegion
name="wellRegion1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cb }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm, cappres }"/>
<WellElementRegion
name="wellRegion1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cb }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
<WellElementRegion
name="wellRegion1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<ElementRegions>
<CellElementRegion
name="region"
cellBlocks="{ cb }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>
<WellElementRegion
name="wellRegion1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid1, rock, relperm }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid1, rock, relperm }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid1, rock, relperm }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<ElementRegions>
<CellElementRegion
name="Region1"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<ElementRegions>
<CellElementRegion
name="reservoir"
cellBlocks="{ cellBlock }"
cellBlocksMatch="{ * }"
materialList="{ fluid, rock, relperm }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,3 @@
</Events>
<!-- SPHINX_FIELD_CASE_Co2_EVENTS_END -->
</Problem>

Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<ElementRegions>
<CellElementRegion
name="Channel"
cellBlocks="{ tetrahedra }"
cellBlocksMatch="{ * }"
materialList="{ fluid1, rock, relperm }"/>

<WellElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<ElementRegions>
<CellElementRegion
name="Domain"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ rock }"/>

<SurfaceElementRegion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<ElementRegions>
<CellElementRegion
name="Domain"
cellBlocks="{ cb1 }"
cellBlocksMatch="{ * }"
materialList="{ rock }"/>

<SurfaceElementRegion
Expand Down
Loading
Loading