Commit c6d03630 authored by Alan O'Cais's avatar Alan O'Cais
Browse files

Merge branch 'master' into 'master'

Correctly add ParaDiS

See merge request e-cam/E-CAM-Library!80
parents 0f6d89f3 28bc7d08
......@@ -63,10 +63,10 @@ The following modules connected to the DL_MESO_DPD code have been produced so fa
./modules/DL_MESO_DPD_onGPU/add_gpu_version/readme
./modules/DL_MESO_DPD/check_dlmeso_dpd/readme
ESPRESSO++
ESPResSo++
----------
The following modules connected to the ESPRESSO++ code have been produced so far:
The following modules connected to the ESPResSo++ code have been produced so far:
.. toctree::
:glob:
......@@ -82,6 +82,17 @@ The following modules connected to the ESPRESSO++ code have been produced so far
./modules/hierarchical-strategy/simple_one-component_melts/fine-graining/readme
./modules/hierarchical-strategy/simple_one-component_melts/coarse-graining/readme
ParaDiS
-------
The following modules connected to the ParaDiS code have been produced so far:
.. toctree::
:glob:
:maxdepth: 1
./modules/paradis_precipitate/paradis_precipitate_GC/readme.rst
./modules/paradis_precipitate/paradis_precipitate_HPC/readme.rst
ESDW Barcelona 2017
-------------------
......
......@@ -35,9 +35,9 @@
.. _paradis_precipitate:
####################
#########################
ParaDiS with precipitates
####################
#########################
.. Let's add a local table of contents to help people navigate the page
......
......@@ -34,11 +34,11 @@
unique otherwise you will cause cross-referencing errors. The reference must come right before the heading for the
reference to work (so don't insert a comment between).
.. _paradis_precipitate:
.. _paradis_precipitate_hpc:
####################
######################################################
ParaDiS with precipitates optimized to HPC environment
####################
######################################################
.. Let's add a local table of contents to help people navigate the page
......
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