1. 31 May, 2016 1 commit
    • mozul's avatar
      Squashed 'src/' changes from 46e2d8a..9035eb4 · ea2ac027
      mozul authored
      9035eb4 Merge branch 'sphinx' into 'dev'
      26f2338 [DOC] in sphinx doc of chipy, use "from pylmgc90 import chipy" in examples
      24010ae Merge branch 'fd_fix_typo' into 'dev'
      42b8455 modifs
      c9a79cd various small modifications
      git-subtree-dir: src
      git-subtree-split: 9035eb42c880a0879bd5e4e7c7874472e9881555
  2. 23 May, 2016 2 commits
    • mozul's avatar
      Squashed 'src/' changes from ff3860f..46e2d8a · 67789275
      mozul authored
      46e2d8a Merge branch 'frozar_arg_parse' into 'dev'
      a79dae4 [MISPELLING]
      8e75e55 [FIX] arg_parse look ignore unknown arguments in order to keep using our notebooks
      REVERT: ff3860f Merge branch 'dev' into 'master'
      REVERT: bd15bce Merge branch 'dev' into 'master'
      REVERT: ed992f2 Merge branch 'dev' into 'master'
      REVERT: 1197b55 Merge branch 'dev' into 'master'
      REVERT: ae6c187 Merge branch 'dev' into 'master'
      git-subtree-dir: src
      git-subtree-split: 46e2d8a7ff67ae6db8f8ff4de372c82729bba10a
    • mozul's avatar
      Squashed 'src/' changes from 498f08b..ff3860f · d0bc9539
      mozul authored
      ff3860f Merge branch 'dev' into 'master'
      d71310e Merge branch 'fix_import' into 'dev'
      e990229 [FIX] fix lmgc90 module import in pre_lmgc
      6400b4b [FIX] fix vtk module import
      8d1b6cf [FIX] import vtk module instead of import all of vtk module
      1c9f1a3 Merge branch 'fd_fix_PRPLx' into 'dev'
      5dc5300 correction bug read_ini PRPLx
      c004eb7 Merge branch 'fd_fix_DR' into 'dev'
      4afabd9 correction erreur diagonal resolution
      a17faef Merge branch 'fix_compil' into 'dev'
      710a15f [COMPIL] fix stand_alone compilation
      c59f955 Merge branch 'fd_fix_restart' into 'dev'
      092a4fb some modifications to be more clear
      edfb94b Merge branch 'fd_fix_coro' into 'dev'
      8ff40be maj get_nodes pour F. Perales
      20bd83e modifs xqs_wet 3D et F. Perales
      d849504 modifs pour le coro 2D, correction diagonal resolution
      91b93d9 Merge branch 'frozar_python_vtk_for_dev' into 'dev'
      80ba483 [CHIPY] add a warning when an unavailable function is called
      d186f70 [CHIPY] Create the file 'ChiPy/src/macro/config.py' to store the variable 'is_vtk_display'.         This module of configuration is used in:          * 'ChiPy/src/macro/chipy.py'          * 'ChiPy/src/macro/vtk_display.py'         Depending on the value of 'config.is_vtk_display', functions which call         vtk function are enable or not.
      3337080 Merge branch 'jenkins_novisu_for_dev' into 'dev'
      7ef0a42 [PRE_LMGC] Add a new module to parse argument from command line: novisu mode.            Disable the execution of 'visuAvatars()' directly inside the function.
      c5a13b0 Merge branch 'fd_fix_plpl_nc' into 'dev'
      b65a30a prise en compte modifs de FC qui introduit la normale au candidat
      6c3e045 maj
      4cc7b10 first fix
      deac932 Merge branch 'fix_parameters' into 'dev'
      ed4ba71 [FIX] some error in parameters module and automatic initialization of dictinnaries in chipy.Initialize
      71a5904 Merge branch 'debug_omp' into 'dev'
      9684b45 [FIX] some local variables missed the private OMP variable
      14d9aba Merge branch 'POLYG' into 'dev'
      634d36b bcp de bugs !
      f73d369 Merge branch 'parameters' into 'dev'
      bd36139 [DEV] use array size when checking parameter id validity, update doxygen, and only xxxx string for unknown id
      3816195 [FIX] typos
      7b6cb1e [FIX] complete accessor (even for unused maps) and same ordering of parameters definition/use in all files
      50fe325 [FIX] correct association within body_type, contactor_type and interaction_type parameters
      31d1fc0 [FIX] correct association within dime_mode parameters
      68bd362 [FIX] fix error message
      c822249 [DEV] use a pre-allocated array to store all possible name of parameters
      e0588f9 [FIX] fix some minor error in parameters module
      0faa5fb [DEV] creating some config dictionnaries to get LMGC90 parameters
      6a6d32c [FIX] forgot to add parameters module interface to pylmgc90
      e84a693 [DEV] adding accessor on 'parameters' module
      065162c Merge branch 'doc' into 'dev'
      d035fda [DOC] updated *doxy2swig.py* can indiferently used with python 2 or 3
      da8fdd5 [FIX] use correct Python executable within subprocess call of Python itself
      4e95846 [DOC] adding some reminder of Doxygen syntax within 'coding rules' section of sphinx dev
      3859f16 [DOC] attemp to improve syntax of docstring in sphinx doc
      0f0b0f0 [DOC] changing ' to " in Doxygen
      8150772 [DOC] add an ugly sed+regex command to generate nicer docstrings
      46d3e92 [DOC] update doxy2swig.py file
      5c53049 Merge branch 'fd_bugfix' into 'dev'
      acc9300 correction bug read_ini ptpt3 ; mauvaise gestion big_polyr
      42f15f9 Merge branch 'POLYG' into 'dev'
      86b1f13 display iter check
      f7f5c07 bug remove global_distance
      76e1fea remove global_distance
      f4cb80a re-bug sur la tab visu des Big POLYG
      c8a62f6 bug sur la tab visu des Big POLYG
      4db0b25 periodic in non convex
      6112564 clean double contact
      c1bc1ce some comments
      484c5ec more bugs!
      3a14f1e encore et encore ...
      96d376d bug bug ...
      b68e4f4 la suite ...
      a7cf909 debut ...
      81d01f9 Merge branch 'fd_bugfix' into 'dev'
      7fdf021 correction bug spcd pour de vrai
      a4fe380 correction bug spcd
      7b29c7c Merge branch 'fd_fixbug' into 'dev'
      e7dcaa3 modifs detection PRPR + corrections mineures
      a34797d Merge branch 'readme' into 'dev'
      f997a44 [DOC] fix markdown syntax
      59a2814 Merge branch 'readme' into 'dev'
      0ad52e7 [DOC] Update section of README from centos 6.6 to centos 7
      0d53eff [DOC] fix readme file
      39e9aee [DOC] fix brief doxygen keyword typo
      74feb77 [COMPIL] add gfortran compilation flags to allow long line
      e3763ec Merge branch 'fd_fixbug' into 'dev'
      d1b01f6 correction bug
      04d29d9 Merge branch 'fd_ajouts' into 'dev'
      d30ee44 Core/src/contact_3D/mod_PRPRx.f90
      c05ba68 correction bug periodic si une seule boite
      0a3eee2 modif pour detection big polyr et diverses corrections
      47b970b Merge branch 'compilation_flags' into 'dev'
      53708f8 [COMPIL] fix compilation of standalone
      1490d17 relecture par fd
      f698a80 [CMAKE] remove contrib/linearAlgebra useless directory
      39cda3c [CMAKE] moving MUMPs from contribs/linearAlgebra to contribs/ directory
      1f4132f [DOC] documenting cmake implementation
      1c34e46 [CMAKE] remove obsolte macro
      cba94e6 [CMAKE] fix first detection of Python header location
      657740b [CMAKE] remove useless macro setting LAPACK compilation flags
      083631b [CMAKE] remove LAPACK sources and only relies on the one found on the system
      23c12bb [CMAKE] better handling of python interpretor/library/header user defined or automatically detected
      88b7cb5 [CMAKE] fix error in MUMPs compilation flags
      84ffb8c [CMAKE] caching values of flags for all library within CMakeCache.txt
      474d869 [CMAKE] fix forgot include
      c5e38f1 [CMAKE] specific compilation flag management for library compiled as internal project
      8e27218 [CMAKE] compilation flags for the contribs are now defined in main CMakeLists.txt and fix compilation of MUMPs with BUILD_LAPACK
      97597d7 [CMAKE] build all lapack libraries (not only double fonctions) and use of specific compiler options
      47343ee [CMAKE] add profiling OPT option and fix compilation flags to be independent for each contrib
      1f8029f Merge branch 'fd_ajouts' into 'dev'
      4e5e88d nettoyage print
      3595be4 modif dans polyr_wireframe (passage angle pour elimination noeuds sur cotes), ajout setcontactorcolor
      20be93e Merge branch '2016.rc4' into 'dev'
      bd15bce Merge branch 'dev' into 'master'
      ed992f2 Merge branch 'dev' into 'master'
      1197b55 Merge branch 'dev' into 'master'
      ae6c187 Merge branch 'dev' into 'master'
      git-subtree-dir: src
      git-subtree-split: ff3860fb85fba1dcbe0ea9f6cd02a0180b5d2d09
  3. 07 Mar, 2016 1 commit
    • mozul's avatar
      Squashed 'src/' changes from bd15bce..498f08b · 0f711c6a
      mozul authored
      498f08b fix compilation flags settings
      50b169a default value of frequency in macro function WriteOut*
      555e5d8 Merge branch 'fd_fix_doc' into 'dev'
      a5ad6fd suite
      090d785 modif doc
      6ae4f73 Merge branch 'fd_fixes' into 'dev'
      e00fce2 correction bug affichage PRPL et modif gestion frottement czm si initial friction
      666ccfc Merge branch 'Regul' into 'dev'
      678d776 normal regularization for NORMAL_COUPLED_DOF
      ca4ea89 remove regularization for NORMAL_COUPLED_DOF
      396d8f3 Add regularization for COUPLED_DOF laws
      b9d9ff4 Merge branch 'fd_bili' into 'dev'
      0f21ff4 loi MP3_CZM_THER
      7e627b0 Merge branch 'Regul' into 'dev'
      7ffc272 Add regul for IQS laws
      ff81e99 Merge branch 'fd_fix_mbs' into 'dev'
      7bcc119 one more fix
      e8a14d0 Merge branch 'fd_fix_mbs' into 'dev'
      a8708aa suite de suite de modifs
      97f97b7 suite de suite de modifs
      4f0104a suite modifs
      e71e820 gestion mixte objets lmgc90 et mbs
      5cba6ce Merge branch 'fix_doc' into 'dev'
      acdf408 [DOC] Add missing pictures.
      d3c4995 [DOC] Minor corrections.
      9e59124 Merge branch 'fd_fix_bug' into 'dev'
      2ec6215 fix more bugs added by frozar suite
      9612f1c fix more bugs added by frozar
      ecb0012 Merge branch 'fd_fix_bug' into 'dev'
      0c30a2b correction petit oubli
      dec33d2 Merge branch 'pre_list_default_val' into 'dev'
      925cd89 [PRE] Remove the default value [] for any argument in python: generally not the desired behavior.
      1fed708 Merge branch 'API_StartCollection' into 'dev'
      c12e4ec fix import error of ddm_utils when vtk python module is not available
      4b70ea1 change startCollection arguments order and default values for consistent call
      8d1661c Merge branch 'fix_display' into 'dev'
      4d572bb add a fake interaction when necessary to have the same number of files than rigid/tact/etc, add a new ptc display (experimental)
      REVERT: bd15bce Merge branch 'dev' into 'master'
      REVERT: ed992f2 Merge branch 'dev' into 'master'
      REVERT: 1197b55 Merge branch 'dev' into 'master'
      REVERT: ae6c187 Merge branch 'dev' into 'master'
      git-subtree-dir: src
      git-subtree-split: 498f08b2662476bcd2910242227e689d76e89ac9
  4. 03 Feb, 2016 1 commit
    • mozul's avatar
      Squashed 'src/' changes from ed992f2..bd15bce · cf6bfb43
      mozul authored
      bd15bce Merge branch 'dev' into 'master'
      6f76660 Merge branch 'cmake_fix' into 'dev'
      7dde80c forgot package for doc building in readme
      b0891b6 forgot package for doc building in readme
      8c4711d update README file
      e79229e use 'off' instead of 'none' to desactivate MUMPS compilation
      3ee137b fix phtread missing symbol on some linux distribution when building mumps
      4716013 correct error when numpy module is missing
      4a510c4 correct error when numpy module is missing
      b6f3c73 Merge branch 'fix_POLYR' into 'dev'
      0291a6c gestion auto contact
      fcdd386 Merge branch 'sphinx_deps' into 'dev'
      02a48da fix dependencies when building sphinx doc
      02335ab Merge branch 'fix_copyright' into 'dev'
      0823740 Core/src/contact_3D/mod_CSASp.f90
      9b8227a nettoyage de print de merde
      c2c12e0 setting copyright for 2016
      8686e84 Merge branch 'PoroField' into 'dev'
      43067bc add function to get scalar field rank in poroMAILx
      5edd233 Merge branch 'cmake_fix' into 'dev'
      1ef6c6b fix matlib depency in cmake
      de0464e update configure message
      8b0bcd5 update python library research with cmake
      65bcdb5 banning in source build with cmake
      7415dc0 Merge branch 'fiber_fix' into 'dev'
      01c510e some simple fix for FiberModel use
      68d4018 Merge branch 'fix_abp' into 'dev'
      03aeefd modif pour abp, pour regul, pour recuperer la contrainte sur un corps, etc
      e0bdd44 modif pour gestion mixite depuis tact_behav
      03d9b32 Merge branch 'cmake_fix' into 'dev'
      9d3d3e2 fix cmake dependency with matlib4
      git-subtree-dir: src
      git-subtree-split: bd15bce9d16df029ac9641726008a0a77d4c0bb3
  5. 04 Jan, 2016 1 commit
    • mozul's avatar
      Squashed 'src/' changes from 1197b55..ed992f2 · ad0f6767
      mozul authored
      ed992f2 Merge branch 'dev' into 'master'
      b5ebfb1 Merge branch 'matlib4' into 'dev'
      c51d0cc use of Matlib v4
      1cdbb24 Merge branch 'fix_qh' into 'dev'
      864c5c9 modif de la routine convex hull
      d99f6e8 Merge branch 'fix_flags' into 'dev'
      cb76f92 correction de bugs dans les tests de polyr2bdyty(3,xx) ; ajout regul gap_sgr_clb
      2c76a13 Merge branch 'visu_restart' into 'dev'
      2d6f760 Allow to restart visualization from a certain index value
      9f9f9e8 Merge branch 'da_fix' into 'dev'
      3aefb7b fix bug in set vector field by node in meca and ther MAILx (thanks to DA)
      1a240cc Merge branch 'compil_fix' into 'dev'
      82759b6 fix compilation with ifort
      64ba5e7 Merge branch 'fix_contacteursquadratiques' into 'dev'
      c2181e2 correction timer disparu
      215d1a6 suppression dans write_bodies, get_idata, get_idata_sz de la reference aux vieux contacteurs
      b33e7ec modif contacteurs quadratiques ; correction qq bug : integration 1 pg sur Q4 , masse lumpee Q8 et H20
      fc086e6 modifs
      04b6eac qq modifs
      f91a8ca ajout gestion Q quadra
      8f9f925 ajout ASpx6 et ASpx8
      ef8df90 Merge branch 'CSAS_projection' into 'dev'
      62f4360 fix realloc in second_form
      c960189 put back systematic reallocation in FONCT_FORME and DERIVE_FORM to avoid side effects, and correct potential memory leak in second_form
      6280ec4 draft of test of second derivative of form function
      0e431f5 fix second derivatives of form functions
      cc0b192 finish and test projection function with linear hexahedron
      52a0db0 draft of projection computation using form function and derivatives in minimization problem
      21eff87 add second derivative of form functions
      6192f3d Merge branch 'fix_regul' into 'dev'
      099cbac modifs pour la regul avec ajout sur la partie tangente, correction nlgs_3D pour diagonal resolution
      fcc4922 Merge branch 'fix' into 'dev'
      232b6fe Write postpro in checkInteractiveCommand
      041cef5 Merge branch 'fix_mecaEF' into 'dev'
      fdf9764 remise en place get_ele_ptr_mecaEF_iso
      764bd0f Merge branch 'rigidPolyhedron_fix' into 'dev'
      e3d4af9 Putting back FatalDamping macro function but without arguments and blindly applying it to all objects
      2dd7648 fix documentation
      4b69a01 consistent API of FatalDamping functions and remove corresponding macro function
      df7ea58 if scipy is available, use qhull to generate connectivity of a polyhedron in pre_lmgc
      487c024 Merge branch 'compil_fix' into 'dev'
      6167d66 fix compilation when not using robotran
      29c3b33 Merge branch 'mbs' into 'dev'
      5849bb7 Merge branch 'mbs_ucl' into 'mbs'
      5141da9 external_add_reac and external_get_vlocy now get the transformation maxtrix to change the frame of torque and angular velocities
      a2fd58a improving comments
      1242036 Replace write(*...) by call to logmes
      37bd4e7 Correction d'une erreur introduite sur l'argument de get_behav_POLYR
      f941726 Remplacement des appel au mot-clefs 'stop' par des appel à la fonction faterr. Remplacement effectué dans mod_PLANx et mod_POLYR.
      734d77b Bug correction : shift TT for i_mbs3 was never called
      3a65e76 Nullify Reac and Raux in increment function
      a2bd970 Torque vector is now projected in body Frame (before it was in global frame)
      ca018d2 get_isee function argument replaced to get body type (RBDY3 or MBS)... modify_behaviour_SPPLx does no more check body type (only check contactor type and color) Update arguments of XX_PLANx functions call.
      9087c4a Angular velocity vector is now projected in body Frame (before it was in global frame)
      3554adb get_isee function argument replaced to get body type (RBDY3 or MBS)... Update arguments of XX_PLANx functions call.
      d0c3e88 get_isee function argument replaced to get body type (RBDY3 or MBS)... Update arguments of XX_PLANx functions call.
      d944f87 Correcting get_coor_POLYR and get_intertia_frame_POLYR functions call... Update arguments of XX_PLANx functions call.
      d2c6114 Heavy modification to call MBS module in case of the contactor is on a MBS or RBDY3 module in the other case.
      9e89503 New function to retrieve embedded frame and loading PLAnx on MBS
      f56b7ec attempt to fix clean_memory bug with mbs
      18dff66 MBS : null pointer initialization
      e891c14 cleaning lmgc90 memory in MBS when calling Finalize()
      ca0c348 fix compil in clean_memory of mbs module
      ffe4871 real clean_memory in mbs
      1ff8a9f correct detection in PRPR when mixing MBS and RBDY3
      5370be2 Merge branch 'CSxxx_SetQuadrature' into 'dev'
      96a6d82 fix error sphinx doc of pre
      5503d2d adding possibility to have real options when instanciating contactors in pre_lmgc
      c9cf310 fix bug in CSxxx point computation with quadrature rule
      01e0353 Putting back SetQuadrature python function as obsolete one
      93ef14c suppress compilation warning
      7b5b06f In pre_lmgc delete xSxxx contactor and have only CSpxx and ASpxx type with quadrature as an option of CSpxx
      f495289 Change api in wrapped function to select version file format
      22e75c5 file version reading management
      ac20548 Change contactor type to ASpxx and CSpxx and include quadrature rule of CS as a number instead of last x
      f91bd8b change CSxxx_SetQuadrature to have constant point by element
      50f8a2d Merge branch 'regul' into 'dev'
      24fb2dc ajout regularisation pour MC et modif findnumpy
      7b17aaf Merge branch 'ASpxx_Explode' into 'dev'
      601115c Merge branch 'megabug' into 'dev'
      7f9011f mega buuuuuuuuuuuuuuuug !
      c0aedf3 ajout d'une commande pour exploser les patch ASpxx en singleton
      35cf6c0 ajout d'une commande pour exploser les patches ASpxx -> ASxxx
      34b5fe2 Merge branch 'Creation_pvtu_pvtp' into 'dev'
      fc65953 Creation des fichier .pvtu et .pvtp pour la DDM
      git-subtree-dir: src
      git-subtree-split: ed992f24dbfa057de53694a002bde30542ac47dd
  6. 28 Sep, 2015 1 commit
    • mozul's avatar
      Squashed 'src/' changes from 61c003c..1197b55 · e75b7a86
      mozul authored
      1197b55 Merge branch 'dev' into 'master'
      d954d3b Merge branch 'planx_inertia_fix' into 'dev'
      cf7ccd7 fix inertia computaiton of planx in pre_lmgc
      7c7b117 fix inertia matrix computation of PLANx
      8a3cfa5 Merge branch 'PutBodyVector' into 'dev'
      5ea882f Merge branch 'fix_SPSP' into 'dev'
      fcf23a1 correction bug calcul Vbegin
      886cdc6 modif des xxxxMAILx_put_vector
      2827d26 Merge branch 'siconos' into 'dev'
      99ab331 attempt to fix bug when quadrature of CSxxx not 0
      a810416 set C_FLAGS of SiconosNumerics compilation through LMGC90
      4422cb7 fix compilation error
      988adae Merge branch 'logmes' into 'dev'
      66f087a WARNING log messages always displayed
      23af95c adding internal timer for nlgs_3d ExSolver function
      d2ed071 switch some print to logmes and possibility to force message even if disabled
      34ba5fd Merge branch 'nlgs_log' into 'dev'
      bb08e85 Ajout d'un log dans ExSolver
      46c9a09 Merge branch 'get_coor_POLYR_fix' into 'dev'
      19aae6d fix get_coor_POLYR function call
      01b04b3 Merge branch 'loi_preGAP_SGR_CLB' into 'dev'
      9a2459e pta: reactivation loi preGAP_SGR_CLB
      a086ba9 pta: correction pour merge
      d9558f0 pta: reactivation de la loi preGAP_SGR_CLB dans le Core et le pre
      94b51e4 Merge branch 'ExternalFEM' into 'dev'
      1b053d6 Merge branch 'fix_gfortran44' into 'dev'
      70bcd67 Merge branch 'mpi_without_mumps' into 'dev'
      dae179c Merge branch 'ddm_fix' into 'dev'
      5e1d76b Ajout de la fonction externalFEM_get_V dans Std_ExternalFEM.f90
      4a4ef62 Modification de la syntaxe ExternalFEM_ComputeV. La boucle n'est plus faite dans LMGC90. Ceci corrige un bug pour les calculs periodiques
      89b7955 Ajout d'un patch pour compilation avec GCC 4.4
      dfe2a2b Autorise une compilation AVEC mpi mais SANS mumps
      5556f20 Correction : ne marchait pas lorsque la fonction est lancée dans un thread mpirun
      2b36d5e Merge branch 'perales_fix' into 'dev'
      8422774 Ugly fix of seg fault when calling clean_memory and skipping He build
      79a1cc9 add F. Perales fix according to change of library name in Xper
      9f8363c Merge branch 'fix' into 'dev'
      6043aca update warning/error messages when trying to import/use optional modules
      4159a85 fix seg fault when using mecaMAILx_GpvVTKDrawAll when no mecaMAILx present
      8c8bf84 Add wrap of reverse contact order for nlgs_3D
      9043d15 fix README
      53ae1fb Merge branch 'reload' into 'dev'
      e1030dc When restarting a computation, get starting file increment
      5327a89 possibility to read VlocRloc file of OUTBOX directory
      e29245e possibility to read GPV file of OUTBOX directory
      d273f69 possibility to read DOF file of OUTBOX for all body type
      37a497a add a parameter to RBDY2_ReadIniDof routine to read output file
      ca4ddcb Merge branch 'fix_RTA_laws' into 'dev'
      321e8c1 correction bug 2
      853b79c correction bug
      39508df  prise en compte _nosldt
      140fba9 one more modif
      c7d3ecd one more modif
      7168730 des modifs pour la loi gap_sgr_clb_g0 et les lois _nosldt et _noslds
      0213711 Merge branch 'fix_bars' into 'dev'
      3f42c22 correction in extrusion of group function and management of Q4 element
      25ae2ad update coordinates of nodes in Track class of gmshutils
      1d54535 no critical bug when using GpvVTKDrawAll with bar elements
      51fa425 activate only linear prisme in SHB
      c3826c4 use a list of points in Track class of gmshutils
      9850972 fix in mesh tracking
      229bea4 add point tracking in a mesh using gmshpy
      6f1e8fd update comments in compute_center function of a_EF module
      b9d279f fix from bad merge
      1fb16c8 Update SHB module
      fb9008b remove ugly spaces
      40890c0 adding gmshutils module in pylmgc90 package allowing to read inp file, write geo file and generate msh file from geo one
      982c678 in mesh class, possibility to extruded a physical entity
      870a065 add BARxx to possible 2D elements
      65eefb2 visu axial stress/strain
      4bc2f6e modif bar element ; add BARxx to pre ; modify name of function for ByElement fields
      3f2381f passage mecaEF_iso en private, reactivation mecaEF_bar
      db1ad43 Merge branch 'new_IQS_Stick' into 'dev'
      16ce851 modifs pour loi xxx_STICK
      6abf4d3 Merge branch 'inter_accessor' into 'dev'
      11ac90a adding access to antagonist and candidat contactor index of an interaction
      bafed69 fix swig file dependency to .h files
      a2817cf Merge branch 'api' into 'dev'
      5636726 add function to get number and color of contactors of a RBDY2
      b2588a4 add dependency of overall to externalMBS module
      75961da Merge branch 'fix_mbs_name' into 'dev'
      b695ead fix lowercase name of wrap_mbs.h file in chipy.i.in
      3509f90 Merge branch 'fix' into 'dev'
      76b5433 buildMeshedAvatar function of pre_lmgc now to deepcopy of bulks and nodes objects
      2abdc5b fix map use in therMAILx and poroMAILx too
      3d389b2 fix bug when number of mecaMAILx and therMAILx are different
      448f384 Merge branch 'mbs' into 'dev'
      ce7a262 modify some comments
      2951df1 fix strange bug when printing result of a function
      8d904e8 link with FiberModel external MBS library
      34d3679 fix case dependent name for compile and improve display function of mbs
      ed4ab9c adding Nicolas Docquier's fix to use external mbs library
      8ade4bf correction in call of get_inertia_frame_POLYR and cluster of PLANx in PRPL detection
      e992417 adding third index to all tact2bdyty map to store on what type of body a contactor is tied to
      bf790b5 draft of cmake link with robotran external mbs library
      947a306 cmake file to look for external mbs library (empty)
      0cf6615 prepare compiling with external mbs library
      fe3177c diverses modfis pour prendre en compte le mbs
      983e63c qq modif de fd liees au mbs
      50286ce correct loading of interaction with mbs in nlgs_3D... no resolution yet
      ddbae90 attempt to create MBS with POLYR contactors
      f2d87ae genesis of a Multi Body System handler module
      f7088e6 Merge branch 'these_riviere' into 'dev'
      905488e ajout modif these jriviere
      7f399cc Merge branch 'bug_fix' into 'dev'
      b5aabfc fix therMAILx get_all function when used with mecaMAILx
      211e38a fix bug when reading DOF.INI with more therMAILx than mecaMAILx
      16bdd00 Merge branch 'rev_2015.3' into 'dev'
      75dbab3 ugly trick to check metis version when compiling MUMPS-5.0.0
      b61ff53 simple attempt to automatically set min and max time step when setting time step
      e6a2d35 put numpy include dir flag befor Python's one
      728c061 check cython version before compiling rTree python binding
      273a8d2 Possibility to desactivate use of Python Framework use in CMake
      5fa6f98 minor bug fix
      6877226 fix error in orthotropic frame computation
      3fab071 Maj to vtk field
      2663812 remove obsolete buildMeshedAvatar method from mesh class
      9ed5f0b fix typo in material of Pre sphinx doc
      afc3e1b fix external fields (scalar/vector) in Pre sphinx doc
      c5369e8 Merge branch 'fix_display' into 'dev'
      b625851 un peu plus de commentaires
      165e0bd fix de la visu des champs grad/flux en meca avec les modele builin
      ae6c187 Merge branch 'dev' into 'master'
      git-subtree-dir: src
      git-subtree-split: 1197b55e6c0d6420fd7dd639f44604d44919f2c6
  7. 26 May, 2015 2 commits
  8. 25 Mar, 2015 1 commit
    • mozul's avatar
      Squashed 'src/' changes from 5f57e5a..2ba7104 · 522697f2
      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
  9. 16 Jan, 2015 1 commit
    • mozul's avatar
      Squashed 'src/' changes from c31a22e..5f57e5a · 4b9c7e41
      mozul authored
      5f57e5a correct openmp compilation error in nlgs_3D
      3705bdb minor update of tutorial script of pre_lmgc sphinx doc
      91dfd2d correction erreur docstring
      0cb3eab update readme
      b6fc67b update readme
      git-subtree-dir: src
      git-subtree-split: 5f57e5a7c34b28971d3c93958a423cfcc14d8bdd
  10. 08 Jan, 2015 1 commit
    • mozul's avatar
      Squashed 'src/' changes from 80af6d1..c31a22e · 6c30b9ae
      mozul authored
      c31a22e Merge branch 'rc2015' of git-xen.lmgc.univ-montp2.fr:lmgc90/lmgc90_dev into rc2015
      c74be7a put back extrudeRigids routine accidentally removed from pre_lmgc
      c92a255 modif du wrap pour mp rigid
      86b5389 Merge branch 'PU_solveur_jacobi_3D' into 'dev'
      24d8422 Resolution de conflit pour le solveur jacobi
      e9384cf Merge branch 'PU_mecamailx_get_pointer' into 'dev'
      1da8e3a Merge branch 'PU_bug_correction' into 'dev'
      ab71b19 Bug correction : L'appel de get_all_clalp ou de get_all_internal_clalp par le script python conduit à une segementation fault si il n'y a pas de clalp Le return doit etre tester sur nb_vclalp qui dimensionne le pointeur et non sur nb_clalp
      0f027f8 Merge branch 'new_fix_czm' into 'dev'
      58103ab correction bug ABP 2D + modif dans gestion du initial_friction des czm
      c21c9a0 Merge branch 'modif_pre' into 'dev'
      7df9bcf je vire le print de merde
      a85c569 ajout d'un shrink dans rigidsFromMesh2D
      e5aa2e2 Modification dans mecamailx de GetPtr en GetPtrBodyVector Ajout des éléments nécessaires dans parameters Suppression des éléments redontants dans overall
      7dcbe2a Merge remote-tracking branch 'origin/dev' into PU_mecamailx_get_pointer
      238185b Merge branch 'fix_Vth' into 'dev'
      e14a4ca correction bug dans gestion dilatation thermique des DISKx & typo dans POLYG
      0857e0e Merge branch 'tst_rtree' into 'dev'
      eff817b Merge branch 'tst_rtree' of git-xen.lmgc.univ-montp2.fr:lmgc90/lmgc90_dev into tst_rtree
      04b6116 modifs suite au remarques de Remy Mozul
      04cca72 modif rtree
      e428ad9 modif rtree
      662f35d Merge branch 'fix' into 'dev'
      c183fba Merge branch 'vtk_fix' into 'dev'
      5ddcafc add accessor on xKSID for couette example coupled with gmsh
      0ddba49 Merge branch 'ddm_fix' into 'dev'
      d89aaf4 fix forgotten get_ptr_xxx call changes in ddm modules
      d9ec4f2 fix introduced bug in previous commit
      46c0cef correction in WriteDisplayFile API to add user field
      46e9339 Merge branch 'extractContour_pre2D' into 'dev'
      840beb6 Merge branch 'fix_PLPLx' into 'dev'
      34b04be fix of a comment
      6a7ac8f ajout fonction extraction contour en 2D
      d12bc12 Merge branch 'fix_pre' into 'dev'
      61d2cc5 correction de petites erreurs et typo du pre
      5baaffb Merge branch 'PU_get_all_internal' into 'dev'
      32cf755 Merge branch 'PU_vtk_display' into 'dev'
      6084eff Merge branch 'openmp_fix' into 'dev'
      0488cb0 compilation bug correction with openMP
      dcf109f Merge branch 'yales' into 'dev'
      0a7e0b1 Merge branch 'fix' into 'dev'
      f44f804 Change name from get_xxx_ptr to get_ptr_xxx
      48e060c using integer parameter instead of 10 characters string DIME
      94dbb8b Changement du nom get_pointer_mecamailx en get_ptr_mecamailx Passage de l'identifiant du champ par entier plutot que par chaine de caractères Ajout des identifiants necessaires dans overall Ajout d'un wrapper
      5b73113 Création d'un pointeur vers les différents champs de mod_mecamailx, afin de pouvoir y accéder et les modifier sans allocation.
      243ab89 Ajout de fonctions permettant de recupérer les valeurs de "internal" pour les contacts de type CLALp et CSASp Ces fonctions sont utilisable dans les jeu de données pour pouvoir par exemple ajouter le champ "beta" aux sorties paraview lors des calculs avec zones cohésives.
      3d125d3 Merge branch 'fix' into 'dev'
      f9c9712 no longer taking into account invisible bodies when computing equilibrium state
      107233c Merge branch 'dev_renouf' into 'dev'
      9f90d00 mr:mauvaise initialisation dans les conditions limites
      685e457 Ajout des sorties VTK pour Xper en 3D
      1223295 Merge remote-tracking branch 'origin/dev' into PU_vtk_display
      1cd6c7d possibility to compute only Fint in mecaMAILx_compute_bulk with MOREAU scheme
      64ed47c  Déplacement des .pvd dans DISPLAY  Concaténation des .pvd en DDM
      256b0b1 Merge branch 'ddm_concatenate_outbox' into 'dev'
      8d1f66d Merge avec la branche dev
      4c9fa02 Merge branch 'cmake' into 'dev'
      6369c22 correction for correct git branch check
      cede578 Merge branch 'cmake' into 'dev'
      d8e39e8 check git branch differences when invoking make
      59e6130 Modifications dans ddm_utils de concatenate_outbox() :
      0150a02 correct typo in cmake warning
      578b391 Merge branch 'cmake' into 'dev'
      65fc483 Modification sur ddm_utils.py
      7d697a7 remove warning on MACOS relating to RPATH
      95804c6 add cmake variable to check compiled git branch
      6c4f46b modele poiseuille dans elements erodes
      ee6ff07 Modifications dans ddm_utils de concatenate_outbox() :    - Ajout des GPV    - Factorisation de la fonction de concatenation    - La concatenation n'est effectuée que si les fichiers sont présents
      git-subtree-dir: src
      git-subtree-split: c31a22e1cf64f32dee78465e36713200a795a0c2
  11. 15 Dec, 2014 1 commit