add two missing tests and adjust output naming

GEOS-DEV · May 10, 2024 · b230c59 · b230c59
1 parent 33c1962
commit b230c59
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 8 deletions.
diff --git a/...ultiphaseFlow/4comp_2ph_cap_1d_upwind.xml → ...sitionalMultiphaseFlow/2ph_cap_1d_ihu.xml b/...ultiphaseFlow/4comp_2ph_cap_1d_upwind.xml → ...sitionalMultiphaseFlow/2ph_cap_1d_ihu.xml
@@ -188,7 +188,8 @@
 
   <Outputs>
     <VTK
-        name="vtkOutput"/>
+        name="vtkOutput"
+        plotFileRoot="2ph_cap_1d_ihu"/>
 
     <Restart
         name="restartOutput"/>

diff --git a/inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml b/inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml
@@ -251,7 +251,8 @@
 
   <Outputs>
     <VTK
-      name="vtkOutput"/>
+      name="vtkOutput"
+      plotFileRoot="4comp_2ph_1d"/>
 
     <Restart
       name="restartOutput"/>

diff --git a/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml b/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml
@@ -313,7 +313,8 @@
 
   <Outputs>
     <VTK
-      name="vtkOutput"/>
+      name="vtkOutput"
+      plotFileRoot="co2_flux_3d"/>
 
     <Restart
       name="sidreRestart"/>

diff --git a/inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml b/inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml
@@ -199,7 +199,8 @@
 
   <Outputs>
     <VTK
-      name="vtkOutput"/>
+      name="vtkOutput"
+      plotFileRoot="co2_hybrid_1d"/>
 
     <Restart
       name="sidreRestart"/>

diff --git a/inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats b/inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats
@@ -30,6 +30,23 @@ decks = [
         restart_step=109,
         check_step=209,
         restartcheck_params=RestartcheckParameters(**restartcheck_params)),
+    TestDeck(
+        name="deadoil_3ph_stone2_1d",
+        description=
+        "Two-phase flow test for IHU (1D displacement, 2-phase, capillary pressure)",
+        "Compositional multiphase flow test (1D displacement, 3-phase dead-oil, Stone2 relperm)",
+        partitions=((1, 1, 1), (2, 1, 1), (3, 1, 1)),
+        restart_step=109,
+        check_step=209,
+        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
+    TestDeck(
+        name="deadoil_3ph_corey_1d_fractured",
+        description=
+        "Compositional multiphase flow test with EDFM (1D displacement, 3-phase dead-oil, Brooks-Corey pairwise 2-phase relperm curves)",
+        partitions=((1, 1, 1), (3, 1, 1)),
+        restart_step=109,
+        check_step=209,
+        restartcheck_params=RestartcheckParameters(**restartcheck_params)),
     TestDeck(
         name="co2_hybrid_1d",
         description=
@@ -86,6 +103,14 @@ decks = [
         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=30,
+        check_step=50,
+        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
@@ -179,7 +179,8 @@
 
   <Outputs>
     <VTK
-      name="vtkOutput"/>
+      name="vtkOutput"
+      plotFileRoot="deadoil_2ph_staircase_gravity_segregation_3d"/>
     <Restart
       name="restartOutput"/>
   </Outputs>

diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml
@@ -312,7 +312,8 @@
 
   <Outputs>
     <VTK
-      name="vtkOutput"/>
+      name="vtkOutput"
+      plotFileRoot="deadoil_3ph_corey_1d_fractured"/>
 
     <Restart
       name="restartOutput"/>

diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_3d.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_3d.xml
@@ -306,7 +306,8 @@
       name="siloOutput"
       plotLevel="3"/>
     <VTK
-      name="vtkOutput"/>
+      name="vtkOutput"
+      plotFileRoot="deadoil_3ph_staircase_3d"/>
 
     <Restart
       name="restartOutput"/>

diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_obl_3d.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_obl_3d.xml
@@ -252,7 +252,8 @@
   <!-- START_SPHINX_INCLUDE_OUTPUT_BLOCK -->
   <Outputs>
     <VTK
-      name="vtkOutput"/>
+      name="vtkOutput"
+      plotFileRoot="deadoil_3ph_staircase_obl_3d"/>
     <Restart
       name="restartOutput"/>
   </Outputs>