remove updateStateImpl from all skills and have default in mixin

ikarus-project · Jan 10, 2025 · 452edb6 · 452edb6
1 parent 50c4763
commit 452edb6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 17 deletions.
diff --git a/ikarus/finiteelements/feresulttypes.hh b/ikarus/finiteelements/feresulttypes.hh
@@ -203,7 +203,7 @@ public:
     } else
       return value_;
   }
-  explicit ResultWrapper() { value_.setZero(); }
+  explicit ResultWrapper() = default;
   explicit ResultWrapper(StoredType&& value) { this->value_ = std::move(value); }
   explicit ResultWrapper(const StoredType& value) { this->value_ = value; }
   ResultWrapper& operator=(const StoredType& value) {
@@ -216,7 +216,7 @@ public:
   }
 
 private:
-  StoredType value_{};
+  StoredType value_{StoredType::Zero()};
 };
 
 namespace Impl {

diff --git a/ikarus/finiteelements/mechanics/kirchhoffloveshell.hh b/ikarus/finiteelements/mechanics/kirchhoffloveshell.hh
@@ -234,9 +234,6 @@ protected:
     return kin;
   }
 
-  void updateStateImpl(const Requirement& /* par */,
-                       const std::remove_reference_t<typename Traits::template VectorType<>>& /* correction */) const {}
-
   template <typename ST>
   void calculateMatrixImpl(
       const Requirement& par, const MatrixAffordance& affordance, typename Traits::template MatrixType<ST> K,

diff --git a/ikarus/finiteelements/mechanics/linearelastic.hh b/ikarus/finiteelements/mechanics/linearelastic.hh
@@ -295,9 +295,6 @@ public:
   }
 
 protected:
-  void updateStateImpl(const Requirement& /* par */,
-                       const std::remove_reference_t<typename Traits::template VectorType<>>& /* correction */) const {}
-
   template <typename ScalarType>
   void calculateMatrixImpl(const Requirement& par, const MatrixAffordance& affordance,
                            typename Traits::template MatrixType<> K,

diff --git a/ikarus/finiteelements/mechanics/loads/traction.hh b/ikarus/finiteelements/mechanics/loads/traction.hh
@@ -143,9 +143,6 @@ protected:
       const Requirement&, MatrixAffordance, typename Traits::template MatrixType<>,
       const std::optional<std::reference_wrapper<const Eigen::VectorX<ST>>>& = std::nullopt) const {}
 
-  void updateStateImpl(const Requirement& /* par */,
-                       const std::remove_reference_t<typename Traits::template VectorType<>>& /* correction */) const {}
-
 private:
   std::function<Eigen::Vector<double, worldDim>(const Dune::FieldVector<double, worldDim>&, const double&)>
       neumannBoundaryLoad_;

diff --git a/ikarus/finiteelements/mechanics/loads/volume.hh b/ikarus/finiteelements/mechanics/loads/volume.hh
@@ -111,9 +111,6 @@ protected:
       const Requirement& par, MatrixAffordance, typename Traits::template MatrixType<> K,
       const std::optional<std::reference_wrapper<const Eigen::VectorX<ST>>>& dx = std::nullopt) const {}
 
-  void updateStateImpl(const Requirement& /* par */,
-                       const std::remove_reference_t<typename Traits::template VectorType<>>& /* correction */) const {}
-
 private:
   std::function<Eigen::Vector<double, worldDim>(const Dune::FieldVector<double, worldDim>&, const double&)> volumeLoad_;
   //> CRTP

diff --git a/ikarus/finiteelements/mechanics/truss.hh b/ikarus/finiteelements/mechanics/truss.hh
@@ -220,9 +220,6 @@ protected:
     const auto [L, l, Elin, Egl, dEdu, ddEddu] = computeStrain(par, dx);
     force += E * A * Egl * L * dEdu;
   }
-
-  void updateStateImpl(const Requirement& /* par */,
-                       const std::remove_reference_t<typename Traits::template VectorType<>>& /* correction */) const {}
 };
 
 /**

diff --git a/ikarus/finiteelements/mixin.hh b/ikarus/finiteelements/mixin.hh
@@ -276,6 +276,11 @@ public:
     (Skills<PreFE, typename PreFE::template FE<Skills...>>::updateStateImpl(par, correction), ...);
   }
 
+  template <typename ScalarType>
+  requires(not implementsUpdateStateImpl)
+  void updateStateImpl(const Requirement& par,
+                       const std::remove_reference_t<typename Traits::template VectorType<>>& correction) const {}
+
 protected:
   /**
    * @brief Get a reference to the underlying finite element object.