.gitignore

@@ -1,3 +1,5 @@
 # mkdocs
 .cache/
 site/
+_site/
+.DS_Store

docs/merlin7/05-Open-OnDemand/open-ondemand.md

@@ -0,0 +1,48 @@
+# ondemand.psi.ch
+[Open OnDemand](https://www.openondemand.org/) is an open-source, web-based portal that allows researchers, students, and engineers to access High-Performance Computing (HPC) resources from any device using a web browser.
+
+## Accessing Open OnDemand
+Open Ondemand can be accessed from your browser at <https://ondemand.psi.ch/>.
+
+It's recommended to use a **Chromium-Based** browser (e.g., Google Chrome or
+Chromium) to have access to all
+features.
+
+To login, use your **PSI Credentials**.
+
+![](/images/merlin7-open-ondemand-login.png "Open OnDemand Login")
+
+## Interactive Partition
+
+When choosing a partition in one of the applications to start a job, give
+preference to the <code>interactive</code> partition and keep the <code>--reservation=interactive</code>
+box checked.
+
+The interactive reservation provides immediate access to reserved resources.
+This means that **your job will start faster** and it will use the same reservation
+if you wish to reconnect.
+
+If you start noticing delays when using the default interactive setup, please inform the [Merlin 7 Admins](/support/introduction/#email-the-admins) so the reservation can be reviewed or extended.
+
+![](/images/merlin7-open-ondemand-interactive-partition.png "Open OnDemand Interactive Partition")
+
+## Merlin 7 Shell Access
+Open OnDemand allows you to access Merlin 7 with a shell session similar to SSH
+into the cluster on your own machine. To do so, go to **Clusters > merlin7 Shell
+Access**.
+
+![](/images/merlin7-open-ondemand-shell-access.png "Open OnDemand Shell Access")
+
+Then, you will be requested to type your Merlin 7 password, which should be the
+same as your PSI password.
+
+![](/images/merlin7-open-ondemand-shell-password.png "Open OnDemand Shell Password")
+
+!!! warning "No screen being displayed when opening Shell Access"
+    This seems to be an issue with some browsers, for example, Firefox. Try to use a Chromium-Based browser. If the problem persists, contact the [Merlin 7 Admins](/support/introduction/#email-the-admins).
+
+Once you login to Merlin 7, you will see the same shell as connecting via SSH
+from your terminal.
+
+![](/images/merlin7-open-ondemand-shell-session.png "Open OnDemand Shell Session")
+

mkdocs.yml

@@ -118,22 +118,24 @@ nav:
       - merlin7/03-Slurm-General-Documentation/slurm-mail.md
     - Jupyterhub:
       - merlin7/04-Jupyterhub/jupyterhub.md
+    - Open OnDemand:
+      - merlin7/05-Open-OnDemand/open-ondemand.md
     - Software Support:
-      - merlin7/05-Software-Support/pmodules.md
-      - merlin7/05-Software-Support/openmpi.md
-      - merlin7/05-Software-Support/mpich.md
-      - merlin7/05-Software-Support/cray-module.env.md
-      - merlin7/05-Software-Support/ansys.md
-      - merlin7/05-Software-Support/ansys-rsm.md
-      - merlin7/05-Software-Support/cp2k.md
-      - merlin7/05-Software-Support/dirac.md
-      - merlin7/05-Software-Support/gromacs.md
-      - merlin7/05-Software-Support/ippl.md
-      - merlin7/05-Software-Support/lammps.md
-      - merlin7/05-Software-Support/matlab.md
-      - merlin7/05-Software-Support/opal-x.md
-      - merlin7/05-Software-Support/quantum-espresso.md
-      - merlin7/05-Software-Support/spack.md
+      - merlin7/06-Software-Support/pmodules.md
+      - merlin7/06-Software-Support/openmpi.md
+      - merlin7/06-Software-Support/mpich.md
+      - merlin7/06-Software-Support/cray-module.env.md
+      - merlin7/06-Software-Support/ansys.md
+      - merlin7/06-Software-Support/ansys-rsm.md
+      - merlin7/06-Software-Support/cp2k.md
+      - merlin7/06-Software-Support/dirac.md
+      - merlin7/06-Software-Support/gromacs.md
+      - merlin7/06-Software-Support/ippl.md
+      - merlin7/06-Software-Support/lammps.md
+      - merlin7/06-Software-Support/matlab.md
+      - merlin7/06-Software-Support/opal-x.md
+      - merlin7/06-Software-Support/quantum-espresso.md
+      - merlin7/06-Software-Support/spack.md
   - Merlin 6:
     - Quick Start Guide:
       - merlin6/introduction.md