Commit 4c1d039b authored by mozul's avatar mozul
Browse files

Merge commit '4b9c7e41'

parents 359beb56 4b9c7e41
......@@ -123,8 +123,7 @@ extern "C" void bulk_behav_GetGravity(double ** r8_vector, int * r8_size);
* @brief set the gravity acceleration to be used
*
* @cond PYDOC
* python usage : bulk_behav_SetGravity(gravity,length)
* @param[in] length (integer) : size of gravity vector, must be 3
* python usage : bulk_behav_SetGravity(gravity)
* @param[in] gravity (double array) : gravity vector (size 3)
* @endcond
*
......
......@@ -2163,6 +2163,15 @@ CONTAINS
IF (i_what == i_iter) nlgs_loop = nlgs_loop + 1
!Pour solveur jacobi
if( JACOBI_SOLVER ) then
do ik=1,nb_CDAN
this(ik)%rlt_jacobi = this(ik)%rlt
this(ik)%rln_jacobi = this(ik)%rln
this(ik)%rls_jacobi = this(ik)%rls
end do
end if
!$OMP PARALLEL DEFAULT(SHARED) &
!$OMP PRIVATE(ikk,ik,rlsik,rltik,rlnik,rlsiki,rltiki,rlniki, &
!$OMP Wrlsik,Wrltik,Wrlnik,Wrlsiki,Wrltiki,Wrlniki, &
......@@ -2182,15 +2191,6 @@ CONTAINS
!$OMP REDUCTION(MAX:MaxDVDV,MaxDVDVRR,WRRmax) &
!$OMP REDUCTION(MIN:WRRmin)
!Pour solveur jacobi
if( JACOBI_SOLVER ) then
do ik=1,nb_CDAN
this(ik)%rlt_jacobi = this(ik)%rlt
this(ik)%rln_jacobi = this(ik)%rln
this(ik)%rls_jacobi = this(ik)%rls
end do
end if
DO ikk=1,nb_CDAN
! Changing at random computational ordering of contact elements
......
......@@ -65,6 +65,9 @@ svdkpl = see_table(CorpsCandidat='RBDY2', candidat='DISKx', colorCandidat='BLUEx
svs+=svdkpl
# files writing
if not os.path.isdir('./DATBOX'):
os.mkdir('./DATBOX')
writeBodies(bodies,chemin='DATBOX/')
writeBulkBehav(mats,chemin='DATBOX/')
writeTactBehav(tacts,svs,chemin='DATBOX/')
......@@ -72,3 +75,5 @@ writeDrvDof(bodies,chemin='DATBOX/')
writeDofIni(bodies,chemin='DATBOX/')
writeVlocRlocIni(chemin='DATBOX/')
post = postpro_commands()
writePostpro(commands=post, parts=bodies, path='DATBOX/')
......@@ -104,9 +104,15 @@ svpljc = see_table(CorpsCandidat='RBDY2',candidat='POLYG', colorCandidat='BLEUx'
svs+=svpljc
# file writing
if not os.path.isdir('./DATBOX'):
os.mkdir('./DATBOX')
writeBodies(bodies,chemin='DATBOX/')
writeBulkBehav(mats,chemin='DATBOX/')
writeTactBehav(tacts,svs,chemin='DATBOX/')
writeDrvDof(bodies,chemin='DATBOX/')
writeDofIni(bodies,chemin='DATBOX/')
writeVlocRlocIni(chemin='DATBOX/')
post = postpro_commands()
writePostpro(commands=post, parts=bodies, path='DATBOX/')
......@@ -80,9 +80,16 @@ svdkdk = see_table(CorpsCandidat='RBDY2', candidat='DISKx', colorCandidat='BLUEx
svs+=svdkdk
# files writing
if not os.path.isdir('./DATBOX'):
os.mkdir('./DATBOX')
writeBodies(bodies,chemin='DATBOX/')
writeBulkBehav(mats,chemin='DATBOX/')
writeTactBehav(tacts,svs,chemin='DATBOX/')
writeDrvDof(bodies,chemin='DATBOX/')
writeDofIni(bodies,chemin='DATBOX/')
writeVlocRlocIni(chemin='DATBOX/')
post = postpro_commands()
writePostpro(commands=post, parts=bodies, path='DATBOX/')
For up-to-date and more detailed informations follow instructions from:
https://subver.lmgc.univ-montp2.fr/trac_LMGC90v2
or
https://subver.lmgc.univ-montp2.fr/trac_LMGC90v2_dev
*you have downloaded LMGC90v2_dev
# LMGC90 project #
Versionning
===========
People contributing to the project can view up-to-date information
[here](https://git-xen.lmgc.univ-montp2.fr/lmgc90/lmgc90_dev/tree/master)
The versionning tool used is git. To have more information the workflow used
and how to use git check [there](https://git-xen.lmgc.univ-montp2.fr/lmgc90/lmgc90_dev/wikis/LMGC90_dev)
Compilation
===========
Pre-requisites
--------------
To compile you need:
* A fortran compiler (GNU, Intel or PGI)
* Lapack library
* CMake
* Swig
* Python and numpy
For visualisation:
* Python VTK module
* Paraview
To build the sphinx documentation:
* Latex distribution (with pdflatex utility)
* Sphinx and numpydoc
* Doxygen
* Graphviz
* dvipng
On Ubuntu the list of package needed for compiling and using is:
gfortran gcc g++ liblapack-dev python-dev python-numpy python-vtk swig cmake paraview
For the doc you will also need:
doxygen graphviz sphinx python-numpydoc texlive-latex-extra dvipng
On MacOs using macports:
gcc48 python27 py27-numpy swig vtk +python27 cmake
Then you need to set the compiler and python as the default on your system :
```
sudo port select gcc mp-gcc48
sudo port select python27
```
For the doc:
doxygen graphvix py27-sphinx py27-pip texlive-latex-extra dvipng
And with pip, install the following python package:
numpydoc
Building
--------
CMake is used to generate the makefile. Out of source build is advised.
So you need to know the source tree path, decide on a build path then:
```
cd build_path
cmake source_path
make
```
Instead of cmake, one can use *ccmake* to change variable values on
the command line, or *cmake-gui* to use graphical interface.
To build the documentation run :
```
make docs
```
It will build it in :
* Docs/sphinx/chipy/build/html
* Docs/sphinx/dev/build/html
* Docs/sphinx/Pre/build/html
Installing
----------
Our policy is to not mess with default system paths. So instead we advise to
use a environment variable to add to python the path to our build directory.
In general adding the following lines to your *.bashrc* *.bash_profile* or *.profile*
file does the trick. Of course you have to replace *mybuildpath* by the path to
your own building directory. Basically it is what returns the command *pwd* when
ran in the same directory you ran the commands *cmake* and *make*.
```
if [ -z ${PYTHONPATH} ]; then
export PYTHONPATH=mybuildpath
else
export PYTHONPATH=${PYTHONPATH}:mybuildpath
fi
```
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment