Merge branch 'develop' into feature/aronson/inputScaling

GEOS-DEV · Dec 17, 2024 · e685e3c · e685e3c
2 parents 3edc2de + 93f0252
commit e685e3c
Show file tree

Hide file tree

Showing 66 changed files with 693 additions and 464 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -330,7 +330,7 @@ jobs:
             DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
             DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
 
-          - name: Pangea 3 (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10)
+          - name: Pangea 3 CUDA (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10)
             BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema"
             CMAKE_BUILD_TYPE: Release
             BUILD_GENERATOR: "--makefile"

diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml
@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr3450-9221-37d940c
+  baseline: integratedTests/baseline_integratedTests-pr3479-9362-cffefcc
 allow_fail:
   all: ''
   streak: ''
diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md
@@ -6,6 +6,14 @@ 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 #3479 (2024-12-15)
+=====================
+Refine inputFiles/compositionalMultiphaseFlow: shift reference pressures to initial pressures, make nonlinear tuning more reasonable, minimize output.
+
+PR #3450 (2024-12-14)
+=====================
+Fix timestep selector flaw in SolidMechanicsLagrangeContact.
+
 PR #3450 (2024-12-08)
 =====================
 Added test for explicit runge kutta sprinslider.

diff --git a/inputFiles/compositionalMultiphaseFlow/2ph_cap_1d_ihu.xml b/inputFiles/compositionalMultiphaseFlow/2ph_cap_1d_ihu.xml
@@ -94,7 +94,7 @@
     <PressurePorosity
         name="rockPorosity"
         defaultReferencePorosity="0.2"
-        referencePressure="0.0"
+        referencePressure="7.5e6"
         compressibility="1.0e-9"/>
 
     <BrooksCoreyRelativePermeability

diff --git a/inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml b/inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml
@@ -104,7 +104,7 @@
     <PressurePorosity
       name="rockPorosity"
       defaultReferencePorosity="0.2"
-      referencePressure="0.0"
+      referencePressure="5e6"
       compressibility="1.0e-9"/>
 
     <BrooksCoreyRelativePermeability

diff --git a/inputFiles/compositionalMultiphaseFlow/4comp_2ph_cap_1d.xml b/inputFiles/compositionalMultiphaseFlow/4comp_2ph_cap_1d.xml
@@ -45,7 +45,7 @@
     maxTime="2e7">
     <PeriodicEvent
       name="outputs"
-      timeFrequency="1e6"
+      timeFrequency="1e7"
       target="/Outputs/siloOutput"/>
 
     <PeriodicEvent
@@ -77,8 +77,7 @@
   <NumericalMethods>
     <FiniteVolume>
       <TwoPointFluxApproximation
-        name="fluidTPFA"
-        />
+        name="fluidTPFA"/>
     </FiniteVolume>
   </NumericalMethods>
 
@@ -117,7 +116,7 @@
     <PressurePorosity
       name="rockPorosity"
       defaultReferencePorosity="0.2"
-      referencePressure="0.0"
+      referencePressure="5e6"
       compressibility="1.0e-9"/>
 
     <BrooksCoreyRelativePermeability

diff --git a/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml b/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml
@@ -9,12 +9,10 @@
       temperature="368.15"
       useMass="1"
       useTotalMassEquation="0"
-      useSimpleAccumulation="1"
       targetRegions="{ region }">
       <NonlinearSolverParameters
         newtonTol="1.0e-5"
-        newtonMaxIter="100"
-        maxTimeStepCuts="5"
+        newtonMaxIter="10"
         lineSearchAction="None"/>
       <LinearSolverParameters
         directParallel="0"/>
@@ -92,7 +90,7 @@
 
     <PeriodicEvent
       name="outputs"
-      timeFrequency="1e5"
+      timeFrequency="5e5"
       target="/Outputs/vtkOutput"/>
 
     <PeriodicEvent
@@ -136,7 +134,7 @@
     <PressurePorosity
       name="rockPorosity"
       defaultReferencePorosity="0.2"
-      referencePressure="0.0"
+      referencePressure="1.1e7"
       compressibility="1.0e-9"/>
     <ConstantPermeability
       name="rockPerm"

diff --git a/inputFiles/compositionalMultiphaseFlow/co2_flux_dirichlet.xml b/inputFiles/compositionalMultiphaseFlow/co2_flux_dirichlet.xml
@@ -11,8 +11,7 @@
       targetRegions="{ region }">
       <NonlinearSolverParameters
         newtonTol="1.0e-4"
-        newtonMaxIter="100"
-        maxTimeStepCuts="5"
+        newtonMaxIter="20"
         lineSearchAction="None"/>
       <LinearSolverParameters
         solverType="fgmres"
@@ -61,7 +60,7 @@
 
     <PeriodicEvent
       name="outputs"
-      timeFrequency="1e5"
+      timeFrequency="5e5"
       targetExactTimestep="1"
       target="/Outputs/vtkOutput" />
 

diff --git a/inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml b/inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml
@@ -14,8 +14,7 @@
       targetRegions="{ region }">
       <NonlinearSolverParameters
         newtonTol="1.0e-6"
-        newtonMaxIter="100"
-        maxTimeStepCuts="5"/>
+        newtonMaxIter="10"/>
       <LinearSolverParameters
         directParallel="0"/>
     </CompositionalMultiphaseHybridFVM>
@@ -50,7 +49,7 @@
     maxTime="1e5">
     <PeriodicEvent
       name="outputs"
-      timeFrequency="1e4"
+      timeFrequency="5e4"
       target="/Outputs/vtkOutput"/>
 
     <PeriodicEvent
@@ -100,7 +99,7 @@
     <PressurePorosity
       name="rockPorosity"
       defaultReferencePorosity="0.2"
-      referencePressure="0.0"
+      referencePressure="9e6"
       compressibility="1.0e-9"/>
 
     <BrooksCoreyRelativePermeability

diff --git a/inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats b/inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats
@@ -21,6 +21,22 @@ decks = [
         restart_step=118,
         check_step=218,
         restartcheck_params=RestartcheckParameters(**restartcheck_params)),
+    TestDeck(
+        name="co2_hybrid_1d",
+        description=
+        "Compositional co2-brine flow test (1D displacement, hybrid FVM, Brooks-Corey pairwise 2-phase relperm curves)",
+        partitions=((1, 1, 1), (2, 1, 1), (3, 1, 1)),
+        restart_step=5,
+        check_step=10,
+        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
+    TestDeck(
+        name="2ph_cap_1d_ihu",
+        description=
+        "Two-phase flow test for IHU (1D displacement, 2-phase, capillary pressure)",
+        partitions=((1, 1, 1), (3, 1, 1)),
+        restart_step=34,
+        check_step=60,
+        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
     TestDeck(
         name="deadoil_3ph_corey_1d",
         description=
@@ -45,14 +61,6 @@ decks = [
         restart_step=0,
         check_step=209,
         restartcheck_params=RestartcheckParameters(**restartcheck_params)),
-    TestDeck(
-        name="co2_hybrid_1d",
-        description=
-        "Compositional co2-brine flow test (1D displacement, hybrid FVM, Brooks-Corey pairwise 2-phase relperm curves)",
-        partitions=((1, 1, 1), (2, 1, 1), (3, 1, 1)),
-        restart_step=5,
-        check_step=10,
-        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
     TestDeck(
         name="deadoil_3ph_baker_1d",
         description=
@@ -77,6 +85,14 @@ decks = [
         restart_step=28,
         check_step=38,
         restartcheck_params=RestartcheckParameters(**restartcheck_params)),
+    TestDeck(
+        name="deadoil_3ph_staircase_obl_3d",
+        description=
+        "Smoke test for a staircase deadoil test (3D displacement, 3-phase dead-oil, OBL)",
+        partitions=((1, 1, 1), (2, 2, 2)),
+        restart_step=28,
+        check_step=38,
+        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
     TestDeck(
         name="deadoil_2ph_staircase_gravity_segregation_3d",
         description=
@@ -100,23 +116,7 @@ decks = [
         partitions=((1, 1, 1), (2, 1, 3)),
         restart_step=23,
         check_step=46,
-        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
-    TestDeck(
-        name="deadoil_3ph_staircase_obl_3d",
-        description=
-        "Smoke test for a staircase deadoil test (3D displacement, 3-phase dead-oil, OBL)",
-        partitions=((1, 1, 1), (2, 2, 2)),
-        restart_step=28,
-        check_step=38,
-        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
-    TestDeck(
-        name="2ph_cap_1d_ihu",
-        description=
-        "Two-phase flow test for IHU (1D displacement, 2-phase, capillary pressure)",
-        partitions=((1, 1, 1), (3, 1, 1)),
-        restart_step=34,
-        check_step=60,
-        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
+        restartcheck_params=RestartcheckParameters(**restartcheck_params))
 ]
 
 generate_geos_tests(decks)
diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_2ph_staircase_gravity_segregation_3d.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_2ph_staircase_gravity_segregation_3d.xml
@@ -13,8 +13,7 @@
       temperature="300">
       <NonlinearSolverParameters
         newtonTol="1.0e-9"
-        newtonMaxIter="15"
-        lineSearchMaxCuts="2"/>
+        newtonMaxIter="15"/>
       <LinearSolverParameters
         directParallel="0"/>
     </CompositionalMultiphaseFVM>
@@ -108,7 +107,7 @@
     <PressurePorosity
       name="rockPorosity"
       defaultReferencePorosity="0.2"
-      referencePressure="0.0"
+      referencePressure="5e6"
       compressibility="1.0e-9"/>
     <ConstantPermeability
       name="rockPerm"

diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_baker_1d.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_baker_1d.xml
@@ -10,8 +10,7 @@
       temperature="300">
       <NonlinearSolverParameters
         newtonTol="1.0e-10"
-        newtonMaxIter="15"
-        lineSearchMaxCuts="2"/>
+        newtonMaxIter="10"/>
       <LinearSolverParameters
         directParallel="0"/>
     </CompositionalMultiphaseFVM>
@@ -46,7 +45,7 @@
     maxTime="2e7">
     <PeriodicEvent
       name="outputs"
-      timeFrequency="1e6"
+      timeFrequency="1e7"
       target="/Outputs/siloOutput"/>
 
     <PeriodicEvent
@@ -107,7 +106,7 @@
     <PressurePorosity
       name="rockPorosity"
       defaultReferencePorosity="0.05"
-      referencePressure="0.0"
+      referencePressure="7.5e6"
       compressibility="1.0e-9"/>
 
     <BrooksCoreyBakerRelativePermeability

diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d.xml
@@ -46,7 +46,7 @@
     maxTime="2e7">
     <PeriodicEvent
       name="outputs"
-      timeFrequency="1e6"
+      timeFrequency="1e7"
       target="/Outputs/siloOutput"/>
 
     <PeriodicEvent
@@ -102,7 +102,7 @@
     <PressurePorosity
       name="rockPorosity"
       defaultReferencePorosity="0.2"
-      referencePressure="0.0"
+      referencePressure="7.5e6"
       compressibility="1.0e-9"/>
 
     <BrooksCoreyRelativePermeability

diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml
@@ -16,9 +16,7 @@
         maxTimeStepCuts="2"
         lineSearchMaxCuts="2"/>
       <LinearSolverParameters
-        solverType="direct"
-        directParallel="0"
-        logLevel="0"/>
+        directParallel="0"/>
     </CompositionalMultiphaseFVM>
 
     <EmbeddedSurfaceGenerator
@@ -32,7 +30,7 @@
 
   <Mesh>
     <InternalMesh
-      name="mesh1"
+      name="mesh"
       elementTypes="{ C3D8 }"
       xCoords="{ 0, 10 }"
       yCoords="{ 0, 1 }"
@@ -71,7 +69,7 @@
 
     <PeriodicEvent
       name="outputs"
-      timeFrequency="1e6"
+      timeFrequency="1e7"
       targetExactTimestep="1"
       target="/Outputs/vtkOutput"/>
 
@@ -111,18 +109,18 @@
     <CellElementRegion
       name="Domain"
       cellBlocks="{ * }"
-      materialList="{ fluid1, rock, relperm }"/>
+      materialList="{ fluid, rock, relperm }"/>
 
     <SurfaceElementRegion
       name="Fracture"
       defaultAperture="1.0e-4"
-      materialList="{ fluid1, fractureFilling, relperm }"
+      materialList="{ fluid, fractureFilling, relperm }"
       subRegionType="embeddedElement"/>
   </ElementRegions>
 
   <Constitutive>
     <DeadOilFluid
-      name="fluid1"
+      name="fluid"
       phaseNames="{ oil, gas, water }"
       surfaceDensities="{ 800.0, 0.9907, 1022.0 }"
       componentMolarWeight="{ 114e-3, 16e-3, 18e-3 }"
@@ -146,7 +144,7 @@
     <PressurePorosity
       name="rockPorosity"
       defaultReferencePorosity="0.2"
-      referencePressure="0.0"
+      referencePressure="5e6"
       compressibility="1.0e-9"/>
 
     <ConstantPermeability
@@ -156,7 +154,7 @@
     <PressurePorosity
       name="fracturePorosity"
       defaultReferencePorosity="1.00"
-      referencePressure="0.0"
+      referencePressure="5e6"
       compressibility="0.0"/>
 
     <ParallelPlatesPermeability