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

This commit is contained in:
2025-08-25 14:58:39 +02:00
parent 40f48e5eaf
commit a1b3941c62
2 changed files with 19 additions and 67 deletions

View File

@@ -28,8 +28,8 @@ Most data transfer methods support both sending and receiving, so you may initia
| ------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
| 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 |
| Large dataset, high speed needed (not sensitive) | FTP via service03.merlin7.psi.ch` | Fastest transfer speed (unencrypted data channel) |
| Large dataset, high speed needed (sensitive data) | FTP via `ftp-encrypted.merlin7.psi.ch` | Encrypted control & data channels for security, but slower than service03` |
| Large dataset, high speed needed (not sensitive) | FTP via `service03.merlin7.psi.ch` | Fastest transfer speed (unencrypted data channel) |
| Large dataset, high speed needed (sensitive data) | FTP via `ftp-encrypted.merlin7.psi.ch` | Encrypted control & data channels for security, but slower than `service03` |
| 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 |
| 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:
* **`login001.merlin7.psi.ch`:** Encrypted control & data channels.
**Use if your data is sensitive**. **Slower**, but secure.
* **service03.merlin7.psi.ch`: Encrypted control channel only.
* **`service03.merlin7.psi.ch`**: Encrypted control channel only.
Use if your data can be transferred unencrypted. **Fastest** method.
{{site.data.alerts.tip}}
@@ -88,7 +88,7 @@ Available in the **Software Kiosk** on PSI Windows machines.
* 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**.
* service03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**.
* `service03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**.
* Drag and drop files between your PC and Merlin.
* FTP (port 21)
@@ -100,7 +100,7 @@ Download from [FileZilla Project](https://filezilla-project.org/), or install fr
* 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**.
* service03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**.
* `service03.merlin7.psi.ch`: **Fastest** transfer rates, but **data channel not encrypted**.
* Supports drag-and-drop file transfers.
## Sharing Files with SWITCHfilesender

View File

@@ -22,81 +22,28 @@ Merlin high performance storage and we have made it available from Pmodules.
### Loading Merlin7 ANSYS
For loading the Merlin7 ANSYS software, one needs to run Pmodules v1.1.22 or newer, and then use a specific repository
(called **`merlin`**) which is **only available from the Merlin7 cluster**:
```bash
module purge
module load Pmodules/1.1.22
module use merlin
module use unstable
module use /etc/cscs-modules/
module load cray
module use unstable # Optional
module search ANSYS
# Load the proper ANSYS version, in example for 2022R2
module load ANSYS/2022R2
module load ANSYS/2025R2
```
Once `merlin` is invoked, it will disable central ANSYS installations with the same version, which will be replaced
by the local ones in Merlin. Releases from the central Pmodules repository which have not a local installation will remain
visible. For each ANSYS release, one can identify where it is installed by searching ANSYS in PModules with the `--verbose`
option. This will show the location of the different ANSYS releases as follows:
* For ANSYS releases installed in the central repositories, the path starts with `/opt/psi`
* For ANSYS releases installed in the Merlin7 repository (and/or overwritting the central ones), the path starts with `/data/software/pmodules`
**We strongly recommend only using ANSYS/2022R2 or superior**.
**We strongly recommend only using ANSYS/2024R2 or superior**.
<details>
<summary>[Example] Loading ANSYS from the Merlin7 PModules repository</summary>
<pre class="terminal code highlight js-syntax-highlight plaintext" lang="plaintext" markdown="false">
🔥 [caubet_m@login001:~]# module purge
🔥 [caubet_m@login001:~]# module load Pmodules/1.1.22
module load: unstable module has been loaded -- Pmodules/1.1.22
🔥 [caubet_m@login001:~]# module use merlin
🔥 [caubet_m@login001:~]# module use unstable
🔥 [caubet_m@login001:~]# module use /etc/cscs-modules/
🔥 [caubet_m@login001:~]# module load cray
Activating Modules:
1) cce/17.0.0
🔥 [caubet_m@login001:~]# module load ANSYS/2022R2
module load: unstable module has been loaded -- ANSYS/2022R2
🔥 [caubet_m@login001:~]# module search ANSYS --verbose
ANSYS/2019R3:
release stage: stable
group: Tools
overlay: base
modulefile: /opt/psi/Tools/modulefiles/ANSYS/2019R3
dependencies: (none)
ANSYS/2020R1:
release stage: stable
group: Tools
overlay: base
modulefile: /opt/psi/Tools/modulefiles/ANSYS/2020R1
dependencies: (none)
ANSYS/2020R1-1:
release stage: stable
group: Tools
overlay: base
modulefile: /opt/psi/Tools/modulefiles/ANSYS/2020R1-1
dependencies: (none)
ANSYS/2020R2:
release stage: unstable
group: Tools
overlay: base
modulefile: /opt/psi/Tools/modulefiles/ANSYS/2020R2
dependencies: (none)
ANSYS/2021R1:
release stage: unstable
group: Tools
overlay: base
modulefile: /opt/psi/Tools/modulefiles/ANSYS/2021R1
dependencies: (none)
🔥 [caubet_m@login002:~]# module search ANSYS --verbose
ANSYS/2022R2:
release stage: unstable
release stage: stable
group: Tools
overlay: merlin
modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2022R2
@@ -107,18 +54,23 @@ ANSYS/2023R2:
overlay: merlin
modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2023R2
dependencies: (none)
ANSYS/2024R1:
ANSYS/2024R2:
release stage: stable
group: Tools
overlay: merlin
modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2024R2
dependencies: (none)
ANSYS/2025R2:
release stage: unstable
group: Tools
overlay: merlin
modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2024R1
modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2025R2
dependencies: (none)
</pre>
</details>
{{site.data.alerts.tip}} Please <b>only use Merlin7 ANSYS installations from `merlin`</b> in the Merlin cluster.
Also, please always run <b>ANSYS/2022R2 or superior</b>.
{{site.data.alerts.tip}}Please always run <b>ANSYS/2024R2 or superior</b>.
{{site.data.alerts.end}}
## ANSYS Documentation by product