-
Notifications
You must be signed in to change notification settings - Fork 89
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.
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
Out of place ATS #2964
Merged
Merged
Out of place ATS #2964
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
17ff793
Moving ats files from integratedTests to inputFiles
cssherman 9063a32
Updating the input for a temporary geos python package branch name
cssherman 027e268
Fixing new ats xml names
cssherman 204ed51
Fixing ats source search method
cssherman 9e70a25
Moving cmake instructions for integratedTests
cssherman b64adca
Applying yapf to the .ats files
cssherman 1dd5899
Moving integratedTests doc file to main repo
cssherman 500d76b
Setting default values for integratedTests workflow to prepare for ba…
cssherman 1d563da
Resolving merge conflict
cssherman 6fc8b76
Temporarily setting the geosPythonPackages branch for all builds
cssherman 5535f45
Fixing curve check paths
cssherman cbbabef
Fixing hf curve check script
cssherman 95dfdea
Removing duplicate test
cssherman 2de97dc
Resolving merge conflicts
cssherman 89a7440
fixed some ats files.
CusiniM 4aec705
Resolving merge conflicts
cssherman 8bca8c6
Updating the integrated tests
cssherman 1d34b55
Updating integrated tests
cssherman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
inputFiles/compositionalMultiphaseFlow/benchmarks/SPE10/SPE10.ats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
decks = [ | ||
TestDeck( | ||
name="deadOilSpe10Layers84_85_smoke_2d", | ||
description= | ||
"Smoke test for SPE10 (2D displacement, 2-phase dead-oil, Brooks-Corey pairwise 2-phase relperm curves)", | ||
partitions=((1, 1, 1), (2, 2, 1)), | ||
restart_step=49, | ||
check_step=89, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
] | ||
|
||
generate_geos_tests(decks) |
19 changes: 19 additions & 0 deletions
19
.../compositionalMultiphaseFlow/benchmarks/buckleyLeverettProblem/buckleyLeverettProblem.ats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
decks = [ | ||
TestDeck( | ||
name="buckleyLeverett_smoke", | ||
description= | ||
"Smoke test for a CO2 core flood experiment (1D displacement, 2-phase dead-oil, Brooks-Corey pairwise 2-phase relperm curves)", | ||
partitions=((1, 1, 1), (2, 1, 1)), | ||
restart_step=9, | ||
check_step=13, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)) | ||
] | ||
|
||
generate_geos_tests(decks) |
19 changes: 19 additions & 0 deletions
19
...tFiles/compositionalMultiphaseFlow/benchmarks/isothermalLeakyWell/isothermalLeakyWell.ats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
decks = [ | ||
TestDeck( | ||
name="isothermalLeakyWell_smoke_3d", | ||
description= | ||
"Smoke test for isothermalLeakyWell (3D displacement, 2-phase dead-oil, hydrostatic initial condition)", | ||
partitions=((1, 1, 1), (2, 2, 1)), | ||
restart_step=60, | ||
check_step=104, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
] | ||
|
||
generate_geos_tests(decks) |
19 changes: 19 additions & 0 deletions
19
inputFiles/compositionalMultiphaseFlow/benchmarks/thermalLeakyWell/thermalLeakyWell.ats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
decks = [ | ||
TestDeck( | ||
name="thermalLeakyWell_smoke_3d", | ||
description= | ||
"Smoke test for thermalLeakyWell (3D displacement, 2-phase co2-brine, hydrostatic initial condition)", | ||
partitions=((1, 1, 1), (2, 2, 1)), | ||
restart_step=60, | ||
check_step=104, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
] | ||
|
||
generate_geos_tests(decks) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
decks = [ | ||
TestDeck(name="grav_seg_c1ppu_hyst", | ||
description="Smoke test for C1-PPU (1D displacement, C1-PPU)", | ||
partitions=((1, 1, 1), (1, 1, 2)), | ||
restart_step=87, | ||
check_step=109, | ||
restartcheck_params=RestartcheckParameters(atol=1e-4, rtol=1e-3)), | ||
] | ||
|
||
generate_geos_tests(decks) |
91 changes: 91 additions & 0 deletions
91
inputFiles/compositionalMultiphaseFlow/compositionalMultiphaseFlow.ats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
decks = [ | ||
TestDeck( | ||
name="4comp_2ph_1d", | ||
description= | ||
"Compositional multiphase flow test (1D displacement, 2-phase 4-component)", | ||
partitions=((1, 1, 1), (2, 1, 1), (3, 1, 1)), | ||
restart_step=6, | ||
check_step=11, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="4comp_2ph_cap_1d", | ||
description= | ||
"Compositional multiphase flow test (1D displacement, 2-phase 4-component, capillary pressure)", | ||
partitions=((1, 1, 1), (2, 1, 1), (3, 1, 1)), | ||
restart_step=118, | ||
check_step=218, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="deadoil_3ph_corey_1d", | ||
description= | ||
"Compositional multiphase flow test (1D displacement, 3-phase dead-oil, Brooks-Corey pairwise 2-phase relperm curves)", | ||
partitions=((1, 1, 1), (2, 1, 1), (3, 1, 1)), | ||
restart_step=109, | ||
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= | ||
"Compositional multiphase flow test (1D displacement, 3-phase dead-oil, Brooks-Corey-Baker 3-phase relperm curves)", | ||
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_staircase_3d", | ||
description= | ||
"Compositional multiphase flow test (3D staircase, 3-phase dead-oil, Brooks-Corey-Baker 3-phase relperm curves)", | ||
partitions=((1, 1, 1), (2, 2, 2)), | ||
restart_step=28, | ||
check_step=38, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="deadoil_3ph_staircase_hybrid_3d", | ||
description= | ||
"Compositional multiphase flow test (3D staircase, hybrid FVM, 3-phase dead-oil, Brooks-Corey-Baker 3-phase relperm curves)", | ||
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= | ||
"Compositional multiphase flow test (3D staircase, no-flow BC, 2-phase dead-oil, hysteresis)", | ||
partitions=((1, 1, 1), (2, 2, 2)), | ||
restart_step=61, | ||
check_step=121, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="co2_flux_3d", | ||
description= | ||
"Compositional co2-brine flow test (3D co2 injection, 2-phase co2-brine, Brooks-Corey 2-phase relperm curves)", | ||
partitions=((1, 1, 1), (2, 2, 2), (3, 3, 3)), | ||
restart_step=10, | ||
check_step=20, | ||
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)), | ||
] | ||
|
||
generate_geos_tests(decks) |
24 changes: 24 additions & 0 deletions
24
inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/Class09Pb3.ats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import os | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
# exclude any derivative fields from restart checks | ||
# example field name: dGlobalComponentFraction_dPressure | ||
#restartcheck_params["exclude"] = [r"d[A-Z]\w+_d[A-Z]\w+"] | ||
|
||
decks = [ | ||
TestDeck( | ||
name="class09_pb3_smoke_3d", | ||
description= | ||
"Smoke test for the Johansen model (3D displacement, structured mesh, CO2-brine)", | ||
partitions=[(1, 1, 1), (2, 2, 2)], | ||
restart_step=5, | ||
check_step=10, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
] | ||
|
||
generate_geos_tests(decks) |
26 changes: 26 additions & 0 deletions
26
inputFiles/compositionalMultiphaseWell/benchmarks/Egg/compositionalMultiphaseWell_Egg.ats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import os | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
# exclude any derivative fields from restart checks | ||
# example field name: dGlobalComponentFraction_dPressure | ||
#restartcheck_params["exclude"] = [r"d[A-Z]\w+_d[A-Z]\w+"] | ||
|
||
decks = [ | ||
TestDeck( | ||
name="deadOilEgg_smoke_3d", | ||
description= | ||
"Smoke test for the Egg model (3D displacement, structured mesh, 2-phase dead-oil, many wells)", | ||
partitions=[ | ||
(1, 1, 1), | ||
], | ||
restart_step=20, | ||
check_step=35, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
] | ||
|
||
generate_geos_tests(decks) |
88 changes: 88 additions & 0 deletions
88
inputFiles/compositionalMultiphaseWell/compositionalMultiphaseWell.ats
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
import os | ||
import geos_ats | ||
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests | ||
|
||
restartcheck_params = {} | ||
restartcheck_params["atol"] = 1.0E-6 | ||
restartcheck_params["rtol"] = 1.0E-5 | ||
|
||
# exclude any derivative fields from restart checks | ||
# example field name: dGlobalComponentFraction_dPressure | ||
#restartcheck_params["exclude"] = [r"d[A-Z]\w+_d[A-Z]\w+"] | ||
|
||
decks = [ | ||
TestDeck( | ||
name="compositional_multiphase_wells_1d", | ||
description= | ||
"Compositional multiphase well test (1D displacement, 2-phase 4-component, 2 wells)", | ||
partitions=[(1, 1, 1), (2, 1, 1)], | ||
restart_step=5, | ||
check_step=10, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="compositional_multiphase_wells_2d", | ||
description= | ||
"Compositional multiphase flow test (2D displacement, 2-phase 4-component, 3 wells)", | ||
partitions=[(1, 1, 1), (2, 2, 1)], | ||
restart_step=3, | ||
check_step=7, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="dead_oil_wells_2d", | ||
description= | ||
"Dead oil well test (2D displacement, 3-phase dead-oil, 3 wells)", | ||
partitions=[(1, 1, 1), (2, 2, 1)], | ||
restart_step=50, | ||
check_step=100, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="dead_oil_wells_hybrid_2d", | ||
description= | ||
"Dead oil well test (2D displacement, hybrid FVM, 3-phase dead-oil, 3 wells)", | ||
partitions=[(1, 1, 1), (2, 2, 1)], | ||
restart_step=50, | ||
check_step=100, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="black_oil_wells_saturated_3d", | ||
description= | ||
"Black oil well test (3D displacement, 3-phase black-oil, 2 wells)", | ||
partitions=[(1, 1, 1), (2, 2, 1)], | ||
restart_step=13, | ||
check_step=25, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="black_oil_wells_unsaturated_3d", | ||
description= | ||
"Black oil well test (3D displacement, hybrid FVM, 3-phase black-oil, 2 wells)", | ||
partitions=[(1, 1, 1), (2, 2, 1)], | ||
restart_step=8, | ||
check_step=12, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="staircase_co2_wells_3d", | ||
description= | ||
"CO2 well test (3D staircase, 2-phase 2-component, 2 wells)", | ||
partitions=[(1, 1, 1), (2, 2, 2)], | ||
restart_step=3, | ||
check_step=5, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="staircase_co2_wells_hybrid_3d", | ||
description= | ||
"CO2 well test (3D staircase, unstructured mesh, hybrid FVM, 2-phase 2-component, 2 wells)", | ||
partitions=[(1, 1, 1), (2, 2, 2)], | ||
restart_step=0, | ||
check_step=17, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)), | ||
TestDeck( | ||
name="black_oil_wells_saturated_3d_stone2", | ||
description= | ||
"Black oil well test using stone2 interp (3D displacement, hybrid FVM, 3-phase black-oil, 2 wells)", | ||
partitions=[(1, 1, 1), (2, 2, 1)], | ||
restart_step=12, | ||
check_step=25, | ||
restartcheck_params=RestartcheckParameters(**restartcheck_params)) | ||
] | ||
|
||
generate_geos_tests(decks) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So are you adding new tests? Or are you basically "removing" the links with the file they are pointing to?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm just about ready to start testing on the CI. The last steps are to figure out how we want to fetch the baselines and the default path for things on the CI.
I'm not adding/removing any tests here. Essentially, the script that I wrote did the following:
This was followed by some manual cleanup of invalid tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We 100% should go through and further curate the test files