Fix module-exists.sh, update Intel modules

modules/intel.sh

@@ -3,15 +3,10 @@
 . ~/modules/module-exists.sh
 
 module purge
-if module_exists intel/21.2.0; then
-	# Raven
-	module load intel/21.2.0
-	module load impi/2021.2
-else
-	# Freya, Cobra
-	module load intel/19.1.3
-	module load impi/2019.9
-fi
+
+module load intel/21.7.1
+module load impi/2021.7
+
 . ~/modules/common.sh
 
 # if running interactively: set MPI variables; else stop

modules/module-exists.sh

 #!/bin/sh
 
 module_exists() {
-    avail=$(module avail "$1" 2>&1)
-    [ -n "$avail" ]
+    module avail "$1" 2>&1 | grep -q "$1"
 }