Add transfer-data and nomachine pages

_data/sidebars/merlin6_sidebar.yml

@@ -27,6 +27,10 @@ entries:
       url: /merlin6/data-directories.html
     - title: Accessing Slurm Cluster
       url: /merlin6/slurm-access.html
+    - title: Transferring Data
+      url: /merlin6/transfer-data.html
+    - title: NoMachine
+      url: /merlin6/nomachine.html
   - title: Merlin6 Slurm
     folderitems:
     - title: Using PModules

pages/merlin6/accessing-merlin6/nomachine.md

@@ -0,0 +1,35 @@
+---
+title: NoMachine
+#tags:
+#keywords:
+last_updated: 9 July 2019
+#summary: ""
+sidebar: merlin6_sidebar
+permalink: /merlin6/nomachine.html
+---
+
+NoMachine is a desktop virtualization tool. It is similar to VNC, Remote
+Desktop, etc. It uses the NX protocol to enable a graphical login to remote
+servers.
+
+## Installation
+
+NoMachine is available for PSI Windows computers in the Software Kios under the
+name **NX Client**. Please use the latest version (at least 6.0). For MacOS and
+Linux, the NoMachine client can be downloaded from https://www.nomachine.com/.
+
+## Connecting to Merlin
+
+Currently the recommended way of connecting to Merlin5 is through
+`merlin-nx-01.psi.ch`. This can be added in NoMachine as a new connection. It is
+also available through `remacc.psi.ch`, a NoMachine 'jump point' provided by
+Photon Science for access from outside PSI.
+
+The `merlin-nx-01` machine does not directly access Merlin itself. However it
+provides a fully configured Linux environment from which merlin can be accessed
+with `ssh` commands.
+
+It is planned to run NoMachine directly on the Merlin6 login node in the future.
+This will enable data to be more easily transferred from Merlin6 through
+NoMachine.
+

pages/merlin6/accessing-merlin6/transfer-data.md

@@ -0,0 +1,47 @@
+---
+title: Transferring Data
+#tags:
+#keywords:
+last_updated: 9 July 2019
+#summary: ""
+sidebar: merlin6_sidebar
+permalink: /merlin6/transfer-data.html
+---
+
+## Transferring Data from the PSI Network to/from Merlin6
+
+### Rsync
+
+Rsync is the preferred method to transfer data from Linux/MacOS. It allows
+transfers to be easily resumed if they get interrupted. The general syntax is:
+
+```
+rsync -avAHXS <src> <dst>
+```
+
+For example, to transfer files from your local computer to a merlin project
+directory:
+
+```
+rsync -avAHXS ~/localdata user@merlin-l-01.psi.ch:/data/project/general/myproject/
+```
+
+You can resume interrupted transfers by simply rerunning the command. Previously
+transferred files will be skipped.
+
+
+### WinSCP
+
+The WinSCP tool can be used for remote file transfer on Windows. It is available
+from the Software Kiosk on PSI machines. Add `merlin-l-01.psi.ch` as a host and
+connect with your PSI credentials. You can then drag-and-drop files between your
+local computer and merlin.
+
+
+## Transferring Data to/from outside PSI
+
+Merlin6 is only accessible from within the PSI network. To connect from outside you can use
+
+- [VPN](https://www.psi.ch/en/computing/vpn) ([alternate instructions](https://intranet.psi.ch/BIO/ComputingVPN))
+- [SSH hop](https://www.psi.ch/en/computing/ssh-hop)
+- [No Machine](nomachine.md)