diff --git a/scripts/run_test.sh b/scripts/run_test.sh index 4a976e310..0475ad6e2 100755 --- a/scripts/run_test.sh +++ b/scripts/run_test.sh @@ -6,7 +6,7 @@ set -e cd build -make $1 +make -j $1 mkdir -p runs cd runs mpirun -np 1 ../src/libpsc/tests/$1 "${@:2}" diff --git a/src/libpsc/tests/test_current_deposition.cxx b/src/libpsc/tests/test_current_deposition.cxx index b17f11d59..2c43aae87 100644 --- a/src/libpsc/tests/test_current_deposition.cxx +++ b/src/libpsc/tests/test_current_deposition.cxx @@ -21,21 +21,21 @@ class CalcDivNc template auto operator()(const F& flds, dim_yz tag) { - return (flds.view(_all, _s(1, _), _s(1, _), 1) - - flds.view(_all, _s(0, -1), _s(1, _), 1)) + - (flds.view(_all, _s(1, _), _s(1, _), 2) - - flds.view(_all, _s(1, _), _s(0, -1), 2)); + return gt::eval((flds.view(_all, _s(1, _), _s(1, _), 1) - + flds.view(_all, _s(0, -1), _s(1, _), 1)) + + (flds.view(_all, _s(1, _), _s(1, _), 2) - + flds.view(_all, _s(1, _), _s(0, -1), 2))); } template auto operator()(const F& flds, dim_xyz tag) { - return (flds.view(_s(1, _), _s(1, _), _s(1, _), 0) - - flds.view(_s(0, -1), _s(1, _), _s(1, _), 0)) + - (flds.view(_s(1, _), _s(1, _), _s(1, _), 1) - - flds.view(_s(1, _), _s(0, -1), _s(1, _), 1)) + - (flds.view(_s(1, _), _s(1, _), _s(1, _), 2) - - flds.view(_s(1, _), _s(1, _), _s(0, -1), 2)); + return gt::eval((flds.view(_s(1, _), _s(1, _), _s(1, _), 0) - + flds.view(_s(0, -1), _s(1, _), _s(1, _), 0)) + + (flds.view(_s(1, _), _s(1, _), _s(1, _), 1) - + flds.view(_s(1, _), _s(0, -1), _s(1, _), 1)) + + (flds.view(_s(1, _), _s(1, _), _s(1, _), 2) - + flds.view(_s(1, _), _s(1, _), _s(0, -1), 2))); } template