[CI] Improving output ctest.

tdegeus · Feb 14, 2021 · 5b7cb27 · 5b7cb27
1 parent 7ef4923
commit 5b7cb27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
       run: cmake --build .
 
     - name: Run C++ tests
-      run: cmake --build . --target "RUN_ALL_TESTS"
+      run: ctest --output-on-failure
 
     - name: Build and install Python module
       run: |

diff --git a/include/FrictionQPotFEM/UniformSingleLayer2d.hpp b/include/FrictionQPotFEM/UniformSingleLayer2d.hpp
@@ -1256,9 +1256,9 @@ inline void LocalTriggerFineLayerFull::setState(
             }
 
             auto idx = xt::argmin(W)();
-            m_smin(e, q) = S[idx];
-            m_pmin(e, q) = P[idx];
-            m_Wmin(e, q) = W[idx];
+            m_smin(e, q) = S.data()[idx];
+            m_pmin(e, q) = P.data()[idx];
+            m_Wmin(e, q) = W.data()[idx];
         }
     }
 }

diff --git a/test/UniformSingleLayer2d_LocalTrigger.cpp b/test/UniformSingleLayer2d_LocalTrigger.cpp
@@ -56,15 +56,17 @@ TEST_CASE("FrictionQPotFEM::UniformSingleLayer2d_LocalTrigger", "UniformSingleLa
         sys.setDt(dt);
 
         {
-            FrictionQPotFEM::UniformSingleLayer2d::LocalTriggerFineLayerFull trigger(sys);
-            trigger.setState(sys.Eps(), sys.Sig(), xt::ones<double>({plastic.size(), size_t(4)}));
+            FrictionQPotFEM::UniformSingleLayer2d::LocalTriggerFineLayer trigger(sys);
+            xt::xtensor<double, 2> epsy = xt::ones<double>({plastic.size(), size_t(4)});
+            trigger.setState(sys.Eps(), sys.Sig(), epsy);
             xt::xtensor<double, 2> barriers = 5.357607 * xt::ones<double>({plastic.size(), size_t(4)});
             REQUIRE(xt::allclose(barriers, trigger.barriers()));
         }
 
         {
-            FrictionQPotFEM::UniformSingleLayer2d::LocalTriggerFineLayer trigger(sys);
-            trigger.setState(sys.Eps(), sys.Sig(), xt::ones<double>({plastic.size(), size_t(4)}));
+            FrictionQPotFEM::UniformSingleLayer2d::LocalTriggerFineLayerFull trigger(sys);
+            xt::xtensor<double, 2> epsy = xt::ones<double>({plastic.size(), size_t(4)});
+            trigger.setState(sys.Eps(), sys.Sig(), epsy);
             xt::xtensor<double, 2> barriers = 5.357607 * xt::ones<double>({plastic.size(), size_t(4)});
             REQUIRE(xt::allclose(barriers, trigger.barriers()));
         }