[getfem] 01/05: Merge.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository getfem.

commit 3c51e3e17a11ee282b3c59b59e14f71d255b5d33
Merge: 8ac88cd a0095fe
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Dec 5 18:13:54 2013 +0100

    Merge.

 contrib/aposteriori/aposteriori.cc                 |    2 +-
 .../contact_grd_trans/contact_continuation_load.cc |    2 +-
 doc/sphinx/source/biblio.rst                       |   12 +-
 doc/sphinx/source/contents.rst                     |    1 +
 doc/sphinx/source/lists.rst                        |    6 +-
 doc/sphinx/source/project/intro.rst                |  105 +-
 doc/sphinx/source/project/libdesc.rst              |   31 +-
 doc/sphinx/source/userdoc/gasm_high.rst            |  118 +
 .../source/userdoc/{gasm.rst => gasm_low.rst}      |   12 +-
 doc/sphinx/source/userdoc/index.rst                |    9 +-
 doc/sphinx/source/userdoc/model_solvers.rst        |    8 +-
 interface/src/gf_asm.cc                            |  140 +-
 interface/src/gf_model_set.cc                      |   90 +
 interface/tests/matlab/check_asm.m                 |   29 +-
 .../demo_contact_fictitious_domain_nitsche.m       |   71 +-
 interface/tests/matlab/demo_elasticity.m           |   11 +-
 interface/tests/matlab/demo_laplacian.m            |    3 +-
 src/Makefile.am                                    |   15 +-
 src/bgeot_rtree.cc                                 |    2 +-
 src/getfem/bgeot_small_vector.h                    |    3 +-
 src/getfem/bgeot_tensor.h                          |    3 +-
 src/getfem/getfem_deformable_mesh.h                |   13 +-
 src/getfem/getfem_fem.h                            |    5 +-
 src/getfem/getfem_generic_assembly.h               |  328 ++
 src/getfem/getfem_integration.h                    |   10 +-
 src/getfem/getfem_interpolation.h                  |    1 +
 src/getfem/getfem_mesh.h                           |   24 +
 src/getfem/getfem_mesh_fem.h                       |   22 +-
 src/getfem/getfem_model_solvers.h                  |    9 +-
 src/getfem/getfem_models.h                         |  353 +-
 src/getfem/getfem_nonlinear_elasticity.h           |   15 +
 src/getfem_contact_and_friction_integral.cc        |   12 +-
 src/getfem_contact_and_friction_large_sliding.cc   |  142 +-
 src/getfem_generic_assembly.cc                     | 5186 ++++++++++++++++++--
 src/getfem_mat_elem.cc                             |    3 -
 src/getfem_mesh.cc                                 |   33 +-
 src/getfem_mesh_im_level_set.cc                    |    2 +
 src/getfem_mesh_slicers.cc                         |    4 +-
 src/getfem_mesher.cc                               |    8 +-
 src/getfem_models.cc                               | 1447 ++----
 src/getfem_nonlinear_elasticity.cc                 |   98 +
 src/getfem_superlu.cc                              |    6 +-
 src/gmm/gmm_blas_interface.h                       |   10 +-
 src/gmm/gmm_def.h                                  |    2 +-
 src/gmm/gmm_inoutput.h                             |   40 +-
 src/gmm/gmm_matrix.h                               |    4 +-
 src/gmm/gmm_std.h                                  |  227 +-
 src/gmm/gmm_vector.h                               |    4 +-
 superlu/creadhb.c                                  |   95 +-
 superlu/dreadhb.c                                  |   40 +-
 superlu/sreadhb.c                                  |   40 +-
 superlu/zreadhb.c                                  |   40 +-
 tests/test_assembly.cc                             | 1730 ++-----
 53 files changed, 7066 insertions(+), 3560 deletions(-)

diff --cc src/getfem/getfem_nonlinear_elasticity.h
index dd14b16,d0835c2..c4cdd45
--- a/src/getfem/getfem_nonlinear_elasticity.h
+++ b/src/getfem/getfem_nonlinear_elasticity.h
@@@ -156,34 -156,27 +156,49 @@@ namespace getfem 
  		       const base_vector &params, scalar_type det_trans) const;
      virtual void grad_sigma(const base_matrix &E, base_tensor &result,
  			    const base_vector &params, scalar_type det_trans) const;
 +<<<<<<< HEAD
 +    Mooney_Rivlin_hyperelastic_law(void);
 +=======
      Mooney_Rivlin_hyperelastic_law(bool compressible_=false,
                                     bool neohookean_=false);
 +>>>>>>> upstream
    };
  
+   /** Neo-Hookean hyperelastic law variants
+ 
+       To be used for compressible problems.
+       For incompressible ones Mooney-Rivlin hyperelastic law can be used.
+   */
+   struct Neo_Hookean_hyperelastic_law : public abstract_hyperelastic_law {
+     const bool bonet;
+     virtual scalar_type strain_energy(const base_matrix &E,
+                                       const base_vector &params, scalar_type det_trans) const;
+     virtual void sigma(const base_matrix &E, base_matrix &result,
+                        const base_vector &params, scalar_type det_trans) const;
+     virtual void grad_sigma(const base_matrix &E, base_tensor &result,
+                             const base_vector &params, scalar_type det_trans) const;
+     Neo_Hookean_hyperelastic_law(bool bonet_=true);
+   };
  
    /** Blatz_Ko hyperelastic law 
 +<<<<<<< HEAD
 +      
 +      To be used for compressible problems.
 +  */
 +  struct generalized_Blatz_Ko_hyperelastic_law : public abstract_hyperelastic_law {
 +    virtual scalar_type strain_energy(const base_matrix &E,
 +				      const base_vector &params, scalar_type det_trans) const;
 +    virtual void sigma(const base_matrix &E, base_matrix &result,
 +		       const base_vector &params, scalar_type det_trans) const;
 +    virtual void grad_sigma(const base_matrix &E, base_tensor &result,
 +			    const base_vector &params, scalar_type det_trans) const;
 +    generalized_Blatz_Ko_hyperelastic_law(void);
 +  };
 +
 +
 +  /** Ciarlet-Geymonat hyperelastic law ( @f$ W=~_1i_1(L) + \frac{~}{2}i_2(L) + 8ci_3(L) - \frac{~_1}{2} \textrm{log}~\textrm{det}~C @f$ )
 +=======
 +>>>>>>> upstream
        
        To be used for compressible problems.
    */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getfem.git