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

Add missing tests into ATS and adjust output naming #3120

Merged
merged 23 commits into from
Jun 5, 2024
Merged

Add missing tests into ATS and adjust output naming #3120

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b230c59
add two missing tests and adjust output naming
May 10, 2024
8b3dfef
ats file fix
May 10, 2024
ff73645
test this
May 13, 2024
39c3dff
Merge branch 'develop' into pt/multiphase-tests
paveltomin May 13, 2024
1c5af0f
Update ci_tests.yml
paveltomin May 13, 2024
96ad927
try that
May 13, 2024
b08924c
Update ci_tests.yml
paveltomin May 13, 2024
48c9a8d
revert
May 13, 2024
ecba36d
merge
May 13, 2024
200edc3
Update ci_tests.yml
paveltomin May 13, 2024
4e28c82
Update .integrated_tests.yaml
paveltomin May 13, 2024
7923006
Merge branch 'develop' into pt/multiphase-tests
paveltomin May 13, 2024
bb1512c
Update deadoil_3ph_corey_1d_fractured.xml
paveltomin May 13, 2024
3da2412
Update compositionalMultiphaseFlow.ats
paveltomin May 13, 2024
c06cd97
Update .integrated_tests.yaml
paveltomin May 13, 2024
e3b16bf
Merge branch 'develop' into pt/multiphase-tests
paveltomin May 14, 2024
b8c963e
disable restart for EmbeddedSurfaceGenerator
May 14, 2024
c8aca4f
Merge branch 'develop' into pt/multiphase-tests
paveltomin May 21, 2024
fcdd3a1
Merge branch 'develop' into pt/multiphase-tests
paveltomin May 30, 2024
d1e1daf
Merge branch 'develop' into pt/multiphase-tests
paveltomin Jun 5, 2024
bd245ed
Update .integrated_tests.yaml
paveltomin Jun 5, 2024
0c82fec
Update BASELINE_NOTES.md
paveltomin Jun 5, 2024
148a7e0
fix by disabling restart
Jun 5, 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
3 changes: 2 additions & 1 deletion ...ultiphaseFlow/4comp_2ph_cap_1d_upwind.xml → ...sitionalMultiphaseFlow/2ph_cap_1d_ihu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@

<Outputs>
<VTK
name="vtkOutput"/>
name="vtkOutput"
plotFileRoot="2ph_cap_1d_ihu"/>

<Restart
name="restartOutput"/>
Expand Down
3 changes: 2 additions & 1 deletion inputFiles/compositionalMultiphaseFlow/4comp_2ph_1d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@

<Outputs>
<VTK
name="vtkOutput"/>
name="vtkOutput"
plotFileRoot="4comp_2ph_1d"/>

<Restart
name="restartOutput"/>
Expand Down
3 changes: 2 additions & 1 deletion inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@

<Outputs>
<VTK
name="vtkOutput"/>
name="vtkOutput"
plotFileRoot="co2_flux_3d"/>

<Restart
name="sidreRestart"/>
Expand Down
3 changes: 2 additions & 1 deletion inputFiles/compositionalMultiphaseFlow/co2_hybrid_1d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@

<Outputs>
<VTK
name="vtkOutput"/>
name="vtkOutput"
plotFileRoot="co2_hybrid_1d"/>

<Restart
name="sidreRestart"/>
Expand Down
24 changes: 24 additions & 0 deletions inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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)
3 changes: 2 additions & 1 deletion inputFiles/compositionalMultiphaseFlow/deadoil_2ph_staircase_gravity_segregation_3d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@

<Outputs>
<VTK
name="vtkOutput"/>
name="vtkOutput"
plotFileRoot="deadoil_2ph_staircase_gravity_segregation_3d"/>
<Restart
name="restartOutput"/>
</Outputs>
Expand Down
7 changes: 4 additions & 3 deletions inputFiles/compositionalMultiphaseFlow/deadoil_3ph_corey_1d_fractured.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@
beginTime="1e5"
target="/Solvers/compflow"/>

<!-- <PeriodicEvent
<PeriodicEvent
name="restarts"
timeFrequency="1e7"
targetExactTimestep="0"
target="/Outputs/restartOutput"/>-->
target="/Outputs/restartOutput"/>
</Events>

<NumericalMethods>
Expand Down Expand Up @@ -312,7 +312,8 @@

<Outputs>
<VTK
name="vtkOutput"/>
name="vtkOutput"
plotFileRoot="deadoil_3ph_corey_1d_fractured"/>

<Restart
name="restartOutput"/>
Expand Down
3 changes: 2 additions & 1 deletion inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_3d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@
name="siloOutput"
plotLevel="3"/>
<VTK
name="vtkOutput"/>
name="vtkOutput"
plotFileRoot="deadoil_3ph_staircase_3d"/>

<Restart
name="restartOutput"/>
Expand Down
3 changes: 2 additions & 1 deletion inputFiles/compositionalMultiphaseFlow/deadoil_3ph_staircase_obl_3d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@

virtual void initializePostInitialConditionsPreSubGroups() override final;

virtual void postRestartInitialization() override final

Check warning on line 101 in src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp

View check run for this annotation

Codecov / codecov/patch

src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp#L101 

Added line #L101 was not covered by tests
{
GEOS_ERROR( "Restarting is not supported for cases involving EmbeddedSurfaceGenerator" );

Check warning on line 103 in src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp

View check run for this annotation

Codecov / codecov/patch

src/coreComponents/physicsSolvers/surfaceGeneration/EmbeddedSurfaceGenerator.hpp#L103 

Added line #L103 was not covered by tests
}

private:

void addToFractureStencil( DomainPartition & domain );
Expand Down
Loading