diff --git a/.travis.yml b/.travis.yml index 069dac02..6995e2ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ env: matrix: - TEST_PACKAGE="pyclaw" - TEST_PACKAGE="petclaw" + - TEST_PACKAGE="IO" - TEST_PACKAGE="forestclaw" python: diff --git a/run_tests_on_travis.sh b/run_tests_on_travis.sh index 6782fa21..6dc3dfa7 100755 --- a/run_tests_on_travis.sh +++ b/run_tests_on_travis.sh @@ -13,7 +13,7 @@ if [ "${TEST_PACKAGE}" == "pyclaw" ]; then nosetests --first-pkg-wins --with-doctest --exclude=limiters --exclude=sharpclaw --exclude=fileio --exclude=example --with-coverage --cover-package=clawpack.pyclaw; mv .coverage .coverage.doctest; # pyclaw examples and I/O tests - nosetests -v --first-pkg-wins --exclude=limiters --exclude=sharpclaw --with-coverage --cover-package=clawpack.pyclaw --include=IOTest; + #nosetests -v --first-pkg-wins --exclude=limiters --exclude=sharpclaw --with-coverage --cover-package=clawpack.pyclaw --include=IOTest; cd ../../examples; nosetests -v --with-coverage --cover-package=clawpack.pyclaw; mv .coverage ../src/pyclaw/.coverage.examples; @@ -30,6 +30,14 @@ if [[ "${TEST_PACKAGE}" == "petclaw" ]]; then mpirun -n 4 nosetests -v --first-pkg-wins; fi +if [ "${TEST_PACKAGE}" == "IO" ]; then + # pyclaw I/O tests + nosetests -v --first-pkg-wins --exclude=limiters --exclude=sharpclaw --with-coverage --cover-package=clawpack.pyclaw --include=IOTest; + #cd ../src/pyclaw; + #coverage combine; +fi + + if [[ "${TEST_PACKAGE}" == "forestclaw" ]]; then # forestclaw tests (I/O only) cd ../forestclaw; diff --git a/src/pyclaw/classic/solver.py b/src/pyclaw/classic/solver.py index 3f104e4b..23d408f4 100644 --- a/src/pyclaw/classic/solver.py +++ b/src/pyclaw/classic/solver.py @@ -206,6 +206,7 @@ def setup(self,solution): self._check_cfl_settings() + assert isinstance(self.num_waves, int), "You must set solver.num_waves before using the solver." self._set_mthlim() if(self.kernel_language == 'Fortran'): if self.fmod is None: