Merge pull request #121 from borellim/clarify_video_lectures

Add links to QE 5.1 and the 2019 videos from the tutorial page + other minor changes
aiidateam · Aug 5, 2019 · 5b4231c · 5b4231c
2 parents 0276a8a + 2af600f
commit 5b4231c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 21 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -18,7 +18,7 @@ interactive demos and videos.
 
 .. toctree::
    :maxdepth: 1
-   :caption: Demos
+   :caption: Interactive demos
 
    interactive notebooks, binderized (aiida-core 0.12.3) <https://github.com/aiidateam/aiida_demos>
    interactive notebooks (aiida-core 0.10.0) <https://github.com/aiidateam/aiida-max-examples>
@@ -28,9 +28,9 @@ interactive demos and videos.
    :maxdepth: 1
    :caption: Videos
 
-   2019 workflow tutorial lectures (aiida-core 1.0.0b3) <https://www.youtube.com/playlist?list=PL19kfLn4sO_-QtPaHAA8KByFluT2vvlG0>
-   2019 plugin migration lectures (aiida-core 1.0.0b2) <https://www.youtube.com/playlist?list=PL19kfLn4sO_9laPkLBdv935PquRxX8dCc>
+   2019 tutorial lectures (aiida-core 1.0.0b3) <https://www.youtube.com/playlist?list=PL19kfLn4sO_-QtPaHAA8KByFluT2vvlG0>
+   2019 plugin migration workshop lectures (aiida-core 1.0.0b2) <https://www.youtube.com/playlist?list=PL19kfLn4sO_9laPkLBdv935PquRxX8dCc>
    2017 tutorial lectures (aiida-core 0.9.0) <https://www.youtube.com/playlist?list=PL19kfLn4sO_86ruxDP-sxbRXMuOr0VInR>
-   2017 short videos (aiida-core 0.8.0) <https://www.youtube.com/playlist?list=PL19kfLn4sO_-XDUeXu5jwUq9k7TId8mM0>
+   2017 short demo videos (aiida-core 0.8.0) <https://www.youtube.com/playlist?list=PL19kfLn4sO_-XDUeXu5jwUq9k7TId8mM0>
    2016 tutorial lectures (aiida-core 0.6.0) <https://www.youtube.com/watch?v=qUNYEWClS2U&list=PL19kfLn4sO_86ruxDP-sxbRXMuOr0VInR&index=4>
 
diff --git a/docs/pages/2016_MARVEL_Psik_MaX/index.rst b/docs/pages/2016_MARVEL_Psik_MaX/index.rst
@@ -1,24 +1,27 @@
 +-----------------+-----------------------------------------------------+
-| Prerequisite    | Version                                             |
+| Related resources                                                     |
 +=================+=====================================================+
 | Virtual Machine | `AiiDA tutorial VM`_ (`installation instructions`_) |
 +-----------------+-----------------------------------------------------+
 | python packages | `aiida-core 0.6.0`_                                 |
 +-----------------+-----------------------------------------------------+
+| codes           | `Quantum Espresso 5.1`_                             |
++-----------------+-----------------------------------------------------+
+| videos          | `recorded lectures`_                                |
++-----------------+-----------------------------------------------------+
 
 .. _AiiDA tutorial VM: https://object.cscs.ch/v1/AUTH_b1d80408b3d340db9f03d373bbde5c1e/marvel-vms/old_tutorials/AiiDA_tutorial_2016_07.ova
 .. _installation instructions: https://object.cscs.ch/v1/AUTH_b1d80408b3d340db9f03d373bbde5c1e/marvel-vms/old_tutorials/AiiDA_tutorial_2016_07_instructions.pdf
 .. _aiida-core 0.6.0: https://github.com/aiidateam/aiida_core/releases/tag/tutorial_2016_06_lausanne
+.. _Quantum Espresso 5.1: https://gitlab.com/QEF/q-e/-/tags/qe-5.1.0
+.. _recorded lectures: https://www.youtube.com/watch?v=qUNYEWClS2U&list=PL19kfLn4sO_86ruxDP-sxbRXMuOr0VInR&index=4
 
 The `MARVEL/Psi-k/MaX Tutorial on high-throughput computations: general methods
 and applications using AiiDA
 <http://nccr-marvel.ch/events/aiida-tutorial-june-2016>`_ took place on June
 22-24, 2016 at EPFL (Lausanne, Switzerland).
 
-MARVEL/Psi-k/MaX tutorial on high-throughput computations
-=========================================================
+1\ :sup:`st` MARVEL/Psi-k/MaX tutorial on high-throughput computations
+======================================================================
 
 Please download the `tutorial instructions <https://object.cscs.ch/v1/AUTH_b1d80408b3d340db9f03d373bbde5c1e/marvel-vms/old_tutorials/AiiDA_tutorial_2016_07_tutorial.pdf>`_ (pdf format).
-
-See also the recorded `video lectures <https://www.youtube.com/watch?v=qUNYEWClS2U&list=PL19kfLn4sO_86ruxDP-sxbRXMuOr0VInR&index=4>`_.
-
diff --git a/docs/pages/2017_ICTP/index.rst b/docs/pages/2017_ICTP/index.rst
@@ -1,14 +1,17 @@
 +-----------------+-----------------------------------------------------+
-| Prerequisite    | Version                                             |
+| Related resources                                                     |
 +=================+=====================================================+
 | Virtual Machine | `AiiDA tutorial VM`_ (`installation instructions`_) |
 +-----------------+-----------------------------------------------------+
 | python packages | `aiida-core 0.7.1`_                                 |
 +-----------------+-----------------------------------------------------+
+| codes           | `Quantum Espresso 5.1`_                             |
++-----------------+-----------------------------------------------------+
 
 .. _AiiDA tutorial VM: https://object.cscs.ch/v1/AUTH_b1d80408b3d340db9f03d373bbde5c1e/marvel-vms/old_tutorials/aiida_tutorial_2017_01.ova
 .. _installation instructions: https://object.cscs.ch/v1/AUTH_b1d80408b3d340db9f03d373bbde5c1e/marvel-vms/old_tutorials/aiida_tutorial_2017_01_instructions.pdf
 .. _aiida-core 0.7.1: https://github.com/aiidateam/aiida_core/releases/tag/tutorial_2017_01_trieste
+.. _Quantum Espresso 5.1: https://gitlab.com/QEF/q-e/-/tags/qe-5.1.0
 
 The `eigth AiiDA hands-on tutorial <http://www.aiida.net/report-aiida-tutorial-january-2017/>`_ took place on January 24-25, 2017 at ICTP (Trieste, Italy).
 

diff --git a/docs/pages/2017_MARVEL_Psik_MaX/index.rst b/docs/pages/2017_MARVEL_Psik_MaX/index.rst
@@ -1,23 +1,27 @@
 +-----------------+-----------------------------------------------------+
-| Prerequisite    | Version                                             |
+| Related resources                                                     |
 +=================+=====================================================+
 | Virtual Machine | `AiiDA tutorial VM`_ (`installation instructions`_) |
 +-----------------+-----------------------------------------------------+
 | python packages | `aiida-core 0.9.0`_                                 |
 +-----------------+-----------------------------------------------------+
+| codes           | `Quantum Espresso 5.1`_                             |
++-----------------+-----------------------------------------------------+
+| videos          | `recorded lectures`_                                |
++-----------------+-----------------------------------------------------+
 
 .. _AiiDA tutorial VM: https://object.cscs.ch/v1/AUTH_b1d80408b3d340db9f03d373bbde5c1e/marvel-vms/old_tutorials/aiida_tutorial_2017_06.ova
 .. _installation instructions: https://object.cscs.ch/v1/AUTH_b1d80408b3d340db9f03d373bbde5c1e/marvel-vms/old_tutorials/aiida_tutorial_2017_06_instructions.pdf
 .. _aiida-core 0.9.0: https://pypi.org/project/aiida-core/0.9.0/
+.. _Quantum Espresso 5.1: https://gitlab.com/QEF/q-e/-/tags/qe-5.1.0
+.. _recorded lectures: https://www.youtube.com/watch?v=qD2IcaFV4Io&list=PL19kfLn4sO_86ruxDP-sxbRXMuOr0VInR
 
 The second edition of the `MARVEL/Psi-k/MaX Tutorial on high-throughput
 computations: general methods and applications using AiiDA
 <http://nccr-marvel.ch/events/aiida-tutorial-may-2017>`_ took place on May
 29-31, 2017 at EPFL (Lausanne, Switzerland).
 
-MARVEL/Psi-k/MaX tutorial on high-throughput computations
-=========================================================
+2\ :sup:`nd` MARVEL/Psi-k/MaX tutorial on high-throughput computations
+======================================================================
 
 Please download the `tutorial instructions <https://object.cscs.ch/v1/AUTH_b1d80408b3d340db9f03d373bbde5c1e/marvel-vms/old_tutorials/aiida_tutorial_2017_06_text.pdf>`_ (pdf format).
-
-See also the recorded `video lectures <https://www.youtube.com/watch?v=qD2IcaFV4Io&list=PL19kfLn4sO_86ruxDP-sxbRXMuOr0VInR>`_.
diff --git a/docs/pages/2018_EPFL_molsim/index.rst b/docs/pages/2018_EPFL_molsim/index.rst
@@ -1,5 +1,5 @@
 +-----------------+------------------------------------------------------------------+
-| Prerequisite    | Version                                                          |
+| Related resources                                                                  |
 +=================+==================================================================+
 | Virtual Machine | `Quantum Mobile 18.04.0`_                                        |
 +-----------------+------------------------------------------------------------------+

diff --git a/docs/pages/2018_PRACE_MaX/index.rst b/docs/pages/2018_PRACE_MaX/index.rst
@@ -1,5 +1,5 @@
 +-----------------+-------------------------------------------------------------------+
-| Prerequisite    | Version                                                           |
+| Related resources                                                                   |
 +=================+===================================================================+
 | Virtual Machine | `Quantum Mobile 18.04.0-tutorial`_ (`installation instructions`_) |
 +-----------------+-------------------------------------------------------------------+

diff --git a/docs/pages/2019_MARVEL_Psik_MaX/index.rst b/docs/pages/2019_MARVEL_Psik_MaX/index.rst
@@ -1,22 +1,25 @@
 +-----------------+----------------------------------------------------------------------------+
-| Prerequisite    | Version                                                                    |
+| Related resources                                                                            |
 +=================+============================================================================+
 | Virtual Machine | `Quantum Mobile 19.05.0-tutorial`_                                         |
 +-----------------+----------------------------------------------------------------------------+
 | python packages | `aiida-core 1.0.0b3`_, `aiida-quantumespresso 3.0.0a3`_, `aiidalab 19.05`_ |
 +-----------------+----------------------------------------------------------------------------+
 | codes           | `Quantum Espresso 6.3`_                                                    |
 +-----------------+----------------------------------------------------------------------------+
+| videos          | `recorded lectures and invited talks`_                                     |
++-----------------+----------------------------------------------------------------------------+
 
 .. _Quantum Mobile 19.05.0-tutorial: https://github.com/marvel-nccr/quantum-mobile/releases/tag/tutorial-2019-05
 .. _aiida-core 1.0.0b3: https://pypi.org/project/aiida-core/1.0.0b3
 .. _aiida-quantumespresso 3.0.0a3: https://github.com/aiidateam/aiida-quantumespresso/releases/tag/v3.0.0a3
 .. _aiidalab 19.05: https://github.com/aiidalab/aiidalab-metapkg/releases/tag/tutorial-2019-05
 .. _Quantum Espresso 6.3: https://github.com/QEF/q-e/releases/tag/qe-6.3
+.. _`recorded lectures and invited talks`: https://www.youtube.com/playlist?list=PL19kfLn4sO_-QtPaHAA8KByFluT2vvlG0
 
 These are the notes of the `AiiDA tutorial on writing reproducible workflows for computational materials science <http://www.aiida.net/tutorial-reproducible-workflows/>`__  which took place from May 21-24, 2019 at EPF Lausanne, Switzerland.
 
-While participants of the tutorial used virtual machines on a cloud service, you can follow the tutorial just as well using the Quantum Mobile VirtualBox image linked above.
+While participants of the tutorial used virtual machines on a cloud service, you can follow the tutorial just as well using the Quantum Mobile VirtualBox image linked above. The image already contains all the required software.
 
 Writing reproducible workflows for computational materials science
 ==================================================================

diff --git a/docs/pages/2019_molsim_school_Amsterdam/index.rst b/docs/pages/2019_molsim_school_Amsterdam/index.rst
@@ -1,5 +1,5 @@
 +-----------------+-------------------------------------------+
-| Prerequisite    | Version                                   |
+| Related resources                                           |
 +=================+===========================================+
 | Virtual Machine | `Quantum Mobile 18.10.0RC1`_              |
 +-----------------+-------------------------------------------+