Changeset 3417 for BOL

Timestamp:

Dec 5, 2018, 2:55:12 AM (6 years ago)

Author:

fhourdin

Message:

Minor update of install_lmdz.sh to better handle checking of cosp and xios combination.
EM

File:

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

BOL/script_install/install_lmdz.sh

@@ -332 +332 @@
 
 ## if also compiling XIOS, cosp must be activate to define axis in *.xml
-if [ "$with_xios" = "y" -a "$cosp" != "1" ] ; then
+if [ "$with_xios" = "y" ] ; then
+  if [ ! "$cosp" = 1 -o "$cosp2" = 1 ] ; then
    echo "Error, you must use -cosp option when compiling with -xios"
    echo "You need to call Cosp in physical first step to define axis variables"
    exit
-fi
-if [ "$with_xios" = "y" -a "$cosp2" != "1" ] ; then
-   echo "Error, you must use -cosp2 option when compiling with -xios"
-   echo "You need to call Cosp in physical first step to define axis variables"
-   exit
-fi
-
-if [ "$with_xios" = "y" ] ; then
+  fi
   opt_makelmdz_xios="-io xios"
 fi
@@ -747 +741 @@
      ./makeorchidee_fcm -j 8 -noxios -prod -parallel none -arch $arch > $orchideelog 2>&1
      echo ./makeorchidee_fcm -j 8 -noxios -prod -parallel none -arch $arch
-     echo Fin de la premiere compilation orchidee ; pwd
+     echo End of the first compilation of orchidee ; pwd
   else
      if [ -d src_parallel ] ; then
@@ -934 +928 @@
 fi # of if [ $parallel != "none" ]
 
-echo LLLLLLLLLLLLLLLLLLLLLLLLLLL
+#echo LLLLLLLLLLLLLLLLLLLLLLLLLLL
 if [ "$gfortran" = "gfortran44" ] ; then
     echo Your gfortran compiler was too old so that the model was automatically
@@ -976 +970 @@
 \rm -rf BENCH${grid_resolution}
 bench=bench_lmdz_${grid_resolution}
-echo install.sh avant_chargement_bench  `date`
+echo install.sh before bench download  `date`
 #wget http://www.lmd.jussieu.fr/~lmdz/Distrib/$bench.tar.gz
 myget 3DBenchs/$bench.tar.gz