-
mozul authored
20e1c66 Merge branch 'fd_jul' into 'dev' 1f0fd27 modifs fd 6758129 Merge branch 'rc2015-2' into 'dev' 572b211 minor update of tutorial script of pre_lmgc sphinx doc c6814ed correction erreur docstring 9d46c5f update readme 1735298 update readme b2e81a3 put back extrudeRigids routine accidentally removed from pre_lmgc a1b716e modif du wrap pour mp rigid 81dcf7f Merge branch 'compil_fix' into 'dev' 5da431e python rTree binding compilation only if numpy version greater than 1.6 8b94fd3 fix ifort compilation 74f6883 Merge branch 'add_wrap' into 'dev' 908c19e add wrap for 3D coupling with gmsh + fix typo somewhere ebe6fbd Merge branch 'ddm_fix' into 'dev' 9a29d31 adding function to Std_ExternalFEM for standard DDM compilation fce739c Merge branch 'bugs_fix_080315' into 'dev' 0d754a3 bug fix dans models et modif pour que ca compil avec ifort sur macos 9efd32c Merge branch 'models_vector_field' into 'dev' e3542fd adding setter by elem or node on scalar and vector fields for ther, poro and multi 11048bc Merge branch 'Print_3D' into 'dev' ec76bfc Merge branch 'DDM_V2.0' into 'dev' c987102 Modif pour la DDM : - Ajout d'une variable DDM_SCHWARTZ, - Ajout d'un vecteur Vddm 1dce054 Correction d'un bug bloquant s'il MPI n'est pas utilisé 8e08a02 DDM pour Xper, V2 079a059 Merge branch 'fd_fixes_28012015' into 'dev' c2f44c7 broutilles 0330e20 modifs 2ecf3e1 modifs intersection_wp 0226d6c modifs intersection polytopes 2239ec6 ajout nouvelle fonction intersection polytope 590b1e5 correction d'un message 3a56ee1 Merge branch 'wood_orthotropic_frame' into 'dev' daaed5f use external vector field MARROW_POINT and MARROW_ORIENT in user orthotropic frame computation e9faba5 fix call to set_ortho_frame_by_user 573375e Merge branch 'models_and_external_fields' into 'dev' c2140ec split mecaMAILx_SetField automatic switch between SetFieldByNode and SetFieldByElem in distinct wrapped functions 3aa5227 change ext_f model keyword to extsf and ext_v to extvf adfee3e Merge branch 'set_field_by_ele' into 'dev' 9906851 set vector field by element 5ee79f9 set field on elements in mecaMAILx 9a29907 Merge branch 'vector_field' into 'dev' 14437d0 adding external vector field at Gauss point 48b45d8 Remplacement d'un write en logmes dans mod_CSASp fe976c9 Modification de la fonction display_tacinfo : Changement des write(*) en logmes 58c3f15 Merge remote-tracking branch 'origin/dev' into Print_3D 13d4967 Merge branch 'cmake_correction' into 'dev' 85d044f correct dependencies in contribs compilation and improve test of rtree c3270d9 Merge branch 'Allegement_VTK' into 'dev' 839be09 Merge branch 'Optimisation_prep_nlgs_2D_3D' into 'dev' 9cbac27 Merge branch 'Timers_3D' into 'dev' ef5b13a Allègement des fichiers VTK par codage des entiers et des doubles sur 32 bits au lieu de 64. 966b38e Optimisation de prep_nlgs en 2D et en 3D par sauvegarde des "reverse adjacents" 0671efd Remplacement de print par des logmes pour les CZM 3D, afin d'être homogène avec le 2D. 282354c Ajout de timers pour les CZM 3D, afin d'être homogène avec le 2D. 3bf6563 Merge branch 'fd0115_fixes' into 'dev' 46a7225 modif pour Morhr Coulomb intrinseque 302e655 Merge branch 'rtree_python_binding' into 'dev' c40c5f5 adding test of python binding of rtree library ec21e0e renaming rTree python module 18395a4 better binding with cython of rtree library 3b313e0 python API on rTree library using cython REVERT: 5f57e5a correct openmp compilation error in nlgs_3D REVERT: 3705bdb minor update of tutorial script of pre_lmgc sphinx doc REVERT: 91dfd2d correction erreur docstring REVERT: 0cb3eab update readme REVERT: b6fc67b update readme REVERT: c31a22e Merge branch 'rc2015' of git-xen.lmgc.univ-montp2.fr:lmgc90/lmgc90_dev into rc2015 REVERT: c74be7a put back extrudeRigids routine accidentally removed from pre_lmgc REVERT: c92a255 modif du wrap pour mp rigid git-subtree-dir: src git-subtree-split: 2ba7104259b0a9c3b01b4621dbb495c8827ceb7f
522697f2