diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml index 40892926250..79b4e93f13d 100644 --- a/.integrated_tests.yaml +++ b/.integrated_tests.yaml @@ -1,6 +1,6 @@ baselines: bucket: geosx - baseline: integratedTests/baseline_integratedTests-pr3113-5435-b794227 + baseline: integratedTests/baseline_integratedTests-pr3120-5441-d1e1daf allow_fail: all: '' diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md index 0838ee4ec43..40c1c70e41f 100644 --- a/BASELINE_NOTES.md +++ b/BASELINE_NOTES.md @@ -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 #3120 (2024-06-05) +===================== +Add missing compositionalMultiphaseFlow tests into ATS and adjust output naming. Rebaseline accordingly. + PR #3113 (2024-06-05) ===================== Add general version updateConfiguration. Rebaseline of some edfm cases is needed. diff --git a/inputFiles/compositionalMultiphaseFlow/4comp_2ph_cap_1d_upwind.xml b/inputFiles/compositionalMultiphaseFlow/2ph_cap_1d_ihu.xml similarity index 98% rename from inputFiles/compositionalMultiphaseFlow/4comp_2ph_cap_1d_upwind.xml rename to inputFiles/compositionalMultiphaseFlow/2ph_cap_1d_ihu.xml index 5d043375c8f..8ca061df0c1 100644 --- a/inputFiles/compositionalMultiphaseFlow/4comp_2ph_cap_1d_upwind.xml +++ b/inputFiles/compositionalMultiphaseFlow/2ph_cap_1d_ihu.xml @@ -188,7 +188,8 @@ + name="vtkOutput" + plotFileRoot="2ph_cap_1d_ihu"/> diff --git a/inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml b/inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml index 556e49fdea4..389f0e2a0af 100644 --- a/inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml +++ b/inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml @@ -251,7 +251,8 @@ + name="vtkOutput" + plotFileRoot="4comp_2ph_1d"/> diff --git a/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml b/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml index e0b3cecde11..d693f1542e3 100644 --- a/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml +++ b/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml @@ -313,7 +313,8 @@ + name="vtkOutput" + plotFileRoot="co2_flux_3d"/> diff --git a/inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml b/inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml index 296cd04fbc4..b5ea99f5ff5 100644 --- a/inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml +++ b/inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml @@ -199,7 +199,8 @@ + name="vtkOutput" + plotFileRoot="co2_hybrid_1d"/> diff --git a/inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats b/inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats index a0072bc2653..20d44298c97 100644 --- a/inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats +++ b/inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats @@ -30,6 +30,22 @@ decks = [ restart_step=109, check_step=209, restartcheck_params=RestartcheckParameters(**restartcheck_params)), + TestDeck( + name="deadoil_3ph_stone2_1d", + description= + "Compositional multiphase flow test (1D displacement, 3-phase dead-oil, Stone2 relperm curves)", + partitions=((1, 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=0, + check_step=209, + restartcheck_params=RestartcheckParameters(**restartcheck_params)), TestDeck( name="co2_hybrid_1d", description= @@ -86,6 +102,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=34, + check_step=60, + 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 index 0d9e9853828..595620b201c 100644 --- a/inputFiles/compositionalMultiphaseFlow/deadoil_2ph_staircase_gravity_segregation_3d.xml +++ b/inputFiles/compositionalMultiphaseFlow/deadoil_2ph_staircase_gravity_segregation_3d.xml @@ -179,7 +179,8 @@ + name="vtkOutput" + plotFileRoot="deadoil_2ph_staircase_gravity_segregation_3d"/> diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml index 35d52ad08c2..2d0b2693a80 100644 --- a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml +++ b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml @@ -88,11 +88,11 @@ beginTime="1e5" target="/Solvers/compflow"/> - + target="/Outputs/restartOutput"/> @@ -312,7 +312,8 @@ + name="vtkOutput" + plotFileRoot="deadoil_3ph_corey_1d_fractured"/> diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_3d.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_3d.xml index fc452b3d6d1..7c97d2eed8d 100644 --- a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_3d.xml +++ b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_3d.xml @@ -306,7 +306,8 @@ name="siloOutput" plotLevel="3"/> + name="vtkOutput" + plotFileRoot="deadoil_3ph_staircase_3d"/> diff --git a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_obl_3d.xml b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_obl_3d.xml index f9722261b2b..545ca4e81f2 100644 --- a/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_obl_3d.xml +++ b/inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_obl_3d.xml @@ -252,7 +252,8 @@ + name="vtkOutput" + plotFileRoot="deadoil_3ph_staircase_obl_3d"/> diff --git a/inputFiles/singlePhaseFlowFractures/singlePhaseFlowFractures.ats b/inputFiles/singlePhaseFlowFractures/singlePhaseFlowFractures.ats index 392c4217da4..e3453332620 100644 --- a/inputFiles/singlePhaseFlowFractures/singlePhaseFlowFractures.ats +++ b/inputFiles/singlePhaseFlowFractures/singlePhaseFlowFractures.ats @@ -36,7 +36,7 @@ decks = [ description= 'Single phase flow test (3D, incompressible, fracture/matrix flow, EDFM)', partitions=((1, 1, 1), (2, 2, 1)), - restart_step=1, + restart_step=0, check_step=1, restartcheck_params=RestartcheckParameters(**restartcheck_params)), TestDeck( @@ -44,7 +44,7 @@ decks = [ description= 'Single phase flow test (3D, incompressible, fracture/matrix flow, EDFM)', partitions=((1, 1, 1), (2, 2, 1)), - restart_step=1, + restart_step=0, check_step=1, restartcheck_params=RestartcheckParameters(**restartcheck_params)), TestDeck( diff --git a/src/coreComponents/mesh/SurfaceElementRegion.cpp b/src/coreComponents/mesh/SurfaceElementRegion.cpp index c9f036a6553..8d5b0b167e3 100644 --- a/src/coreComponents/mesh/SurfaceElementRegion.cpp +++ b/src/coreComponents/mesh/SurfaceElementRegion.cpp @@ -170,9 +170,9 @@ localIndex SurfaceElementRegion::addToFractureMesh( real64 const time_np1, for( localIndex ke = 0; ke < 2; ++ke ) { - localIndex const & er = faceToElementRegion[faceIndices[ke]][ke]; - localIndex const & esr = faceToElementSubRegion[faceIndices[ke]][ke]; - localIndex const & ei = faceToElementIndex[faceIndices[ke]][ke]; + localIndex const er = faceToElementRegion[faceIndices[ke]][ke]; + localIndex const esr = faceToElementSubRegion[faceIndices[ke]][ke]; + localIndex const ei = faceToElementIndex[faceIndices[ke]][ke]; if( er != -1 && esr != -1 && ei != -1 ) { diff --git a/src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp b/src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp index 2c2b6dd8ae1..2d8775cb1ab 100644 --- a/src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp +++ b/src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp @@ -98,6 +98,11 @@ class EmbeddedSurfaceGenerator : public SolverBase virtual void initializePostInitialConditionsPreSubGroups() override final; + virtual void postRestartInitialization() override final + { + GEOS_ERROR( "Restarting is not supported for cases involving EmbeddedSurfaceGenerator" ); + } + private: void addToFractureStencil( DomainPartition & domain );