Changeset 3785

Timestamp:

Nov 17, 2020, 12:09:25 PM (4 years ago)

Author:

Ehouarn Millour

Message:

Update du script install_lmdz.sh pour plus proprement faire la recherche de la librairie MPI.
EM

File:

• BOL/script_install/install_lmdz.sh (modified) (2 diffs)

BOL/script_install/install_lmdz.sh

@@ -271 +271 @@
             o_ins_make="-t g95" ;;
             
-   *)       if [ $parallel = none -o -f /usr/bin/mpif90 ] ; then
+   *)       if [ $parallel = none -o ] ; then
                 path_mpi=`which mpif90 | sed -e s:/mpif90::` ;
                 if [ -d /usr/lib64/openmpi ] ; then
@@ -278 +278 @@
                   root_mpi="/usr"
                 fi
-            # For Scientifique Linux with gfortran at LMD :
-            elif [ -f /usr/lib64/openmpi/1.4.5-gfortran/bin/mpif90 -a $compiler = "gfortran" ] ; then
-                path_mpi=/usr/lib64/openmpi/1.4.5-gfortran/bin ;
-                root_mpi=/usr/lib64/openmpi/1.4.5-gfortran ;
-                export LD_LIBRARY_PATH=${root_mpi}/lib:$LD_LIBRARY_PATH
-            # For Scientifique Linux with ifort at LMD :
-            elif [ -f /usr/lib64/openmpi/1.4.5-ifort/bin/mpif90 -a $compiler = "ifort" ] ; then
-                path_mpi=/usr/lib64/openmpi/1.4.5-ifort/bin ;
-                root_mpi=/usr/lib64/openmpi/1.4.5-ifort ;
-                export LD_LIBRARY_PATH=${root_mpi}/lib:$LD_LIBRARY_PATH
-            # For Scientifique Linux with pgf90 at LMD :
-            elif [ -f /usr/lib64/openmpi/1.4.5-ifort/bin/mpif90 -a $compiler = "pgf90" ] ; then
-                path_mpi=/usr/lib64/openmpi/1.4.5-pgf/bin ;
-                root_mpi=/usr/lib64/openmpi/1.4.5-pgf ;
-                export LD_LIBRARY_PATH=${root_mpi}/lib:$LD_LIBRARY_PATH
+                # Ehouarn: but why do we need path_mpi and root_mpi 
+                # if not in parallel ?
             else
-               echo "Cannot find mpif90" ;
-               if [ $parallel = none ] ; then exit ; fi ;
+               path_mpi=`which mpif90 | sed -e s:/mpif90::` ;
+               root_mpi=`which mpif90 | sed -e s:/bin/mpif90::` ;
+               if [ ! -x ${path_mpi}/mpif90 ] ; then 
+                 echo "Error: cannot find mpif90" ;
+                 exit ;
+               fi ;
+               export LD_LIBRARY_PATH=${root_mpi}/lib:$LD_LIBRARY_PATH
             fi ;
             par_comp=${path_mpi}/mpif90 ;