diff --git a/tests/test_convergence.py b/tests/test_convergence.py index 636dea9bc9487241b62166d35ac7367272e513b3..f00e8df7e46388c461b59c8f5b34c62936344baf 100755 --- a/tests/test_convergence.py +++ b/tests/test_convergence.py @@ -1,4 +1,3 @@ -#! /usr/bin/env python2 ####################################################################### # # # Copyright 2015 Max Planck Institute # @@ -30,7 +29,7 @@ import h5py from mpl_toolkits.mplot3d import axes3d import matplotlib.pyplot as plt -from test_base import * +from base import * def convergence_test( opt, @@ -224,6 +223,15 @@ def convergence_test( return c0, c1, c2 if __name__ == '__main__': - opt = parser.parse_args() + opt = parser.parse_args( + ['-n', '16', + '--run', + '--initialize', + '--ncpu', '2', + '--nparticles', '1000', + '--niter_todo', '32', + '--precision', 'single', + '--wd', 'data/single'] + + sys.argv[1:]) convergence_test(opt, launch) diff --git a/tox_convergence.ini b/tox_convergence.ini deleted file mode 100644 index 39a368ff0d1954cb841cbaab41e5a8d98bb68031..0000000000000000000000000000000000000000 --- a/tox_convergence.ini +++ /dev/null @@ -1,31 +0,0 @@ -[tox] -envlist = py34 -[testenv] -deps = matplotlib -whitelist_externals = - echo - cp -passenv = LD_LIBRARY_PATH -changedir = - {envtmpdir} -commands = - cp -r {toxinidir}/tests {envtmpdir} - python tests/test_convergence.py \ - -n 32 \ - --run \ - --initialize \ - --ncpu 2 \ - --nparticles 1 \ - --niter_todo 16 \ - --precision single \ - --wd "data/single" - python tests/test_convergence.py \ - -n 32 \ - --run \ - --initialize \ - --ncpu 2 \ - --nparticles 1 \ - --niter_todo 16 \ - --precision double \ - --wd "data/double" -