Changeset 4043 for BOL

Timestamp:

Dec 2, 2021, 10:29:46 AM (3 years ago)

Author:

Ehouarn Millour

Message:

Update install_lmdz.sh to also work on LMD local machines.
EM

File:

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

BOL/script_install/install_lmdz.sh

@@ -64 +64 @@
 svn=""
 #version=trunk
-version=20210730.trunk
+version=20211102.trunk
 getlmdzor=1
 netcdf=1   #  1 for automatic installation
@@ -316 +316 @@
                   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
             else
                echo "Cannot find mpif90" ;
                if [ $parallel = none ] ; then exit ; fi ;
             fi ;
+            if [ $parallel != none ] ; then
+              root_mpi=$(which mpif90 | sed -e s:/bin/mpif90::)
+              path_mpi=$(which mpif90 | sed -e s:/mpif90::)
+              export LD_LIBRARY_PATH=${root_mpi}/lib:$LD_LIBRARY_PATH
+            fi
             par_comp=${path_mpi}/mpif90 ;
             mpirun=${path_mpi}/mpirun ;
@@ -423 +413 @@
 if [ "$compiler" = "$gfortran" ] ; then
    OPTIM='-O3'
-   OPTDEB="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all -fbacktrace -finit-real=nan"
+   OPTDEB="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all -fbacktrace -finit-real=snan"
    OPTDEV="-Wall -fbounds-check"
    fmod='I '
@@ -1279 +1269 @@
 ./run.sh -rad $rad
 fi
-set -vx
+#set -vx
 
 #################################################################
@@ -1285 +1275 @@
 #################################################################
 cd $MODEL/modipsl/modeles
-echo surface_env file created in $MODEL
+#echo surface_env file created in $MODEL
 echo 'veget='$veget > surface_env
 #opt_veget="-v $veget_version"