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.

Sign up for GitHub

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

refactor: remove rel perm from wells #3483

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
+71 −93
Open

refactor: remove rel perm from wells #3483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7485031
fix: fix issue #2615
Dec 5, 2024
3e081e5
tests
Dec 5, 2024
7abe238
Update co2_flux_3d.xml
paveltomin Dec 5, 2024
bf7c5b6
Update co2_flux_dirichlet.xml
paveltomin Dec 5, 2024
79c07b3
try this
Dec 6, 2024
c605f9d
Merge branch 'pt/comp-flow-tests' of https://github.com/GEOS-DEV/GEOS…
Dec 6, 2024
6ef4c45
revert
Dec 6, 2024
a9084eb
Update .integrated_tests.yaml
paveltomin Dec 6, 2024
a169ad7
Update BASELINE_NOTES.md
paveltomin Dec 6, 2024
3eb1476
refactor: remove rel perm from wells
Dec 6, 2024
761187e
Update compositionalMultiphaseFlow.ats
paveltomin Dec 6, 2024
f087560
Update deadoil_3ph_corey_1d_fractured.xml
paveltomin Dec 6, 2024
e236261
Merge branch 'pt/comp-flow-tests' into pt/remove-relperm-from-wells
paveltomin Dec 6, 2024
f87aa0e
Merge branch 'develop' into pt/remove-relperm-from-wells
paveltomin Dec 16, 2024
16e3d90
Merge branch 'develop' into pt/remove-relperm-from-wells
paveltomin Dec 23, 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 ...ompositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_drainageOnly_direct_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

<WellElementRegion
name="wellRegion"
materialList="{ fluid, relperm, cappres }"/>
materialList="{ fluid }"/>
</ElementRegions>

<NumericalMethods>
Expand Down
2 changes: 1 addition & 1 deletion ...ositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_drainageOnly_iterative_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

<WellElementRegion
name="wellRegion"
materialList="{ fluid, relperm, cappres }"/>
materialList="{ fluid }"/>
</ElementRegions>
<!-- SPHINX_ER_END -->

Expand Down
2 changes: 1 addition & 1 deletion ...compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_direct_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

<WellElementRegion
name="wellRegion"
materialList="{ fluid, relperm, cappres }"/>
materialList="{ fluid }"/>
</ElementRegions>

<NumericalMethods>
Expand Down
2 changes: 1 addition & 1 deletion ...positionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<WellElementRegion
name="wellRegion"
materialList="{ fluid, relperm, cappres }"/>
materialList="{ fluid }"/>
</ElementRegions>

<NumericalMethods>
Expand Down
24 changes: 12 additions & 12 deletions inputFiles/compositionalMultiphaseWell/benchmarks/Egg/deadOilEgg_base_direct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,53 +230,53 @@

<WellElementRegion
name="wellRegion1"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion2"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<!-- SPHINX_TUT_DEAD_OIL_EGG_ELEMENT_REGIONS_END -->

<WellElementRegion
name="wellRegion3"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion4"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion5"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion6"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion7"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion8"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion9"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion10"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion11"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion12"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
</ElementRegions>

<!-- SPHINX_TUT_DEAD_OIL_EGG_CONSTITUTIVE -->
Expand Down
24 changes: 12 additions & 12 deletions inputFiles/compositionalMultiphaseWell/benchmarks/Egg/deadOilEgg_base_iterative.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,53 +232,53 @@

<WellElementRegion
name="wellRegion1"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion2"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<!-- SPHINX_TUT_DEAD_OIL_EGG_ELEMENT_REGIONS_END -->

<WellElementRegion
name="wellRegion3"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion4"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion5"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion6"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion7"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion8"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion9"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion10"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion11"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion12"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
</ElementRegions>

<!-- SPHINX_TUT_DEAD_OIL_EGG_CONSTITUTIVE -->
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/compositionalMultiphaseWell/black_oil_wells_saturated_3d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@
materialList="{ fluid, rock, relperm, cappres }"/>
<WellElementRegion
name="wellRegion1"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
<WellElementRegion
name="wellRegion2"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
</ElementRegions>

<Constitutive>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/compositionalMultiphaseWell/black_oil_wells_saturated_3d_stone2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@
materialList="{ fluid, rock, relperm, cappres }"/>
<WellElementRegion
name="wellRegion1"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
<WellElementRegion
name="wellRegion2"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
</ElementRegions>

<Constitutive>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/compositionalMultiphaseWell/black_oil_wells_unsaturated_3d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@
materialList="{ fluid, rock, relperm }"/>
<WellElementRegion
name="wellRegion1"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
<WellElementRegion
name="wellRegion2"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
</ElementRegions>

<Constitutive>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/compositionalMultiphaseWell/black_oil_wells_unsaturated_3d_stone2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@
materialList="{ fluid, rock, relperm }"/>
<WellElementRegion
name="wellRegion1"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
<WellElementRegion
name="wellRegion2"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
</ElementRegions>

<Constitutive>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/compositionalMultiphaseWell/compositional_multiphase_wells_1d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@

<WellElementRegion
name="wellRegion1"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>

<WellElementRegion
name="wellRegion2"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>
</ElementRegions>

<Constitutive>
Expand Down
6 changes: 3 additions & 3 deletions inputFiles/compositionalMultiphaseWell/compositional_multiphase_wells_2d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@

<WellElementRegion
name="wellRegion1"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>

<WellElementRegion
name="wellRegion2"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>

<WellElementRegion
name="wellRegion3"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>
</ElementRegions>

<Constitutive>
Expand Down
6 changes: 3 additions & 3 deletions inputFiles/compositionalMultiphaseWell/dead_oil_wells_2d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@

<WellElementRegion
name="wellRegion1"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>

<WellElementRegion
name="wellRegion2"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>

<WellElementRegion
name="wellRegion3"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>
</ElementRegions>

<Constitutive>
Expand Down
6 changes: 3 additions & 3 deletions inputFiles/compositionalMultiphaseWell/dead_oil_wells_hybrid_2d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@

<WellElementRegion
name="wellRegion1"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion2"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>

<WellElementRegion
name="wellRegion3"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
</ElementRegions>

<Constitutive>
Expand Down
8 changes: 4 additions & 4 deletions inputFiles/compositionalMultiphaseWell/simpleCo2InjTutorial_base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

<WellElementRegion
name="wellRegion"
materialList="{ fluid, relperm, rockPerm }"/>
materialList="{ fluid }"/>
</ElementRegions>
<!-- SPHINX_FIELD_CASE_Co2_REGION_END -->

Expand Down Expand Up @@ -122,7 +122,7 @@
initialCondition="1"
component="0"
setNames="{ all }"
objectPath="ElementRegions"
objectPath="ElementRegions/reservoir"
fieldName="rockPerm_permeability"
scale="1e-15"
functionName="permxFunc"/>
Expand All @@ -132,7 +132,7 @@
initialCondition="1"
component="1"
setNames="{ all }"
objectPath="ElementRegions"
objectPath="ElementRegions/reservoir"
fieldName="rockPerm_permeability"
scale="1e-15"
functionName="permyFunc"/>
Expand All @@ -142,7 +142,7 @@
initialCondition="1"
component="2"
setNames="{ all }"
objectPath="ElementRegions"
objectPath="ElementRegions/reservoir"
fieldName="rockPerm_permeability"
scale="3e-15"
functionName="permzFunc"/>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/compositionalMultiphaseWell/staircase_co2_wells_3d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@

<WellElementRegion
name="wellRegion1"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>

<WellElementRegion
name="wellRegion2"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>
</ElementRegions>

<NumericalMethods>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/compositionalMultiphaseWell/staircase_co2_wells_hybrid_3d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@

<WellElementRegion
name="wellRegion1"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>

<WellElementRegion
name="wellRegion2"
materialList="{ fluid1, relperm }"/>
materialList="{ fluid1 }"/>
</ElementRegions>

<NumericalMethods>
Expand Down
4 changes: 2 additions & 2 deletions inputFiles/poromechanics/PoroElastic_staircase_co2_3d_base.xml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
materialList="{ fluid, porousRockBarrier, relperm }"/>
<WellElementRegion
name="wellRegion1"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
<WellElementRegion
name="wellRegion2"
materialList="{ fluid, relperm }"/>
materialList="{ fluid }"/>
</ElementRegions>

<Constitutive>
Expand Down
Loading
Loading