Index: trunk/setup.sh
===================================================================
--- trunk/setup.sh	(revision 615)
+++ trunk/setup.sh	(revision 616)
@@ -151,17 +151,23 @@
     ;;
     "beleno") cat > env.sh <<eod
-# this config uses software R and pdfjam installed by villefranquen
-# relevant paths are added to PATH and LD_LIBRARY_PATH
+# Using intel compiler for belenos
+# Just miss pdfjam
 set +u  # <module load> can trigger -u
 # module purge tries to unalias condam but the alias does not exist so it raises an error
 # so I create a false condam alias so that it can be unaliased...
 alias condam="ls"
-module purge
-module load gcc/14.1.0
-module load openmpi/gnu/4.1.2.1
-module load python/3.10.12 
-export PATH=/opt/softs/libraries/GCC_5.3.0/cdo-1.7.0/bin/:\$PATH
-export LD_LIBRARY_PATH=/opt/softs/gcc/14.1.0/lib64/:/opt/softs/anaconda3/envs/Python310/lib:\$LD_LIBRARY_PATH
-export MPLBACKEND='Agg'  # non-interactive plots
+module ()
+{
+    eval \`/usr/bin/modulecmd bash \$*\`
+}
+module purge > /dev/null 2>&1
+module load intel > /dev/null 2>&1
+module load nco > /dev/null 2>&1
+module load eccodes > /dev/null 2>&1
+module load cdo > /dev/null 2>&1
+module load python/3.7.6 > /dev/null 2>&1
+module load R/3.6.1 > /dev/null 2>&1
+export PATH="/opt/softs/anaconda3/bin:\$PATH"
+export LD_LIBRARY_PATH=/opt/softs/anaconda3/lib/:\$LD_LIBRARY_PATH
 export TAR=/usr/bin/tar  # for R package install
 eod
@@ -238,5 +244,7 @@
   # Testing availability of various programs
   #-----------------------------------------------------------------------
-  for exe in R Rscript cdo ncks $python pdfjam ; do
+  if [[ ${hostname:0:6} = "beleno" ]] ; then listprog="R Rscript cdo ncks $python" ; else listprog="R Rscript cdo ncks $python" pdfjam ;fi
+  #for exe in R Rscript cdo ncks $python pdfjam ; do
+  for exe in $listprog ; do
       if [[ $(which "$exe") = "" ]] ; then echo "STOP: Can't find program <$exe>" ; exit 1 ; fi
   done
@@ -316,5 +324,5 @@
       if [[ $ExeterUQ = "ExeterUQ_MOGP" ]]; then
         # Install additional required packages 
-        pip install patsy matplotlib netcdf4 "pandas==2.3.1" seaborn
+        pip install patsy matplotlib netcdf4 pandas seaborn
         # Try pypi, otherwise git commit
         if ! pip install "mogp-emulator==$mogp_commit"; then
@@ -353,5 +361,5 @@
           #                This is particularly a pain when we want to support machines with different versions of R installed.
           #                The list and order of packages below is an attempt to circumvent that, but I hope we can find a cleaner way in the future....
-          if ! eval "$htune_dir/src/CheckInstallPackages.sh" Rcpp lattice Matrix reticulate invgamma GenSA far dotCall64 spam fields lhs maps mco ncdf4 shape tensor withr loo MASS pracma mvtnorm flexclust tmvtnorm tictoc ars HI coda MfUSampler ; then
+          if ! eval "$htune_dir/src/CheckInstallPackages.sh" Rcpp lattice reticulate Matrix invgamma GenSA far dotCall64 spam fields lhs maps mco ncdf4 shape tensor withr loo MASS pracma mvtnorm flexclust tmvtnorm tictoc ars HI coda MfUSampler ; then
             echo "STOP: Problem encountered when installing R packages"; exit 1
           fi