Changeset 2203 for BOL

Timestamp:

Feb 12, 2015, 10:51:36 AM (10 years ago)

Author:

Ehouarn Millour

Message:

Fixes for pgf90. Removed installing C++ netcdf (not needed and causes issues with pgCC). Note that gcm still doesn't work with pgf90 because of erf/derf issues.
EM

File:

• BOL/script_install/install.sh (modified) (11 diffs)

BOL/script_install/install.sh

@@ -47 +47 @@
 # install.v2.sh instead of install.sh
 
-version=20130716.trunk
+version=trunk
+version=20141127.trunk
 version=testing
+
 compilo=gfortran # compilo=pgf90 or g95 or gfortran or ifort sur PC linux
 
@@ -73 +75 @@
 ## compile_with_fcm=1 : use makelmdz_fcm, possible a of version 20111103.trunk (LMDZ5/trunk rev 1578)
 ## compile_with_fcm=0 : use makelmdz
-compile_with_fcm=0
-arch=local
-
-sequential=1
+compile_with_fcm=1
 
 
@@ -137 +136 @@
    OPTDEV="-Wall -fbounds-check"
    fmod='I '
-#   OPTPREC="-ffree-line-length-0"
-#   if [ $real = r8 ] ; then OPTPREC="$OPTPREC -fdefault-real-8 -DNC_DOUBLE" ; fi
-   if [ $real = r8 ] ; then OPTPREC=" -fdefault-real-8 -DNC_DOUBLE" ; fi
+   if [ $real = r8 ] ; then OPTPREC="-fdefault-real-8 -DNC_DOUBLE" ; fi
    export F90FLAGS=" -ffree-form $OPTIMNC"
    export FFLAGS=" $OPTIMNC"
@@ -156 +153 @@
    export CXX=g++
 elif [ $compilo = pgf90 ] ; then
-   OPTIM='-O2 -Munroll -Mnoframe -Mautoinline -Mcache_align'
+   OPTIM='-O2 -Mipa -Munroll -Mnoframe -Mautoinline -Mcache_align'
+   OPTDEB='-g -Mdclchk -Mbounds -Mchkfpstk -Mchkptr -Minform=inform -Mstandard -Ktrap=fp -traceback'
+   OPTDEV='-g -Mbounds -Ktrap=fp -traceback'
    fmod='module '
    if [ $real = r8 ] ; then OPTPREC="-r8 -DNC_DOUBLE" ; fi
-   export CPPFLAGS="-DNDEBUG -DpgiFortran"
+   export CPPFLAGS="-DpgiFortran"
    export CC=pgcc
-   export CFLAGS="-Msignextend"
+   export CFLAGS="-O2 -Msignextend"
    export CXX=pgCC
-   export CXXFLAGS="-Msignextend"
-   export FFLAGS="$OPTIMNC"
-   export F90FLAGS="$OPTIMNC"
+   export CXXFLAGS="-O2 -Msignextend"
+   export FFLAGS="-O2 $OPTIMNC"
+   export F90FLAGS="-O2 $OPTIMNC"
    compile_with_fcm=1
 elif [ $compilo = ifort ] ; then
@@ -292 +291 @@
 sed -e 's/gfortran/'$gfortran'/g' configure >| tmp ; mv -f tmp configure ; chmod +x configure
 localdir=`pwd -P`
-./configure --prefix=$localdir
+./configure --prefix=$localdir --disable-cxx
 sed -e 's/gfortran/'$gfortran'/g' Makefile >| tmp ; mv -f tmp Makefile
 make check
@@ -321 +320 @@
   cp AA_make.gdef AA_make.orig
   F_C="$compilo -c " ; if [ "$compilo" = "$gfortran" -o "$compilo" = "mpif90" ] ; then F_C="$compilo -c -cpp " ; fi
+  if [ "$compilo" = "pgf90" ] ; then F_C="$compilo -c -Mpreprocess" ; fi
   sed -e 's/^\#.*.g95.*.\#.*.$/\#/' AA_make.gdef > tmp
-  sed -e "s:F_L = g95:F_L = $compilo:" -e "s:F_C = g95 -c:F_C = $F_C": \
+  sed -e "s:F_L = g95:F_L = $compilo:" -e "s:F_C = g95 -c -cpp:F_C = $F_C": \
   -e 's/g95.*.w_w.*.(F_D)/g95      w_w = '"$OPTIMGCM"'/' \
   -e 's:g95.*.NCDF_INC.*.$:g95      NCDF_INC= '"$ncdfdir"'/include:' \
@@ -421 +421 @@
   echo '########################################################'
   cd $MODEL/modipsl/modeles/ORCHIDEE
-  export ORCHPATH=`pwd`
-  orchidee_rev=`svn info | grep '^Revision' | awk '{print $2}'`
-  if [ -z $orchidee_rev ] ; then
-    svn info 2 >| err 
-    grep 'svn upgrade' err > /dev/null
-    if [ $? -eq 0 ] ; then
-      svn upgrade
-      orchidee_rev=`svn info | grep '^Revision' | awk '{print $2}'`
-    else
-      echo "Impossible de determiner la version d'ORCHIDEE"
-      echo "Continuer (o/y/n) ?"
-      read reponse
-      if [ $reponse != 'o' ] && [ $reponse != 'y' ] ; then
-        exit
-      fi
-    fi
-  fi    
-  echo '########################################################'
-  echo 'Orchidee revision: ', $orchidee_rev
-  echo '########################################################'
   echo OKpwd ; pwd
-  if [ $orchidee_rev -ge 2247 ] ; then
+  if [ -d src_parallel ] ; then
+     liste_src="parallel parameters global stomate sechiba driver"
      veget_version=orchidee2.0
-       cd arch 
-      sed -e s:"%COMPILER        .*.$":"%COMPILER            $compilo":1 \
-     -e s:"%LINK            .*.$":"%LINK                $compilo":1 \
-     -e s:"%PROD_FFLAGS     .*.$":"%PROD_FFLAGS         $OPTIM":1 \
-     -e s:"%DEV_FFLAGS      .*.$":"%DEV_FFLAGS          $OPTDEV":1 \
-     -e s:"%DEBUG_FFLAGS    .*.$":"%DEBUG_FFLAGS        $OPTDEB":1 \
-     -e s:"%BASE_FFLAGS     .*.$":"%BASE_FFLAGS         $OPTPREC":1 \
-     arch-gfortran.fcm > arch-local.fcm
-     echo "NETCDF_LIBDIR=\"-L${ncdfdir}/lib -lnetcdf\"" > arch-local.path
-     echo "NETCDF_INCDIR=${ncdfdir}/include" >> arch-local.path
-     echo "IOIPSL_INCDIR=$ORCHPATH/../../lib" >> arch-local.path
-     echo "IOIPSL_LIBDIR=$ORCHPATH/../../lib" >> arch-local.path
-     cd ../ 
-# compiling ORCHIDEE sequential mode
-     ./makeorchidee_fcm -noxios -prod -parallel none -arch local
   else
-     if [ -d src_parallel ] ; then
-       liste_src="parallel parameters global stomate sechiba driver"
-       veget_version=orchidee2.0
-     else
-       # Obsolete, for ORCHIDEE_beton only
-       liste_src="parameters stomate sechiba "
-       # A trick to compile ORCHIDEE depending on if we are using real*4 or real*8
-       cd src_parameters ; \cp reqdprec.$real reqdprec.f90 ; cd ..
-       veget_version=orchidee1.9
-     fi
-     for d in $liste_src ; do src_d=src_$d
-        echo src_d $src_d
-        echo ls ; ls
-        if [ ! -d $src_d ] ; then echo Problem orchidee : no $src_d ; exit ; fi
-        cd $src_d ; \rm -f *.mod make ; make clean
-        make ; if [ "$compilo" = "$gfortran" -o "$compilo" = "mpif90" ] ; then cp -f *.mod ../../../lib ; fi
-        cd ..
-     done
+     # Obsolete, for ORCHIDEE_beton only
+     liste_src="parameters stomate sechiba "
+     # A trick to compile ORCHIDEE depending on if we are using real*4 or real*8
+     cd src_parameters ; \cp reqdprec.$real reqdprec.f90 ; cd ..
+     veget_version=orchidee1.9
   fi
+  echo liste_strc $liste_src
+
+  for d in $liste_src ; do src_d=src_$d
+      echo src_d $src_d
+      echo ls ; ls
+      if [ ! -d $src_d ] ; then echo Problem orchidee : no $src_d ; exit ; fi
+      cd $src_d ; \rm -f *.mod make ; make clean
+      make ; if [ "$compilo" = "$gfortran" -o "$compilo" = "mpif90" ] ; then cp -f *.mod ../../../lib ; fi
+      cd ..
+  done
   echo install.sh orchidee_OK `date`
 fi # of if [ "$veget" = 1 ]
@@ -506 +469 @@
 # arch-local.path file
 echo "NETCDF_LIBDIR=\"-L${ncdfdir}/lib -lnetcdf\"" > arch-local.path
-echo OK3
 echo "NETCDF_INCDIR=-I${ncdfdir}/include" >> arch-local.path
 echo 'IOIPSL_INCDIR=$LMDGCM/../../lib' >> arch-local.path
@@ -521 +483 @@
     -e s:"%DEBUG_FFLAGS    .*.$":"%DEBUG_FFLAGS        $OPTDEB":1 \
     -e s:"%BASE_FFLAGS     .*.$":"%BASE_FFLAGS         $OPTPREC":1 \
+    -e s:"%FPP_DEF         .*.$":"%FPP_DEF             $FPP_DEF":1 \
     arch-linux-32bit.fcm > arch-local.fcm
 
@@ -537 +500 @@
 ##################################################################
 echo install.sh avant_compilation `date`
-if [ $compile_with_fcm = 1 ] ; then makelmdz="makelmdz_fcm -arch $arch" ; else makelmdz=makelmdz ; fi
-
-if [ "$sequential" = 1 ] ; then
+if [ $compile_with_fcm = 1 ] ; then makelmdz="makelmdz_fcm -arch local" ; else makelmdz=makelmdz ; fi
+
 ./$makelmdz -d ${grid_resolution} -v $veget_version gcm
 echo install.sh apres_compilation `date`
@@ -601 +563 @@
 echo '##########################################################'
 
-fi # fin sequential
-
 if [ "$gfortran" = "gfortran44" ] ; then
     echo Your gfortran compiler was too old so that the model was automatically