Merge MPCDF branches

.alias

@@ -10,6 +10,9 @@ alias colordiff='git diff --no-index'
 alias afs-auth='kinit smay@MPA-GARCHING.MPG.DE && aklog mpa-garching.mpg.de'
 
 # SLURM aliases
-alias sq='squeue -o "%.8Q %.8i %16j %7u %2t %.16V %.16S %.8M %.3D         %R" -S "-t,-Q,i"'
+alias      sq='squeue -o "%.8Q %.8i %16j %7u %2t %.16V %.16S %.8M %.3D         %R" -S "-t,-Q,i"'
+alias sq-long='squeue -o "%.8Q %.5i %63j %7u %2t %.16V %.16S %.8M %.3D         %R" -S "-t,-Q,i"'
 alias sq-own='squeue -u "$USER" -o "%.8Q %.8i %25j %2t %.16S %.3D %5P %R" -S "P,-t,i"'
-alias srun-interactive='srun --immediate --nodes=1 --pty --time=00:30:00 --partition express'
+alias srun-ifreya='srun --immediate --nodes=1 --pty --time=01:00:00'
+alias srun-idraco='srun --immediate --nodes=1 --pty --time=00:30:00 --partition express'
+alias srun-icobra='srun-idraco'