diff --git a/src/model/contact_mechanics/resolution.hh b/src/model/contact_mechanics/resolution.hh
index ec5fe3127..cc9b8532b 100644
--- a/src/model/contact_mechanics/resolution.hh
+++ b/src/model/contact_mechanics/resolution.hh
@@ -1,239 +1,235 @@
/**
- * @file resolution.hh
- *
- * @author Mohit Pundir <mohit.pundir@epfl.ch>
- *
- * @date creation: Fri Jun 18 2010
- * @date last modification: Fri Oct 28 2022
- *
- * @brief Mother class for all contact resolutions
- *
- *
- * @section LICENSE
- *
- * Copyright (©) 2010-2021 EPFL (Ecole Polytechnique Fédérale de Lausanne)
- * Laboratory (LSMS - Laboratoire de Simulation en Mécanique des Solides)
- *
- * Akantu is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * Akantu is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Akantu. If not, see <http://www.gnu.org/licenses/>.
- *
- */
+* @file resolution.hh
+*
+* @author Mohit Pundir <mohit.pundir@epfl.ch>
+*
+* @date creation: Fri Jun 18 2010
+* @date last modification: Mon Nov 07 2022
+*
+* @brief Mother class for all contact resolutions
+*
+*
+* @section LICENSE
+*
+* Copyright (©) 2010-2021 EPFL (Ecole Polytechnique Fédérale de Lausanne)
+* Laboratory (LSMS - Laboratoire de Simulation en Mécanique des Solides)
+*
+* Akantu is free software: you can redistribute it and/or modify it under the
+* terms of the GNU Lesser General Public License as published by the Free
+* Software Foundation, either version 3 of the License, or (at your option) any
+* later version.
+*
+* Akantu is distributed in the hope that it will be useful, but WITHOUT ANY
+* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+* A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+* details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with Akantu. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
/* -------------------------------------------------------------------------- */
#include "aka_factory.hh"
#include "contact_element.hh"
#include "fe_engine.hh"
#include "geometry_utils.hh"
#include "parsable.hh"
#include "parser.hh"
#include "resolution_utils.hh"
/* -------------------------------------------------------------------------- */
#ifndef __AKANTU_RESOLUTION_HH__
#define __AKANTU_RESOLUTION_HH__
/* -------------------------------------------------------------------------- */
namespace akantu {
class Model;
class ContactMechanicsModel;
} // namespace akantu
namespace akantu {
/**
- * Interface of all contact resolutions
- * Prerequisites for a new resolution
- * - inherit from this class
- * - implement the following methods:
- * \code
- *
- * virtual void computeNormalForce();
- * virtual void computeTangentialForce();
- * virtual void computeNormalModuli();
- * virtual void computeTangentialModuli();
- *
- * \endcode
- *
- */
+* Interface of all contact resolutions
+* Prerequisites for a new resolution
+* - inherit from this class
+* - implement the following methods:
+* \code
+*
+* virtual void computeNormalForce();
+* virtual void computeTangentialForce();
+* virtual void computeNormalModuli();
+* virtual void computeTangentialModuli();
+*
+* \endcode
+*
+*/
class Resolution : public Parsable {
- /* ------------------------------------------------------------------------ */
- /* Constructor/Destructor */
- /* ------------------------------------------------------------------------ */
+ /* ------------------------------------------------------------------------ */
+ /* Constructor/Destructor */
+ /* ------------------------------------------------------------------------ */
public:
- /// instantiate contact resolution with defaults
- Resolution(ContactMechanicsModel & model, const ID & id = "");
+ /// instantiate contact resolution with defaults
+ Resolution(ContactMechanicsModel & model, const ID & id = "");
- /// Destructor
- ~Resolution() override;
+ /// Destructor
+ ~Resolution() override;
protected:
- void initialize();
+ void initialize();
- /// computes coordinates of a given element
- void computeCoordinates(const Element &, Matrix<Real> &);
+ /// computes coordinates of a given element
+ void computeCoordinates(const Element &, Matrix<Real> &);
- /* ------------------------------------------------------------------------ */
- /* Functions that resolutions should reimplement for force */
- /* ------------------------------------------------------------------------ */
+ /* ------------------------------------------------------------------------ */
+ /* Functions that resolutions should reimplement for force */
+ /* ------------------------------------------------------------------------ */
public:
- /// computes the force vector due to normal traction
- virtual void computeNormalForce(__attribute__((unused))
+ /// computes the force vector due to normal traction
+ virtual void computeNormalForce(__attribute__((unused))
+ const ContactElement & /*unused*/,
+ __attribute__((unused))
+ Vector<Real> & /*unused*/) {
+ AKANTU_TO_IMPLEMENT();
+ }
+
+ /// computes the tangential force vector due to frictional traction
+ virtual void computeTangentialForce(__attribute__((unused))
+ const ContactElement & /*unused*/,
+ __attribute__((unused))
+ Vector<Real> & /*unused*/) {
+ AKANTU_TO_IMPLEMENT();
+ }
+
+ /* ------------------------------------------------------------------------ */
+ /* Functions that resolutions should reimplement for stiffness */
+ /* ------------------------------------------------------------------------ */
+public:
+ /// compute the normal moduli due to normal traction
+ virtual void computeNormalModuli(__attribute__((unused))
const ContactElement & /*unused*/,
__attribute__((unused))
- Vector<Real> & /*unused*/) {
- AKANTU_TO_IMPLEMENT();
- }
+ Matrix<Real> & /*unused*/) {
+ AKANTU_TO_IMPLEMENT();
+ }
- /// computes the tangential force vector due to frictional traction
- virtual void computeTangentialForce(__attribute__((unused))
+ /// compute the tangent moduli due to tangential traction
+ virtual void computeTangentialModuli(__attribute__((unused))
const ContactElement & /*unused*/,
__attribute__((unused))
- Vector<Real> & /*unused*/) {
- AKANTU_TO_IMPLEMENT();
- }
+ Matrix<Real> & /*unused*/) {
+ AKANTU_TO_IMPLEMENT();
+ }
- /* ------------------------------------------------------------------------ */
- /* Functions that resolutions should reimplement for stiffness */
- /* ------------------------------------------------------------------------ */
-public:
- /// compute the normal moduli due to normal traction
- virtual void computeNormalModuli(__attribute__((unused))
- const ContactElement & /*unused*/,
- __attribute__((unused))
- Matrix<Real> & /*unused*/) {
- AKANTU_TO_IMPLEMENT();
- }
-
- /// compute the tangent moduli due to tangential traction
- virtual void computeTangentialModuli(__attribute__((unused))
- const ContactElement & /*unused*/,
- __attribute__((unused))
- Matrix<Real> & /*unused*/) {
- AKANTU_TO_IMPLEMENT();
- }
-
- /* ------------------------------------------------------------------------ */
- /* Methods */
- /* ------------------------------------------------------------------------ */
+ /* ------------------------------------------------------------------------ */
+ /* Methods */
+ /* ------------------------------------------------------------------------ */
public:
- /// assemble the residual for this resolution
- void assembleInternalForces(GhostType ghost_type);
+ /// assemble the residual for this resolution
+ void assembleInternalForces(GhostType ghost_type);
- /// assemble the stiffness matrix for this resolution
- void assembleStiffnessMatrix(GhostType ghost_type);
+ /// assemble the stiffness matrix for this resolution
+ void assembleStiffnessMatrix(GhostType ghost_type);
private:
- /// assemble the residual for this resolution
- void assembleInternalForces();
+ /// assemble the residual for this resolution
+ void assembleInternalForces();
- /// assemble the local array to global array for a contact element
- void assembleLocalToGlobalArray(const ContactElement & /*element*/,
- Vector<Real> & /*local*/,
- Array<Real> & /*global*/);
+ /// assemble the local array to global array for a contact element
+ void assembleLocalToGlobalArray(const ContactElement & /*element*/,
+ Vector<Real> & /*local*/,
+ Array<Real> & /*global*/);
- /// assemble the local stiffness to global stiffness for a contact element
- void assembleLocalToGlobalMatrix(const ContactElement & /*element*/,
- const Matrix<Real> & /*local*/,
- SparseMatrix & /*global*/);
+ /// assemble the local stiffness to global stiffness for a contact element
+ void assembleLocalToGlobalMatrix(const ContactElement & /*element*/,
+ const Matrix<Real> & /*local*/,
+ SparseMatrix & /*global*/);
public:
- virtual void beforeSolveStep();
+ virtual void beforeSolveStep();
- virtual void afterSolveStep(bool converged = true);
+ virtual void afterSolveStep(bool converged = true);
- /* ------------------------------------------------------------------------ */
- /* Accessors */
- /* ------------------------------------------------------------------------ */
+ /* ------------------------------------------------------------------------ */
+ /* Accessors */
+ /* ------------------------------------------------------------------------ */
public:
- AKANTU_GET_MACRO(ID, id, const ID &);
+ AKANTU_GET_MACRO(ID, id, const ID &);
public:
- /// function to print the contain of the class
- void printself(std::ostream & stream, int indent = 0) const override;
+ /// function to print the contain of the class
+ void printself(std::ostream & stream, int indent = 0) const override;
- /* ------------------------------------------------------------------------ */
- /* Class Members */
- /* ------------------------------------------------------------------------ */
+ /* ------------------------------------------------------------------------ */
+ /* Class Members */
+ /* ------------------------------------------------------------------------ */
protected:
- ID id;
+ ID id;
- /// friction coefficient : mu
- Real mu;
+ /// friction coefficient : mu
+ Real mu;
- /// spatial dimension
- UInt spatial_dimension;
+ /// spatial dimension
+ UInt spatial_dimension;
- /// is master surface deformable
- bool is_master_deformable;
+ /// is master surface deformable
+ bool is_master_deformable;
- /// Link to the fe engine object in the model
- FEEngine & fem;
+ /// Link to the fe engine object in the model
+ FEEngine & fem;
- /// resolution name
- std::string name;
+ /// resolution name
+ std::string name;
- /// model to which the resolution belong
- ContactMechanicsModel & model;
+ /// model to which the resolution belong
+ ContactMechanicsModel & model;
};
/// standard output stream operator
inline std::ostream & operator<<(std::ostream & stream,
- const Resolution & _this) {
- _this.printself(stream);
- return stream;
+ const Resolution & _this) {
+ _this.printself(stream);
+ return stream;
}
} // namespace akantu
/* -------------------------------------------------------------------------- */
namespace akantu {
using ResolutionFactory = Factory<Resolution, ID, UInt, const ID &,
- ContactMechanicsModel &, const ID &>;
+ ContactMechanicsModel &, const ID &>;
/// macaulay bracket to convert positive gap to zero
template <typename T> T macaulay(T var) { return var < 0 ? 0 : var; }
template <typename T> T heaviside(T var) { return var < 0 ? 0 : 1.0; }
} // namespace akantu
-#define INSTANTIATE_RESOLUTION_ONLY(res_name, dtype, pen_fun) \
- class res_name<dtype, pen_fun<dtype>>
-
-#define RESOLUTION_DEFAULT_PER_DIM_ALLOCATOR( \
- id, res_name, dtype, pen_fun) \
- [](UInt dim, const ID &, ContactMechanicsModel & model, \
- const ID & id) -> std::unique_ptr<Resolution> { \
- switch (dim) { \
- case 1: \
- return std::make_unique<res_name<dtype, pen_fun<dtype>>>(model, id); \
- case 2: \
- return std::make_unique<res_name<dtype, pen_fun<dtype>>>(model, id); \
- case 3: \
- return std::make_unique<res_name<dtype, pen_fun<dtype>>>(model, id); \
- default: \
- AKANTU_EXCEPTION( \
- "The dimension " \
- << dim << "is not a valid dimension for the contact resolution " \
- << #id); \
- } \
- }
-
-#define INSTANTIATE_RESOLUTION(id, res_name, dtype, pen_fun) \
- INSTANTIATE_RESOLUTION_ONLY(res_name, dtype, pen_fun); \
- static bool resolution_is_alocated_##id [[gnu::unused]] = \
- ResolutionFactory::getInstance().registerAllocator( \
- #id, RESOLUTION_DEFAULT_PER_DIM_ALLOCATOR( \
- id, res_name, dtype, pen_fun))
+#define INSTANTIATE_RESOLUTION_ONLY(res_name) class res_name
+
+#define RESOLUTION_DEFAULT_PER_DIM_ALLOCATOR(id, res_name) \
+ [](UInt dim, const ID &, ContactMechanicsModel & model, \
+ const ID & id) -> std::unique_ptr<Resolution> { \
+ switch (dim) { \
+ case 1: \
+ return std::make_unique<res_name>(model, id); \
+ case 2: \
+ return std::make_unique<res_name>(model, id); \
+ case 3: \
+ return std::make_unique<res_name>(model, id); \
+ default: \
+ AKANTU_EXCEPTION( \
+ "The dimension " \
+ << dim << "is not a valid dimension for the contact resolution " \
+ << #id); \
+ } \
+ }
+
+#define INSTANTIATE_RESOLUTION(id, res_name) \
+ static bool resolution_is_alocated_##id [[gnu::unused]] = \
+ ResolutionFactory::getInstance().registerAllocator( \
+ #id, RESOLUTION_DEFAULT_PER_DIM_ALLOCATOR(id, res_name))
#endif /* __AKANTU_RESOLUTION_HH__ */