Commit d0bc9539 authored by mozul's avatar mozul

Squashed 'src/' changes from 498f08b..ff3860f

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
parent 0f711c6a
################################################
#### Setting options for Bindings ####
set(CMAKE_C_FLAGS ${LMGC90_C_FLAGS} )
set(CMAKE_CXX_FLAGS ${LMGC90_CXX_FLAGS} )
set(CMAKE_Fortran_FLAGS ${LMGC90_Fortran_FLAGS})
################################################
# Compiling ExternalModels library :
#conditionnal uncache of MATLIB_LIBRARY !
......@@ -62,7 +68,7 @@ if(${MUMPS_VERSION} STREQUAL "none") # if mumps not asked
else(${MUMPS_VERSION} STREQUAL "none")
# find corresponding module
set(LMGC90_BINDINGS_SPARSE_LA_SRCS "${CMAKE_SOURCE_DIR}/contribs/linearAlgebra/Mumps_SparseLinearAlgebra.f90")
set(LMGC90_BINDINGS_SPARSE_LA_SRCS "${CMAKE_SOURCE_DIR}/contribs/Mumps_SparseLinearAlgebra.f90")
message(STATUS "Sparse linear algebra include path found: ${MUMPS_INCLUDE_DIRS}")
message(STATUS "Sparse linear algebra libraries found: ${MUMPS_LIBRARIES}")
message(STATUS "Sparse linear algebra binding found: ${LMGC90_BINDINGS_SPARSE_LA_SRCS}")
......
......@@ -22,6 +22,11 @@ SET(LMGC90_PATCH_VERSION 0)
MESSAGE(STATUS "You try to build LMGC90_dev")
##################################################
# Some Gitty things #
# like checking the change of branch name #
# or getting the commit of the version compiled#
# #
find_package(Git)
# check if git branch changed between cmake calls
if(${GIT_FOUND})
......@@ -53,6 +58,9 @@ if(${GIT_FOUND})
${CMAKE_CURRENT_BINARY_DIR}/get_git_branch.cmake
)
endif(${GIT_FOUND})
#
# End of Gitty things #
##################################################
if(NOT DEFINED CMAKE_MACOSX_RPATH)
set(CMAKE_MACOSX_RPATH 0)
......@@ -60,78 +68,101 @@ endif(NOT DEFINED CMAKE_MACOSX_RPATH)
# some path for output : libs, modules, executables
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
SET(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/modules)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/modules)
# equivalent to OPT= with makefiles is now -DOPT=
# degree of optimisation of the compiler
# possible values are opt (default), debug and check
set(OPT "opt" CACHE STRING "type of build" )
set_property(CACHE OPT PROPERTY STRINGS
"opt" "debug" "check"
)
"opt" "profiling" "debug" "check")
################################################
# On contribs #
# #
## MUMPs #
set(MUMPS_VERSION "sequential" CACHE STRING "Use of MUMPS library" )
set_property(CACHE MUMPS_VERSION PROPERTY STRINGS
"off" "sequential" "parallel")
option(BUILD_MUMPS "Build MUMPs and scalapack from scratch?" OFF)
## MatLib #
# if matlib is to be used and which one
set(MATLIB_VERSION "default" CACHE STRING "Type of matlib to use" )
set_property(CACHE MATLIB_VERSION PROPERTY STRINGS
"off" "default" "v3"
)
"off" "default" "v3")
option(BUILD_MATLIB "Force MatLib library compilation" OFF )
set(MATLIB_PATH CACHE PATH "Path to LMGC90v2_BindingExternalModels")
## Siconos #
option(WITH_SICONOS_NUMERICS "Activate SiconosNumerics contact solvers use" OFF)
#
# End of contribs #
################################################
#################################
# On external libraries #
#
## FEM ##
set(EXT_FEM_VERSION "none" CACHE STRING "External FEM library to use")
set_property(CACHE EXT_FEM_VERSION PROPERTY STRINGS
"none" "Xper"
)
"none" "Xper" "tense_dd")
set(EXT_FEM_PATH CACHE PATH "Path to LMGC90v2_BindingExternalFEM")
set(EXT_FEM_LIB_PATH CACHE PATH "Path to external libraries needed by external FEM")
## MBS ##
set(EXT_MBS_VERSION "none" CACHE STRING "External MBS library to use")
set_property(CACHE EXT_MBS_VERSION PROPERTY STRINGS
"none" "Robotran" "FiberModel"
)
"none" "Robotran" "FiberModel")
set(EXT_MBS_FILE CACHE FILE "File of the compilation of the external MBS library")
#
# End of external libraries #
#################################
# options definition
option(WITH_NEW "With new simulation module of Core " OFF )
# the worst option... ever !
option(GFORTRAN44_PATCHING "Apply patch when using gfortran 4.4 (which is very buggy)" OFF)
# other options:
option(BUILD_ChiPy "Compile les modules python" ON )
option(BUILD_PRE "Compile some pre-processing functions " ON )
option(BUILD_C_LIB "Create a C/C++ shared library" OFF )
option(BUILD_Fortran_LIB "Create a Fortran shared library" OFF )
option(BUILD_STANDALONE "Compile standalone" OFF )
option(WITH_DOCSTRING "Create docstring documentation of python modules from doxygen" ON)
option(WITH_OPENMP "Activate OpenMP flag compilation for multi thread simulations" OFF)
option(BUILD_rTree_BINDING "Build Python binding of rTree library" ON )
# too long without being tested:
option(WITH_SALADYN "With wrapper for coupling with Saladyn" OFF )
option(BUILD_ChiPy "Compile les modules python" ON )
option(BUILD_PRE "Compile some pre-processing functions " ON )
option(BUILD_C_LIB "Create a C/C++ shared library" OFF )
option(BUILD_Fortran_LIB "Create a Fortran shared library" OFF )
option(BUILD_STANDALONE "Compile standalone" OFF )
option(WITH_MEDPRE "Look for med library and activate medpre reading features" OFF)
option(BUILD_STANDALONE_MPI "Compile standalone_MPI" OFF )
option(BUILD_MUMPS_PA_ENRICHIE "Compile la version NSCDD PA ENRICHIE avec MUMPS!!" OFF )
option(BUILD_MATLIB "Force MatLib library compilation " OFF )
option(WITH_DOCSTRING "Create docstring documentation of python modules from doxygen" ON)
option(WITH_OPENMP "Activate OpenMP flag compilation for multi thread simulations" OFF)
option(WITH_MPI "Activate MPI parallel build" OFF)
option(BUILD_rTree_BINDING "Build Python binding of rTree library" ON)
option(WITH_SICONOS_NUMERICS "Activate SiconosNumerics contact solvers use" OFF)
option(WITH_MEDPRE "Look for med library and activate medpre reading features" OFF)
option(GFORTRAN44_PATCHING "Apply patch when using gfortran 4.4 (which is very buggy)" OFF)
# Lapack options
set(MUMPS_VERSION "sequential" CACHE STRING "Use of MUMPS library" )
set_property(CACHE MUMPS_VERSION PROPERTY STRINGS
"off" "sequential" "parallel"
)
option(BUILD_MUMPS "Build MUMPs and scalapack from scratch?" OFF)
# options definition: obsolete:
option(WITH_NEW "With new simulation module of Core " OFF )
option(BUILD_LAPACK "Build BLAS/LAPACK from scratch?" OFF)
####################################################
# From here, depending on the options, #
# packages are search or decided to be #
# compiled #
####################################################
set(MATLIB_PATH CACHE PATH "Path to LMGC90v2_BindingExternalModels")
set(EXT_FEM_PATH CACHE PATH "Path to LMGC90v2_BindingExternalFEM")
set(EXT_FEM_LIB_PATH CACHE PATH "Path to external libraries needed by external FEM")
if(BUILD_C_LIB AND BUILD_Fortran_LIB )
message(FATAL_ERROR "Cannot build C and Fortran lib at the same time, please choose between BUILD_C_LIB and BUILD_Fortran_LIB")
endif(BUILD_C_LIB AND BUILD_Fortran_LIB )
# store input given flags because there are currently 2 get_compiler option (one for lapack on for core)
set(FFLAGS_ORIGINAL ${CMAKE_Fortran_FLAGS})
# getting compiler options (depends on OPT value)
include(compilerTuning)
get_compiler_options()
######## Looking for Python executable and libraries ########
find_package(Python)
if( PYTHON_EXECUTABLE )
......@@ -141,9 +172,12 @@ if( PYTHON_EXECUTABLE )
)
endif( PYTHON_EXECUTABLE )
if(NOT ${MATLIB_VERSION} STREQUAL "off")
find_package(MatLib_FOR_LMGC REQUIRED)
endif(NOT ${MATLIB_VERSION} STREQUAL "off")
######## Looking for lapack libraries ########
find_package(LAPACK REQUIRED)
######## Looking for mumps libraries ########
if(WITH_MPI AND NOT ${MUMPS_VERSION} STREQUAL "none")
set(MUMPS_VERSION "parallel")
......@@ -178,6 +212,20 @@ if(NOT ${MUMPS_VERSION} STREQUAL "none" AND NOT BUILD_MUMPS )
endif(NOT ${MUMPS_VERSION} STREQUAL "none" AND NOT BUILD_MUMPS )
######## Looking for matlib library ########
if(NOT ${MATLIB_VERSION} STREQUAL "off")
find_package(MatLib_FOR_LMGC REQUIRED)
endif(NOT ${MATLIB_VERSION} STREQUAL "off")
######## Looking for Siconos-Numerics library ########
if( WITH_SICONOS_NUMERICS )
find_package(SiconosNumerics)
endif( WITH_SICONOS_NUMERICS )
######## Looking for Doxygen to generate the doc ######
# getting some packages for doc generation
find_package(Doxygen)
......@@ -186,18 +234,35 @@ if( NOT( ${DOXYGEN_FOUND} AND ${PYTHONINTERP_FOUND}) )
message(STATUS "Doxygen not found... WITH_DOCSTRING is set to FALSE")
endif()
if( WITH_SICONOS_NUMERICS )
find_package(SiconosNumerics)
endif( WITH_SICONOS_NUMERICS )
# looking for lapack libraries before compiling
if( NOT BUILD_LAPACK )
find_package(LAPACK)
if( NOT LAPACK_FOUND )
message( STATUS "could not find lapack... it is going to be compile first")
set( BUILD_LAPACK ON)
endif()
endif()
#######################################
# Getting compiler options #
# and caching values #
include(compilerTuning)
include(contribs_compilerTuning)
#### of lmgc90
get_lmgc90_compiler_options()
set(LMGC90_C_FLAGS "${LMGC90_C_FLAGS}" CACHE STRING "C flags used for LMGC90" FORCE)
set(LMGC90_CXX_FLAGS "${LMGC90_CXX_FLAGS}" CACHE STRING "CXX flags used for LMGC90" FORCE)
set(LMGC90_Fortran_FLAGS "${LMGC90_Fortran_FLAGS}" CACHE STRING "Fortran flags used for LMGC90" FORCE)
### of mumps if needed
if( BUILD_MUMPS )
get_mumps_compiler_options()
set(MUMPS_C_FLAGS "${MUMPS_C_FLAGS}" CACHE STRING "C flags used for MUMPS" FORCE)
set(MUMPS_Fortran_FLAGS "${MUMPS_Fortran_FLAGS}" CACHE STRING "Fortran flags used for MUMPS" FORCE)
endif( BUILD_MUMPS )
### of other contribs
get_contribs_compiler_options()
set(CONTRIBS_C_FLAGS "${CONTRIBS_C_FLAGS}" CACHE STRING "C flags used for CONTRIBS" FORCE)
set(CONTRIBS_CXX_FLAGS "${CONTRIBS_CXX_FLAGS}" CACHE STRING "CXX flags used for CONTRIBS" FORCE)
#######################################
include(CTest)
......
###############################################
#### Setting options for ChiPy ####
set(CMAKE_C_FLAGS ${LMGC90_C_FLAGS} )
set(CMAKE_CXX_FLAGS ${LMGC90_CXX_FLAGS} )
set(CMAKE_Fortran_FLAGS ${LMGC90_Fortran_FLAGS})
###############################################
# to get the list of .h files
set( headers_list )
......@@ -103,11 +110,7 @@ if(BUILD_ChiPy)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile_chipy.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_chipy.cfg
)
if(${PYTHON_VERSION_MAJOR} LESS 3)
set(DOXY2SWIG_FILE ${CMAKE_SOURCE_DIR}/tools/swig/doxy2swig.py)
else(${PYTHON_VERSION_MAJOR} LESS 3)
set(DOXY2SWIG_FILE ${CMAKE_SOURCE_DIR}/tools/swig/doxy2swig.py3)
endif(${PYTHON_VERSION_MAJOR} LESS 3)
set(DOXY2SWIG_FILE ${CMAKE_SOURCE_DIR}/tools/swig/doxy2swig.py)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/docs/chipy_swig_docstrings.i
DEPENDS ${headers_list}
COMMAND ${CMAKE_COMMAND} -E copy
......@@ -172,9 +175,9 @@ if(BUILD_ChiPy)
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/lmgc90.py
${CMAKE_BINARY_DIR}/pylmgc90/chipy/lmgc90.py)
if( WITH_NEW )
set( l __init__.py chipy.py vtk_display.py preconW.py ddm_utils.py)
set( l __init__.py chipy.py vtk_display.py preconW.py ddm_utils.py config.py)
else( WITH_NEW )
set( l __init__.py chipy.py vtk_display.py preconW.py ddm_utils.py new_arch_post_utils.py)
set( l __init__.py chipy.py vtk_display.py preconW.py ddm_utils.py new_arch_post_utils.py config.py)
endif( WITH_NEW )
foreach( f ${l} )
add_custom_target(${f} ALL
......
......@@ -543,7 +543,7 @@ WARNINGS = YES
# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
WARN_IF_UNDOCUMENTED = YES
WARN_IF_UNDOCUMENTED = NO
# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
# potential errors in the documentation, such as not documenting some
......
......@@ -46,6 +46,7 @@
#include "src/shared/wrap_timer.h"
#include "src/shared/wrap_utilities.h"
#include "src/shared/wrap_a_EF.h"
#include "src/shared/wrap_parameters.h"
#include "src/contact_2D/wrap_CLALp.h"
#include "src/contact_2D/wrap_CLJCx.h"
......@@ -454,6 +455,7 @@ import_array();
%include "src/shared/wrap_timer.h"
%include "src/shared/wrap_utilities.h"
%include "src/shared/wrap_a_EF.h"
%include "src/shared/wrap_parameters.h"
%include "src/contact_2D/wrap_CLALp.h"
%include "src/contact_2D/wrap_CLJCx.h"
......
import os
import os, sys
import subprocess
# open the file which will contain the documentation
......@@ -12,7 +12,7 @@ for file in files:
# for all wrap*.xml files
if ext=='.xml' and base[0:4]=='wrap':
# convert it in a .i file using doxy2swig.py script
retcode = subprocess.call(['python', 'doxy2swig.py', './docs/xml/'+file, './docs/'+base+'.i'])
retcode = subprocess.call([sys.executable, 'doxy2swig.py', './docs/xml/'+file, './docs/'+base+'.i'])
# add the content of newly created .i file to chipy_swig_docstrings.i
new = open('docs/'+base+'.i')
for line in new:
......@@ -20,3 +20,6 @@ for file in files:
new.close()
doc.close()
# ugly sed to remove some strange break line in arguments definition
os.system("sed -i '' -e ':a' -e 'N' -e '$!ba' -e 's/\* \`\([[:print:]]*\)\` :[[:space:]]*/\\1 /g' docs/chipy_swig_docstrings.i")
......@@ -134,25 +134,25 @@
extern "C" void CLALp_DisplayProxTactors(void);
/**
* @fn void CLALp_ReadIniVlocRloc(int step=0)
* @fn void CLALp_ReadIniVlocRloc(int num=0)
* @brief Read VlocRloc file
*
* If step <= 0 : DATBOX/VlocRloc.INI file is read
* If num <= 0 : DATBOX/VlocRloc.INI file is read
* Else : OUTBOX/VlocRloc.OUT.num is read, num being
* the parameter used in TimeEvolution_ReadIniVlocRloc
* last call
*
* @cond PYDOC
* usage : CLALp_ReadIniVlocRloc(step=0)
* @param[in] step (integer) : which VlocRloc file to read
* usage : CLALp_ReadIniVlocRloc(num=0)
* @param[in] num (integer) : which VlocRloc file to read
* @endcond
*
* @cond CDOC
* @param[in] step (int) : which VlocRloc file to read
* @param[in] num (int) : which VlocRloc file to read
* @endcond
*
*/
extern "C" void CLALp_ReadIniVlocRloc(int step=0);
extern "C" void CLALp_ReadIniVlocRloc(int num=0);
/**
* @fn void CLALp_SetNonSymetricDetection(void);
......@@ -161,7 +161,7 @@
* contactors see each other
*
* @cond PYDOC
* python usage : CLALp_SetNonSymetricDetection(void)
* python usage : CLALp_SetNonSymetricDetection()
* @endcond
*/
extern "C" void CLALp_SetNonSymetricDetection(void);
......
......@@ -125,25 +125,25 @@
extern "C" void CLJCx_DisplayProxTactors(void);
/**
* @fn void CLJCx_ReadIniVlocRloc(int step=0)
* @fn void CLJCx_ReadIniVlocRloc(int num=0)
* @brief Read VlocRloc file
*
* If step <= 0 : DATBOX/VlocRloc.INI file is read
* If num <= 0 : DATBOX/VlocRloc.INI file is read
* Else : OUTBOX/VlocRloc.OUT.num is read, num being
* the parameter used in TimeEvolution_ReadIniVlocRloc
* last call
*
* @cond PYDOC
* usage : CLJCx_ReadIniVlocRloc(step=0)
* @param[in] step (integer) : which VlocRloc file to read
* usage : CLJCx_ReadIniVlocRloc(num=0)
* @param[in] num (integer) : which VlocRloc file to read
* @endcond
*
* @cond CDOC
* @param[in] step (int) : which VlocRloc file to read
* @param[in] num (int) : which VlocRloc file to read
* @endcond
*
*/
extern "C" void CLJCx_ReadIniVlocRloc(int step=0);
extern "C" void CLJCx_ReadIniVlocRloc(int num=0);
/**
* @fn int CLJCx_GetNbCLJCx(void)
......
......@@ -124,25 +124,25 @@
extern "C" void DKALp_DisplayProxTactors(void);
/**
* @fn void DKALp_ReadIniVlocRloc(int step=0)
* @fn void DKALp_ReadIniVlocRloc(int num=0)
* @brief Read VlocRloc file
*
* If step <= 0 : DATBOX/VlocRloc.INI file is read
* If num <= 0 : DATBOX/VlocRloc.INI file is read
* Else : OUTBOX/VlocRloc.OUT.num is read, num being
* the parameter used in TimeEvolution_ReadIniVlocRloc
* last call
*
* @cond PYDOC
* usage : DKALp_ReadIniVlocRloc(step=0)
* @param[in] step (integer) : which VlocRloc file to read
* usage : DKALp_ReadIniVlocRloc(num=0)
* @param[in] num (integer) : which VlocRloc file to read
* @endcond
*
* @cond CDOC
* @param[in] step (int) : which VlocRloc file to read
* @param[in] num (int) : which VlocRloc file to read
* @endcond
*
*/
extern "C" void DKALp_ReadIniVlocRloc(int step=0);
extern "C" void DKALp_ReadIniVlocRloc(int num=0);
/**
* @fn int DKALp_GetNbDKALp(void)
......
......@@ -135,25 +135,25 @@
extern "C" void DKDKL_DisplayProxTactors(void);
/**
* @fn void DKDKL_ReadIniVlocRloc(int step=0)
* @fn void DKDKL_ReadIniVlocRloc(int num=0)
* @brief Read VlocRloc file
*
* If step <= 0 : DATBOX/VlocRloc.INI file is read
* If num <= 0 : DATBOX/VlocRloc.INI file is read
* Else : OUTBOX/VlocRloc.OUT.num is read, num being
* the parameter used in TimeEvolution_ReadIniVlocRloc
* last call
*
* @cond PYDOC
* usage : DKDKL_ReadIniVlocRloc(step=0)
* @param[in] step (integer) : which VlocRloc file to read
* usage : DKDKL_ReadIniVlocRloc(num=0)
* @param[in] num (integer) : which VlocRloc file to read
* @endcond
*
* @cond CDOC
* @param[in] step (int) : which VlocRloc file to read
* @param[in] num (int) : which VlocRloc file to read
* @endcond
*
*/
extern "C" void DKDKL_ReadIniVlocRloc(int step=0);
extern "C" void DKDKL_ReadIniVlocRloc(int num=0);
/**
* @fn void DKDKL_SetPeriodicCondition(double period)
......
......@@ -149,25 +149,25 @@
extern "C" void DKDKx_DisplayProxTactors(void);
/**
* @fn void DKDKx_ReadIniVlocRloc(int step=0)
* @fn void DKDKx_ReadIniVlocRloc(int num=0)
* @brief Read VlocRloc file
*
* If step <= 0 : DATBOX/VlocRloc.INI file is read
* If num <= 0 : DATBOX/VlocRloc.INI file is read
* Else : OUTBOX/VlocRloc.OUT.num is read, num being
* the parameter used in TimeEvolution_ReadIniVlocRloc
* last call
*
* @cond PYDOC
* usage : DKDKx_ReadIniVlocRloc(step=0)
* @param[in] step (integer) : which VlocRloc file to read
* usage : DKDKx_ReadIniVlocRloc(num=0)
* @param[in] num (integer) : which VlocRloc file to read
* @endcond
*
* @cond CDOC
* @param[in] step (int) : which VlocRloc file to read
* @param[in] num (int) : which VlocRloc file to read
* @endcond
*
*/
extern "C" void DKDKx_ReadIniVlocRloc(int step=0);
extern "C" void DKDKx_ReadIniVlocRloc(int num=0);
/**
* @fn void DKDKx_SetPeriodicCondition(double period)
* @brief initialize data for simulation using periodic condition
......
......@@ -124,25 +124,25 @@
extern "C" void DKDPx_DisplayProxTactors(void);
/**
* @fn void DKDPx_ReadIniVlocRloc(int step=0)
* @fn void DKDPx_ReadIniVlocRloc(int num=0)
* @brief Read VlocRloc file
*
* If step <= 0 : DATBOX/VlocRloc.INI file is read
* If num <= 0 : DATBOX/VlocRloc.INI file is read
* Else : OUTBOX/VlocRloc.OUT.num is read, num being
* the parameter used in TimeEvolution_ReadIniVlocRloc
* last call
*
* @cond PYDOC
* usage : DKDPx_ReadIniVlocRloc(step=0)
* @param[in] step (integer) : which VlocRloc file to read
* usage : DKDPx_ReadIniVlocRloc(num=0)
* @param[in] num (integer) : which VlocRloc file to read
* @endcond
*
* @cond CDOC
* @param[in] step (int) : which VlocRloc file to read
* @param[in] num (int) : which VlocRloc file to read
* @endcond
*
*/
extern "C" void DKDPx_ReadIniVlocRloc(int step=0);
extern "C" void DKDPx_ReadIniVlocRloc(int num=0);
/**
* @fn int DKDPx_GetNbDKDPx(void)
......
......@@ -134,25 +134,25 @@
extern "C" void DKJCx_DisplayProxTactors(void);
/**
* @fn void DKJCx_ReadIniVlocRloc(int step=0)
* @fn void DKJCx_ReadIniVlocRloc(int num=0)
* @brief Read VlocRloc file
*
* If step <= 0 : DATBOX/VlocRloc.INI file is read
* If num <= 0 : DATBOX/VlocRloc.INI file is read
* Else : OUTBOX/VlocRloc.OUT.num is read, num being
* the parameter used in TimeEvolution_ReadIniVlocRloc
* last call
*
* @cond PYDOC
* usage : DKJCx_ReadIniVlocRloc(step=0)
* @param[in] step (integer) : which VlocRloc file to read
* usage : DKJCx_ReadIniVlocRloc(num=0)
* @param[in] num (integer) : which VlocRloc file to read
* @endcond
*
* @cond CDOC
* @param[in] step (int) : which VlocRloc file to read
* @param[in] num (int) : which VlocRloc file to read
* @endcond
*
*/
extern "C" void DKJCx_ReadIniVlocRloc(int step=0);
extern "C" void DKJCx_ReadIniVlocRloc(int num=0);
/**
* @fn int DKJCx_GetNbDKJCx(void)
......
......@@ -134,25 +134,25 @@
extern "C" void DKKDx_DisplayProxTactors(void);
/**
* @fn void DKKDx_ReadIniVlocRloc(int step=0)
* @fn void DKKDx_ReadIniVlocRloc(int num=0)
* @brief Read VlocRloc file
*
* If step <= 0 : DATBOX/VlocRloc.INI file is read
* If num <= 0 : DATBOX/VlocRloc.INI file is read