Index: LMDZ5/trunk/makegcm
===================================================================
--- LMDZ5/trunk/makegcm	(revision 1789)
+++ LMDZ5/trunk/makegcm	(revision 1839)
@@ -23,21 +23,21 @@
 set OPTIMI='-C debug -eC '
 set OPTIMI=' -ftrace '
-set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
-set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
+set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
 set io=ioipsl
 set cosp=false
 
-set FC_LINUX=g95
-set FC_LINUX=g95
-#set FC_LINUX=g95
-if ( $FC_LINUX == g95 ) then
-  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+set FC_LINUX=gfortran
+set FC_LINUX=gfortran
+#set FC_LINUX=gfortran
+if ( $FC_LINUX == gfortran ) then
+  set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
 else if ( $FC_LINUX == gfortran ) then
-  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
-#   set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
-  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+  set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
+#   set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
+  set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
 else
 # pgf90 options
-  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+  set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
 endif
 
@@ -54,6 +54,6 @@
 setenv IOIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
 setenv MODIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
-setenv NCDFINC /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/include
-setenv NCDFLIB /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/lib
+setenv NCDFINC /tmpdir/fairhead/Test_HEAD/LMDZ20130808.trunk/netcdf-4.0.1/include
+setenv NCDFLIB /tmpdir/fairhead/Test_HEAD/LMDZ20130808.trunk/netcdf-4.0.1/lib
 
 
@@ -107,10 +107,10 @@
   if ( ! $?NCDFLIB ) then
     echo You must initialize the variable NCDFLIB in your environnement
-    echo for instance: "setenv NCDFLIB /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/lib
+    echo for instance: "setenv NCDFLIB /tmpdir/fairhead/Test_HEAD/LMDZ20130808.trunk/netcdf-4.0.1/lib
     exit
   endif
   if ( ! $?NCDFINC ) then
     echo You must initialize the variable NCDFINC in your environnement
-    echo for instance: "setenv NCDFINC /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/include
+    echo for instance: "setenv NCDFINC /tmpdir/fairhead/Test_HEAD/LMDZ20130808.trunk/netcdf-4.0.1/include
     exit
   endif
@@ -262,5 +262,5 @@
 else if $LINUX then
 #################
-   if ( $FC_LINUX == pgf90 || $FC_LINUX == g95 || $FC_LINUX == gfortran ) then
+   if ( $FC_LINUX == pgf90 || $FC_LINUX == gfortran || $FC_LINUX == gfortran ) then
      set optim=" $OPT_LINUX "
      set optim90=" $OPT_LINUX "
@@ -519,5 +519,5 @@
              set optim90="$optim90"" -g -ffpe-trap=invalid,zero,overflow -fbounds-check -Wall "
              set optimtru90="$optimtru90"" -ffpe-trap=invalid,zero,overflow -g -fbounds-check -Wall "
-           else if ( $FC_LINUX == 'g95' ) then
+           else if ( $FC_LINUX == 'gfortran' ) then
              set optim="$optim"" -g -fbounds-check -freal=nan -ftrace=full -Wall "
              set optim90="$optim90"" -g -fbounds-check -freal=nan -ftrace=full -Wall "
@@ -581,5 +581,5 @@
    set cppflags="$cppflags -DCPP_VEGET"
 #   set link_veget=" -lsechiba -lparameters -lstomate  "
-   set link_veget=" -lsechiba -lparameters -lstomate"
+   set link_veget=" -lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
    if ( $XNEC || $X8BRODIE || $X6NEC) then
 #      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate -lsxorglob -lsxparallel"
@@ -841,9 +841,9 @@
        set opt_link="$opt_link  -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
      endif
-   else if ($FC_LINUX == 'g95' || $FC_LINUX == 'gfortran' ) then
+   else if ($FC_LINUX == 'gfortran' || $FC_LINUX == 'gfortran' ) then
      if ( $io == "ioipsl" ) then
-       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf -lioipsl -lnetcdff -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB  -lnetcdf -lioipsl  -lnetcdf "
      else
-       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB  -lnetcdf "
      endif
    endif
@@ -1015,7 +1015,7 @@
    set optimtru90=" $optimtru90 -module $libo "
    set optim90=" $optim90 -module $libo "
- else if ( $FC_LINUX == 'g95' ) then
-   set optimtru90=" $optimtru90 -fmod=$libo  "
-   set optim90=" $optim90 -fmod=$libo  "
+ else if ( $FC_LINUX == 'gfortran' ) then
+   set optimtru90=" $optimtru90 -I$libo  "
+   set optim90=" $optim90 -I$libo  "
  else if ( $FC_LINUX == 'gfortran' ) then
    set optimtru90=" $optimtru90 -M $libo  "