Skip to content

Commit

Permalink
refactor: remove rel perm from wells (#3483)
Browse files Browse the repository at this point in the history
  • Loading branch information
@paveltomin
paveltomin authored Mar 3, 2025
1 parent 8be57f3 commit f4d093c
Show file tree
Hide file tree
Showing 22 changed files with 64 additions and 94 deletions.
2 changes: 1 addition & 1 deletion .integrated_tests.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr3576-10454-f1f002d
baseline: integratedTests/baseline_integratedTests-pr3483-10464-f520bd9

allow_fail:
all: ''
Expand Down
4 changes: 4 additions & 0 deletions BASELINE_NOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ 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 #3483 (2025-03-02)
=====================
Remove relative permeability from wells.

PR #3576 (2025-03-01)
=====================
Add an option to skip density and viscosity computes when phase is not present for CO2 fluid update.
Expand Down
2 changes: 1 addition & 1 deletion ...ompositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_drainageOnly_direct_base.xml
View file
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit f4d093c

Please sign in to comment.