Update docs
All checks were successful
Build and Deploy Documentation / build-and-deploy (push) Successful in 6s

This commit is contained in:
2025-08-25 12:42:36 +02:00
parent f7708fa1b9
commit e4a425e095
2 changed files with 26 additions and 20 deletions

View File

@@ -25,11 +25,11 @@ Most data transfer methods support both sending and receiving, so you may initia
### Choosing the best transfer method ### Choosing the best transfer method
| **Scenario** | **Recommended Method** | **Reason** | | **Scenario** | **Recommended Method** | **Reason** |
| ------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | | ------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
| Small dataset, Linux/macOS | `rsync` | Resume support, skips existing files, works over SSH | | Small dataset, Linux/macOS | `rsync` | Resume support, skips existing files, works over SSH |
| Quick one-time small transfer | `scp` | Simple syntax, no need to install extra tools | | Quick one-time small transfer | `scp` | Simple syntax, no need to install extra tools |
| Large dataset, high speed needed (not sensitive) | FTP via `login002` | Fastest transfer speed (unencrypted data channel) | | Large dataset, high speed needed (not sensitive) | FTP via `ftp-unencrypted03.merlin7.psi.ch` | Fastest transfer speed (unencrypted data channel) |
| Large dataset, high speed needed (sensitive data) | FTP via `login001` | Encrypted control & data channels for security, but slower than `login002` | | Large dataset, high speed needed (sensitive data) | FTP via `ftp-encrypted.merlin7.psi.ch` | Encrypted control & data channels for security, but slower than `ftp-unencrypted03` |
| Windows interactive GUI transfer | WinSCP | User-friendly interface, PSI Software Kiosk, supports drag-and-drop | | Windows interactive GUI transfer | WinSCP | User-friendly interface, PSI Software Kiosk, supports drag-and-drop |
| Cross-platform interactive GUI transfer | FileZilla | User-friendly interface, works on Linux/macOS/Windows, supports drag-and-drop | | Cross-platform interactive GUI transfer | FileZilla | User-friendly interface, works on Linux/macOS/Windows, supports drag-and-drop |
| From the internet to PSI | [PSI Data Transfer Service](https://www.psi.ch/en/photon-science-data-services/data-transfer) | Supports SSH-based protocols and Globus | | From the internet to PSI | [PSI Data Transfer Service](https://www.psi.ch/en/photon-science-data-services/data-transfer) | Supports SSH-based protocols and Globus |
@@ -73,7 +73,7 @@ scp ~/localfile.txt $USER@login001.merlin7.psi.ch:/data/project/general/myprojec
A `vsftpd` service is available on the login nodes, providing high-speed transfers. Choose the server based on your **speed vs. encryption** needs: A `vsftpd` service is available on the login nodes, providing high-speed transfers. Choose the server based on your **speed vs. encryption** needs:
* **`login001.merlin7.psi.ch`:** Encrypted control & data channels. * **`login001.merlin7.psi.ch`:** Encrypted control & data channels.
**Use if your data is sensitive**. **Slower**, but secure. **Use if your data is sensitive**. **Slower**, but secure.
* **`login002.merlin7.psi.ch`:** Encrypted control channel only. * **`ftp-unencrypted03.merlin7.psi.ch`: Encrypted control channel only.
Use if your data can be transferred unencrypted. **Fastest** method. Use if your data can be transferred unencrypted. **Fastest** method.
{{site.data.alerts.tip}} {{site.data.alerts.tip}}
@@ -84,19 +84,25 @@ The <b>control channel</b> is always <b>encrypted</b>, therefore, authentication
### WinSCP (Windows) ### WinSCP (Windows)
Available in the **Software Kiosk** on PSI Windows machines. Available in the **Software Kiosk** on PSI Windows machines.
* Connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch` using your PSI credentials. * Using your PSI credentials, connect to
* when using port 22, connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch`.
* when using port 21, connect to:
* `ftp-encrypted.merlin7.psi.ch`: **Fast** transfer rates. **Both** control and data **channels encrypted**.
* `ftp-unencrypted03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**.
* Drag and drop files between your PC and Merlin. * Drag and drop files between your PC and Merlin.
**Supported protocols:** SSH (port 22), FTP (port 21) * FTP (port 21)
### FileZilla (Linux/MacOS/Windows) ### FileZilla (Linux/MacOS/Windows)
Download from [FileZilla Project](https://filezilla-project.org/), or install from your Linux software repositories if available. Download from [FileZilla Project](https://filezilla-project.org/), or install from your Linux software repositories if available.
* Connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch` using your PSI credentials. * Using your PSI credentials, connect to
* when using port 22, connect to `login001.merlin7.psi.ch` or `login002.merlin7.psi.ch`.
* when using port 21, connect to:
* `ftp-encrypted.merlin7.psi.ch`: **Fast** transfer rates. **Both** control and data **channels encrypted**.
* `ftp-unencrypted03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**.
* Supports drag-and-drop file transfers. * Supports drag-and-drop file transfers.
**Supported protocols:** SSH (port 22), FTP (port 21)
## Sharing Files with SWITCHfilesender ## Sharing Files with SWITCHfilesender
**[SWITCHfilesender](https://filesender.switch.ch/filesender2/?s=upload)** is a Swiss-hosted installation of the [FileSender](https://filesender.org/) project — a web-based application that allows authenticated users to securely and easily send **arbitrarily large files** to other users. Features: **[SWITCHfilesender](https://filesender.switch.ch/filesender2/?s=upload)** is a Swiss-hosted installation of the [FileSender](https://filesender.org/) project — a web-based application that allows authenticated users to securely and easily send **arbitrarily large files** to other users. Features:

View File

@@ -19,7 +19,7 @@ permalink: /merlin7/ansys-rsm.html
A RSM service is running on a dedicated Virtual Machine server. This service will listen a specific port and will process any request using RSM (in example, from ANSYS users workstations). A RSM service is running on a dedicated Virtual Machine server. This service will listen a specific port and will process any request using RSM (in example, from ANSYS users workstations).
The following nodes are configured with such services: The following nodes are configured with such services:
* `merlin7-ansys-rsm.psi.ch` * `service03.merlin7.psi.ch`
The earliest version supported in the Merlin7 cluster is ANSYS/2022R2. Older versions are not supported due to existing bugs or missing functionalities. In case you strongly need to run an older version, please do not hesitate to contact the Merlin admins. The earliest version supported in the Merlin7 cluster is ANSYS/2022R2. Older versions are not supported due to existing bugs or missing functionalities. In case you strongly need to run an older version, please do not hesitate to contact the Merlin admins.
@@ -35,7 +35,7 @@ The different steps and settings required to make it work are that following:
![HPC Resource]({{"/images/ANSYS/merlin7/rsm-2-add_cluster.png"}}) ![HPC Resource]({{"/images/ANSYS/merlin7/rsm-2-add_cluster.png"}})
* **"Name"**: Add here the preffered name for the cluster. For example: `Merlin7 cluster` * **"Name"**: Add here the preffered name for the cluster. For example: `Merlin7 cluster`
* **"HPC Type"**: Select `SLURM` * **"HPC Type"**: Select `SLURM`
* **"Submit host"**: `merlin7-rsm01.psi.ch` * **"Submit host"**: `service03.merlin7.psi.ch`
* **"Slurm Job submission arguments (optional)"**: Add any required Slurm options for running your jobs. * **"Slurm Job submission arguments (optional)"**: Add any required Slurm options for running your jobs.
* `--hint=nomultithread` must be present. * `--hint=nomultithread` must be present.
* `--exclusive` must also be present for now, due to a bug in the `Slingshot` interconnect which does not allow running shared nodes. * `--exclusive` must also be present for now, due to a bug in the `Slingshot` interconnect which does not allow running shared nodes.