Almost complete the load function

Author: Thomas Helfer

include/MFront/Behaviour/Description.hxx

@@ -21,31 +21,18 @@ namespace mfront {
      * \brief structure describing a behaviour
      */
     struct Description {
-      //! \behaviour type
-      enum {
-        GENERALBEHAVIOUR,
-        STANDARDSTRAINBASEDBEHAVIOUR,
-        STANDARDFINITESTRAINBEHAVIOUR,
-        COHESIVEZONEMODEL
-      } btype;
-      //! kinematic of the behaviour treated
-      enum Kinematic {
-        UNDEFINEDKINEMATIC,
-        SMALLSTRAINKINEMATIC,
-        COHESIVEZONEKINEMATIC,
-        FINITESTRAINKINEMATIC_F_CAUCHY,
-        FINITESTRAINKINEMATIC_ETO_PK1
-      } ktype;
+      //! \behaviour symmetry
+      enum Symmetry { ISOTROPIC, ORTHOTROPIC };
       //! \brief constructor
       Description();
       //! \brief move constructor
-      Description(Description&&);
+      Description(Description &&);
       //! \brief copy constructor
-      Description(const Description&);
+      Description(const Description &);
       //! \brief move assignement
-      Description& operator=(Description&&);
+      Description &operator=(Description &&);
       //! \brief standard assignement
-      Description& operator=(const Description&);
+      Description &operator=(const Description &);
       //! \brief destructor
       ~Description();
       //! \brief name of the library providing the behaviour
@@ -59,18 +46,39 @@ namespace mfront {
        * modelling hypothesis)
        */
       std::string function;
+      //! \brief name of the `MFront` source file used to generate the behaviour
+      std::string source;
+      //! \brief version of `TFEL` used to generate the behaviour
+      std::string tfel_version;
       //! pointer to the function implementing the behaviour
       Behaviour b;
+      //! \behaviour type
+      enum {
+        GENERALBEHAVIOUR,
+        STANDARDSTRAINBASEDBEHAVIOUR,
+        STANDARDFINITESTRAINBEHAVIOUR,
+        COHESIVEZONEMODEL
+      } btype;
+      //! kinematic of the behaviour treated
+      enum Kinematic {
+        UNDEFINEDKINEMATIC,
+        SMALLSTRAINKINEMATIC,
+        COHESIVEZONEKINEMATIC,
+        FINITESTRAINKINEMATIC_F_CAUCHY,
+        FINITESTRAINKINEMATIC_ETO_PK1
+      } kinematic;
+      //! behaviour symmetry
+      Symmetry symmetry;
       //! gradients
       std::vector<Variable> gradients;
       //! fluxes associated to gradients
       std::vector<Variable> fluxes;
       //! material properties
       std::vector<Variable> mps;
       //! internal state variables
-      std::vector<Variable> ivs;
+      std::vector<Variable> isvs;
       //! external state variables
-      std::vector<Variable> evs;
+      std::vector<Variable> esvs;
       //! parameters
       std::vector<Variable> parameters;
     };  // end of struct Description
@@ -91,3 +99,4 @@ namespace mfront {
 }  // end of namespace mfront
 
 #endif /* LIB_MFRONT_BEHAVIOUR_DESCRIPTION_HXX */
+

include/MFront/Behaviour/Variable.hxx

@@ -24,7 +24,7 @@ namespace mfront {
       //! name of the variable
       std::string name;
       //! type of the variable
-      enum { SCALAR, STENSOR, TENSOR } type;
+      enum { SCALAR, VECTOR, STENSOR, TENSOR } type;
     };  // end of struct Description
 
     /*!