Skip to content

Commit d3b1914

Browse files
committed
Move species specific reg tests to parallel_regression.
1 parent c7c9dfb commit d3b1914

3 files changed

Lines changed: 55 additions & 121 deletions

File tree

.github/workflows/regression.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ jobs:
6060
strategy:
6161
fail-fast: false
6262
matrix:
63-
testscript: ['tutorials.py', 'species_regression.py', 'parallel_regression.py', 'parallel_regression_AD.py', 'serial_regression.py', 'serial_regression_AD.py', 'hybrid_regression.py', 'hybrid_regression_AD.py']
63+
testscript: ['tutorials.py', 'parallel_regression.py', 'parallel_regression_AD.py', 'serial_regression.py', 'serial_regression_AD.py', 'hybrid_regression.py', 'hybrid_regression_AD.py']
6464
include:
6565
- testscript: 'tutorials.py'
6666
tag: MPI
67-
- testscript: 'species_regression.py'
68-
tag: MPI
6967
- testscript: 'parallel_regression.py'
7068
tag: MPI
7169
- testscript: 'parallel_regression_AD.py'
@@ -92,7 +90,7 @@ jobs:
9290
uses: docker://su2code/test-su2:20200303
9391
with:
9492
# -t <Tutorials-branch> -c <Testcases-branch>
95-
args: -b ${{github.ref}} -t develop -c feature_species -s ${{matrix.testscript}}
93+
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
9694
unit_tests:
9795
runs-on: ubuntu-latest
9896
name: Unit Tests

TestCases/parallel_regression.py

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,6 +1571,59 @@ def main():
15711571
mms_dg_ns_3d.tol = 0.0001
15721572
test_list.append(mms_dg_ns_3d)
15731573

1574+
#####################
1575+
## Species solver ###
1576+
#####################
1577+
1578+
# 2 species (1 eq) primitive venturi mixing
1579+
species2_primitiveVenturi = TestCase('species2_primitiveVenturi')
1580+
species2_primitiveVenturi.cfg_dir = "species_transport/venturi_primitive_3species"
1581+
species2_primitiveVenturi.cfg_file = "species2_primitiveVenturi.cfg"
1582+
species2_primitiveVenturi.test_iter = 50
1583+
species2_primitiveVenturi.test_vals = [-5.957517, -5.187476, -5.037298, -5.851420, -1.511976, -6.046002, 5, -0.808614, 5 , -2.351161, 5, -0.247992, 0.000092, 0.000090, 0.000002, 0.000000]
1584+
species2_primitiveVenturi.su2_exec = "mpirun -n 2 SU2_CFD"
1585+
species2_primitiveVenturi.timeout = 1600
1586+
species2_primitiveVenturi.new_output = True
1587+
species2_primitiveVenturi.tol = 0.00001
1588+
test_list.append(species2_primitiveVenturi)
1589+
1590+
# 3 species (2 eq) primitive venturi mixing
1591+
species3_primitiveVenturi = TestCase('species3_primitiveVenturi')
1592+
species3_primitiveVenturi.cfg_dir = "species_transport/venturi_primitive_3species"
1593+
species3_primitiveVenturi.cfg_file = "species3_primitiveVenturi.cfg"
1594+
species3_primitiveVenturi.test_iter = 50
1595+
species3_primitiveVenturi.test_vals = [-6.028145, -5.258104, -5.107927, -5.922051, -1.582604, -6.314220, -6.431771, 5, -0.808615, 5, -2.351160, 5, -0.288300, 1.645644, 0.499064, 0.601230, 0.545351]
1596+
species3_primitiveVenturi.su2_exec = "mpirun -n 2 SU2_CFD"
1597+
species3_primitiveVenturi.timeout = 1600
1598+
species3_primitiveVenturi.new_output = True
1599+
species3_primitiveVenturi.tol = 0.00001
1600+
test_list.append(species3_primitiveVenturi)
1601+
1602+
# 3 species (2 eq) primitive venturi mixing with inlet files.
1603+
# Note that the residuals are exactly the same as for the non-inlet case which should be the case for a fresh inlet file.
1604+
species3_primitiveVenturi_inletFile = TestCase('species3_primitiveVenturi_inletFile')
1605+
species3_primitiveVenturi_inletFile.cfg_dir = "species_transport/venturi_primitive_3species"
1606+
species3_primitiveVenturi_inletFile.cfg_file = "species3_primitiveVenturi_inletFile.cfg"
1607+
species3_primitiveVenturi_inletFile.test_iter = 50
1608+
species3_primitiveVenturi_inletFile.test_vals = [-6.028145, -5.258104, -5.107927, -5.922051, -1.582604, -6.314220, -6.431771, 5, -0.808615, 5, -2.351160, 5, -0.288300]
1609+
species3_primitiveVenturi_inletFile.su2_exec = "mpirun -n 2 SU2_CFD"
1610+
species3_primitiveVenturi_inletFile.timeout = 1600
1611+
species3_primitiveVenturi_inletFile.new_output = True
1612+
species3_primitiveVenturi_inletFile.tol = 0.00001
1613+
test_list.append(species3_primitiveVenturi_inletFile)
1614+
1615+
# rectangle passive transport validation
1616+
species_passive_val = TestCase('species_passive_val')
1617+
species_passive_val.cfg_dir = "species_transport/passive_transport_validation"
1618+
species_passive_val.cfg_file = "passive_transport.cfg"
1619+
species_passive_val.test_iter = 50
1620+
species_passive_val.test_vals = [-16.559189, -16.315116, -16.908670, -4.316833, 10.000000, -4.523292, 8.000000, -5.173152]
1621+
species_passive_val.su2_exec = "mpirun -n 2 SU2_CFD"
1622+
species_passive_val.timeout = 1600
1623+
species_passive_val.new_output = True
1624+
species_passive_val.tol = 0.00001
1625+
test_list.append(species_passive_val)
1626+
15741627
######################################
15751628
### RUN TESTS ###
15761629
######################################

TestCases/species_regression.py

Lines changed: 0 additions & 117 deletions
This file was deleted.

0 commit comments

Comments
 (0)