Fix Issue thelfer#32

Author: thelfer

include/MGIS/Behaviour/BehaviourDataView.hxx

@@ -87,7 +87,7 @@ struct mgis_bv_BehaviourDataView {
   /*!
    * \brief state at the beginning of the time step
    */
-  mgis_bv_StateView s0;
+  mgis_bv_InitialStateView s0;
   /*!
    * \brief state at the end of the time step
    */

include/MGIS/Behaviour/State.hxx

@@ -387,6 +387,13 @@ namespace mgis {
      * \note the view has at most the same life time as the state.
      */
     MGIS_EXPORT StateView make_view(State&);
+    /*!
+     * \brief make a view from a behaviour data
+     * \param[in] s: state
+     * \return the view
+     * \note the view has at most the same life time as the state.
+     */
+    MGIS_EXPORT InitialStateView make_view(const State&);
     /*!
      * \brief print a detailled (verbose) description of the integration point
      * state using a markdown format

include/MGIS/Behaviour/StateView.hxx

@@ -30,11 +30,11 @@ extern "C" {
  */
 typedef struct{
   //! \brief value of the gradients
-  mgis_real * gradients;
+  const mgis_real* gradients;
   //! \brief values of the thermodynamic_forces
   mgis_real * thermodynamic_forces;
   //! \brief values of the material properties
-  mgis_real * material_properties;
+  const mgis_real* material_properties;
   //! \brief values of the internal state variables
   mgis_real * internal_state_variables;
   /*!
@@ -48,9 +48,35 @@ typedef struct{
    */
   mgis_real* dissipated_energy;
   //! \brief values of the external state variables
-  mgis_real * external_state_variables;
+  const mgis_real* external_state_variables;
 } mgis_bv_StateView;
 
+/*!
+ * \brief state of the material
+ */
+typedef struct{
+  //! \brief value of the gradients
+  const mgis_real* gradients;
+  //! \brief values of the thermodynamic_forces
+  const mgis_real* thermodynamic_forces;
+  //! \brief values of the material properties
+  const mgis_real* material_properties;
+  //! \brief values of the internal state variables
+  const mgis_real* internal_state_variables;
+  /*!
+   * \brief stored energy (computed by `@InternalEnergy` in `MFront`
+   * files) This output is optional.
+   */
+  const mgis_real* stored_energy;
+  /*!
+   * \brief stored energy (computed by `@DissipatedEnergy` in `MFront`
+   * files) This output is optional.
+   */
+  const mgis_real* dissipated_energy;
+  //! \brief values of the external state variables
+  const mgis_real* external_state_variables;
+} mgis_bv_InitialStateView;
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
@@ -63,6 +89,8 @@ namespace mgis {
 
     //! a simple alias
     using StateView = ::mgis_bv_StateView;
+    //! a simple alias
+    using InitialStateView = ::mgis_bv_InitialStateView;
 
   }  // end of namespace behaviour
 

src/BehaviourData.cxx

@@ -64,7 +64,7 @@ namespace mgis {
       v.dt = d.dt;
       v.rdt = d.rdt;
       v.K = get_ptr(d.K);
-      v.s0 = make_view(d.s0);
+      v.s0 = make_view(static_cast<const State&>(d.s0));
       v.s1 = make_view(d.s1);
       return v;
     }  // end of make_view

src/State.cxx

@@ -340,6 +340,24 @@ namespace mgis {
       return v;
     }  // end of make_view
 
+    InitialStateView make_view(const State& s) {
+      auto get_ptr = [](const std::vector<real>& v) -> const real* {
+        if (v.empty()) {
+          return nullptr;
+        }
+        return &v[0];
+      };  // end of get_ptr
+      InitialStateView v;
+      v.gradients = get_ptr(s.gradients);
+      v.thermodynamic_forces = get_ptr(s.thermodynamic_forces);
+      v.material_properties = get_ptr(s.material_properties);
+      v.internal_state_variables = get_ptr(s.internal_state_variables);
+      v.stored_energy = &s.stored_energy;
+      v.dissipated_energy = &s.dissipated_energy;
+      v.external_state_variables = get_ptr(s.external_state_variables);
+      return v;
+    }  // end of make_view
+
     static void print_variables(std::ostream& os,
                                 const Behaviour& b,
                                 const std::vector<Variable>& variables,