Merge pull request #388 from JamesMcClung/pr/fix-strange-test-failures

Fix strange test failures

Author: JamesMcClung

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}"

src/libpsc/tests/test_current_deposition.cxx

@@ -21,21 +21,21 @@ class CalcDivNc
   template <typename F>
   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 <typename F>
   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 <typename F>