Bugfix: Sig and Eps were not properly overridden

tdegeus · Oct 21, 2020 · 1f49bde · 1f49bde
1 parent ceecbdb
commit 1f49bde
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/include/FrictionQPotFEM/UniformSingleLayer2d.h b/include/FrictionQPotFEM/UniformSingleLayer2d.h
@@ -110,8 +110,8 @@ class System {
  auto quad() const;
 
  // Extract stress and strain tensors.
- auto Sig() const;
- auto Eps() const;
+ virtual xt::xtensor<double, 4> Sig();
+ virtual xt::xtensor<double, 4> Eps();
 
  // Extract for the plastic elements only (per integration point).
  virtual xt::xtensor<double, 4> plastic_Sig() const; // stress tensor
@@ -288,8 +288,8 @@ class HybridSystem : public System {
  // Extract stress and strain.
  // Note: involves re-evaluating the stress and strain,
  // as they are only known in the plastic elements.
- auto Sig();
- auto Eps();
+ xt::xtensor<double, 4> Sig() override;
+ xt::xtensor<double, 4> Eps() override;
 
  // Extract for the plastic elements only.
  xt::xtensor<double, 4> plastic_Sig() const override; // stress tensor

diff --git a/include/FrictionQPotFEM/UniformSingleLayer2d.hpp b/include/FrictionQPotFEM/UniformSingleLayer2d.hpp
@@ -300,12 +300,12 @@ inline auto System::quad() const
  return m_quad;
 }
 
-inline auto System::Sig() const
+inline xt::xtensor<double, 4> System::Sig()
 {
  return m_Sig;
 }
 
-inline auto System::Eps() const
+inline xt::xtensor<double, 4> System::Eps()
 {
  return m_Eps;
 }
@@ -562,8 +562,8 @@ inline void System::addSimpleShearToFixedStress(double target_stress)
 
  auto idx_new = this->plastic_CurrentIndex();
 
- FRICTIONQPOTFEM_REQUIRE(std::abs(target_stress - sig) / sig < 1e-4);
  FRICTIONQPOTFEM_REQUIRE(xt::all(xt::equal(idx, idx_new)));
+ FRICTIONQPOTFEM_REQUIRE(std::abs(target_stress - sig) / sig < 1e-4);
 }
 
 inline auto System::triggerElementWithLocalSimpleShear(double deps_kick, size_t plastic_element)
@@ -689,7 +689,7 @@ inline void HybridSystem::setPlastic(
  m_material_plas.setStrain(m_Eps_plas);
 }
 
-inline auto HybridSystem::Sig()
+inline xt::xtensor<double, 4> HybridSystem::Sig()
 {
  if (m_eval_full) {
  this->computeStress();
@@ -699,7 +699,7 @@ inline auto HybridSystem::Sig()
  return m_Sig;
 }
 
-inline auto HybridSystem::Eps()
+inline xt::xtensor<double, 4> HybridSystem::Eps()
 {
  if (m_eval_full) {
  this->computeStress();

diff --git a/include/FrictionQPotFEM/config.h b/include/FrictionQPotFEM/config.h
@@ -37,7 +37,7 @@
 
 #define FRICTIONQPOTFEM_VERSION_MAJOR 0
 #define FRICTIONQPOTFEM_VERSION_MINOR 5
-#define FRICTIONQPOTFEM_VERSION_PATCH 0
+#define FRICTIONQPOTFEM_VERSION_PATCH 1
 
 #define FRICTIONQPOTFEM_VERSION_AT_LEAST(x, y, z) \
  (FRICTIONQPOTFEM_VERSION_MAJOR > x || (FRICTIONQPOTFEM_VERSION_MAJOR >= x && \