From 1d08592f3d5cc5e1261b64af857b58845a1e10fe Mon Sep 17 00:00:00 2001 From: Carsten Ehbrecht Date: Tue, 10 Oct 2017 18:16:27 +0200 Subject: [PATCH] comment dkrz part --- docs/source/requirements/conda.rst | 7 ++-- docs/source/requirements/prepare.rst | 49 ++++++++++++++++------------ 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/docs/source/requirements/conda.rst b/docs/source/requirements/conda.rst index b350f9d..938752e 100644 --- a/docs/source/requirements/conda.rst +++ b/docs/source/requirements/conda.rst @@ -25,9 +25,10 @@ and shared with others. Installation ------------ -.. note:: - If you already have Conda/Anaconda installed, you can use it in this workshop. - See: :ref:`dkrz`. +.. + .. note:: + If you already have Conda/Anaconda installed, you can use it in this workshop. + See: :ref:`dkrz`. .. note:: You don't need admin rights to install conda and conda packages. diff --git a/docs/source/requirements/prepare.rst b/docs/source/requirements/prepare.rst index d9bc42d..d77e2fc 100644 --- a/docs/source/requirements/prepare.rst +++ b/docs/source/requirements/prepare.rst @@ -31,8 +31,10 @@ Activate the conda *workshop* environment (Linux and macOS): $ activate workshop -.. tip:: - If you are a DKRZ user you can also log-in to the :ref:`DKRZ Compute Cluster ` +.. + + .. tip:: + If you are a DKRZ user you can also log-in to the :ref:`DKRZ Compute Cluster ` I don't have git ... @@ -78,34 +80,39 @@ a conda ``environment.yml`` file in the top level folder: $ conda env create -f environment.yml -.. _dkrz: -Using your DKRZ account (*DKRZ users only*) ---------------------------------------------- +.. -You can use your DKRZ account and log-in to `Mistral`_ to run this workshop: + .. _dkrz: -.. code-block:: bash + Using your DKRZ account (*DKRZ users only*) + --------------------------------------------- - $ ssh -Y myname@mistral.dkrz.de - # unload conflicting modules - $ module unload netcdf_c - # load anaconda module - $ module load anaconda3 + You can use your DKRZ account and log-in to `Mistral`_ to run this workshop: -You may start a `Byobu`_ session to have multiple terminal windows: + .. code-block:: bash -.. code-block:: bash + $ ssh -Y myname@mistral.dkrz.de + # unload conflicting modules + $ module unload netcdf_c + # load anaconda module + $ module load anaconda3 - $ byobu + You may start a `Byobu`_ session to have multiple terminal windows: -.. tip:: - There is a prepared **read-only** conda environment on mistral, - which you can activate with the following command:: + .. code-block:: bash - $ source activate /mnt/lustre01/work/kd0956/sw/conda-envs/birdhouse-workshop + $ byobu - Only use it when your environment is broken or installation takes too long. + .. tip:: + There is a prepared **read-only** conda environment on mistral, + which you can activate with the following command:: + + $ source activate /mnt/lustre01/work/kd0956/sw/conda-envs/birdhouse-workshop + + Only use it when your environment is broken or installation takes too long. .. _Byobu: http://byobu.co/ -.. _Mistral: https://www.dkrz.de/Nutzerportal/dokumentationen/de-mistral + +.. + .. _Mistral: https://www.dkrz.de/Nutzerportal/dokumentationen/de-mistral