Commit 43fe7961 authored by mozul's avatar mozul

Merge commit 'd0bc9539'

2016 release candidate 5
parents 48aef5ed d0bc9539
################################################
#### 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
* Else : OUTBOX/VlocRloc.OUT.num is read, num being