Merge branch 'fix/ctype' into 'master'

LocalDensity: use `ctype` for `x` entries

See merge request agnumpde/dune-elasticity!28

dune/elasticity/materials/exphenckydensity.hh

@@ -8,7 +8,7 @@
 
 namespace Dune::Elasticity {
 
-template<int dim, class field_type = double>
+template<int dim, class field_type = double, class ctype = double>
 class ExpHenckyDensity final
   : public LocalDensity<dim,field_type>
 {
@@ -40,7 +40,7 @@ public:
   * \param x Position of the gradient
   * \param gradient Deformation gradient
   */
-  field_type operator() (const FieldVector<field_type,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
+  field_type operator() (const FieldVector<ctype,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
   {
     /////////////////////////////////////////////////////////
     // compute C = F^TF

dune/elasticity/materials/henckydensity.hh

@@ -8,7 +8,7 @@
 
 namespace Dune::Elasticity {
 
-template<int dim, class field_type = double>
+template<int dim, class field_type = double, class ctype = double>
 class HenckyDensity final
   : public LocalDensity<dim,field_type>
 {
@@ -30,7 +30,7 @@ public:
   * \param x Position of the gradient
   * \param gradient Deformation gradient
   */
-  field_type operator() (const FieldVector<field_type,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
+  field_type operator() (const FieldVector<ctype,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
   {
     /////////////////////////////////////////////////////////
     // compute C = F^TF

dune/elasticity/materials/localdensity.hh

@@ -5,8 +5,12 @@
 
 namespace Dune::Elasticity {
 
-/** \brief A base class for energy densities to be evaluated in an integral energy */
-template<int dim, class field_type = double>
+/** \brief A base class for energy densities to be evaluated in an integral energy
+ *
+ * \tparam field_type type of the gradient entries
+ * \tparam ctype type of the coordinates, i.e., the x entries
+ */
+template<int dim, class field_type = double, class ctype = double>
 class LocalDensity
 {
 
@@ -17,7 +21,7 @@ public:
    * \param x Position of the gradient
    * \param gradient Deformation gradient
    */
-  virtual field_type operator() (const FieldVector<field_type,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const = 0;
+  virtual field_type operator() (const FieldVector<ctype,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const = 0;
 
 };
 

dune/elasticity/materials/localintegralenergy.hh

@@ -27,7 +27,7 @@ public:
 
   /** \brief Constructor with a local energy density
     */
-  LocalIntegralEnergy(const std::shared_ptr<LocalDensity<dim,field_type>>& ld)
+  LocalIntegralEnergy(const std::shared_ptr<LocalDensity<dim,field_type,DT>>& ld)
   : localDensity_(ld)
   {}
 
@@ -41,7 +41,7 @@ public:
                      const std::vector<Dune::FieldVector<field_type,gridDim> >& localConfiguration) const;
 
 protected:
-  const std::shared_ptr<LocalDensity<dim,field_type>> localDensity_ = nullptr;
+  const std::shared_ptr<LocalDensity<dim,field_type,DT>> localDensity_ = nullptr;
 
 };
 

dune/elasticity/materials/mooneyrivlindensity.hh

@@ -8,7 +8,7 @@
 
 namespace Dune::Elasticity {
 
-template<int dim, class field_type = double>
+template<int dim, class field_type = double, class ctype = double>
 class MooneyRivlinDensity final
     : public LocalDensity<dim,field_type>
 {
@@ -43,7 +43,7 @@ public:
   * \param x Position of the gradient
   * \param gradient Deformation gradient
   */
-  field_type operator() (const FieldVector<field_type,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
+  field_type operator() (const FieldVector<ctype,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
   {
     /////////////////////////////////////////////////////////
     // compute C = F^TF

dune/elasticity/materials/neohookedensity.hh

@@ -8,7 +8,7 @@
 
 namespace Dune::Elasticity {
 
-template<int dim, class field_type = double>
+template<int dim, class field_type = double, class ctype = double>
 class NeoHookeDensity final
   : public LocalDensity<dim,field_type>
 {
@@ -30,7 +30,7 @@ public:
   * \param x Position of the gradient
   * \param gradient Deformation gradient
   */
-  field_type operator() (const FieldVector<field_type,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
+  field_type operator() (const FieldVector<ctype,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
   {
     /////////////////////////////////////////////////////////
     // compute C = F^TF

dune/elasticity/materials/stvenantkirchhoffdensity.hh

@@ -7,7 +7,7 @@
 
 namespace Dune::Elasticity {
 
-template<int dim, class field_type = double>
+template<int dim, class field_type = double, class ctype = double>
 class StVenantKirchhoffDensity final
   : public LocalDensity<dim,field_type>
 {
@@ -28,7 +28,7 @@ public:
   * \param x Position of the gradient
   * \param gradient Deformation gradient
   */
-  field_type operator() (const FieldVector<field_type,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
+  field_type operator() (const FieldVector<ctype,dim>& x, const FieldMatrix<field_type,dim,dim>& gradient) const
   {
     //////////////////////////////////////////////////////////
     // compute strain E = 1/2 *( F^T F - I)