5 Commits

Author SHA1 Message Date
6812bb6bad improve some admonishment titles
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 25s
2026-01-23 15:25:23 +01:00
76c2b407f3 improve merlin_quotas docu
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 22s
2026-01-23 15:22:04 +01:00
b79f937149 Update RSM step2 image
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 21s
2026-01-15 16:43:38 +01:00
7aba2e0851 Merge pull request 'MkDocs migration' (#17) from mkdocs into master
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 21s
Reviewed-on: #17
2026-01-12 17:51:34 +01:00
3d3eb50d10 final changes 2026-01-12 17:51:15 +01:00
4 changed files with 15 additions and 10 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@@ -1,7 +1,8 @@
# Introduction
!!! note
Merlin6 is no longer accessible for new users! Please have a look at [Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead.
!!! failure "Deprecated"
Merlin6 is no longer accessible for new users! Please have a look at
[Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead.
## Slurm clusters
@@ -10,7 +11,8 @@ Comprised the **`merlin6`** CPU cluster and the
cluster (formally called [**`merlin5`**](../merlin5/cluster-introduction.md) is
kept active with best effort support.
From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job submitted from the login node will be submitted to that cluster if not.
From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job
submitted from the login node will be submitted to that cluster if not.
* Users can keep submitting to the old *`merlin5`* computing nodes by using the option ``--cluster=merlin5``.
* Users submitting to the **`gmerlin6`** GPU cluster need to specify the option ``--cluster=gmerlin6``.
@@ -18,6 +20,6 @@ From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job
### Slurm 'merlin6'
**CPU nodes** are configured in a **Slurm** cluster, called **`merlin6`**, and
this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster is
specified (with the `--cluster` option), this will be the cluster to which the jobs
will be sent.
this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster
is specified (with the `--cluster` option), this will be the cluster to which
the jobs will be sent.

View File

@@ -93,7 +93,10 @@ be tracked. In theory any (or all available projects) can be tracked, but due to
UNIX and Lustre permissions, accessing quotas information for a project you're not
a member of **is not possible**.
If you are added/removed from a project, you can update this config file by
calling `merlin_quotas genconf --force` (notice the `--force`, which will overwrite
your existing config file) or by editing the file by hand (*not recommended*).
!!! tip "Updating the project config"
If you are added/removed from a project, you can update this config file by
calling `merlin_quotas genconf --all-projects --force`. The
`--all-projects` will fully check your possible membership to all projects,
and the `--force` will overwrite your existing config file. You can also
edit the file by hand (*not recommended*).

View File

@@ -6,7 +6,7 @@ site_url: https://hpce.pages.psi.ch
repo_name: "User Documentation Repository"
repo_url: https://gitea.psi.ch/hpce/gitea-pages
# TODO unsure if this works, branch needs to be changed from `mkdocs` to `main`
edit_uri: _edit/mkdocs/docs/
edit_uri: _edit/master/docs/
# Copyright
copyright: Copyright © 2025 HPC and Emerging Technologies Group/CSD @ Paul Scherrer Institut