Index: LMDZ5/trunk/makegcm
===================================================================
--- LMDZ5/trunk/makegcm	(revision 1498)
+++ LMDZ5/trunk/makegcm	(revision 1499)
@@ -28,17 +28,16 @@
 set cosp=false
 
+set FC_LINUX=g95
 set FC_LINUX=gfortran
-set FC_LINUX=gfortran
-#set FC_LINUX=gfortran
-if ( $FC_LINUX == gfortran ) then
-   set OPT_LINUX="-O3 -fdefault-real-8"
-   set OPT_LINUX="-O3 -fdefault-real-8"
+#set FC_LINUX=pgf90
+if ( $FC_LINUX == g95 ) then
+  set OPT_LINUX="-O3"
 else if ( $FC_LINUX == gfortran ) then
-   set OPT_LINUX="-O3 -fdefault-real-8"
-#   set OPT_LINUX="-O3 -fdefault-real-8"
-   set OPT_LINUX="-O3 -fdefault-real-8"
+  set OPT_LINUX="-fdefault-real-8 -O3"
+#   set OPT_LINUX="-O3 -fno-second-underscore"
+  set OPT_LINUX="-O3 "
 else
-   # pgf90 options
-   set OPT_LINUX="-O3 -fdefault-real-8"
+# pgf90 options
+  set OPT_LINUX="-i4 -r8 -O2 -Munroll -Mnoframe -Mautoinline -Mcache_align"
 endif
 
@@ -263,5 +262,5 @@
 else if $LINUX then
 #################
-   if ( $FC_LINUX == pgf90 || $FC_LINUX == gfortran || $FC_LINUX == gfortran ) then
+   if ( $FC_LINUX == pgf90 || $FC_LINUX == g95 || $FC_LINUX == gfortran ) then
      set optim=" $OPT_LINUX "
      set optim90=" $OPT_LINUX "
@@ -833,5 +832,5 @@
        set opt_link=" -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
      endif
-   else if ($FC_LINUX == 'gfortran' || $FC_LINUX == 'gfortran' ) then
+   else if ($FC_LINUX == 'g95' || $FC_LINUX == 'gfortran' ) then
      if ( $io == "ioipsl" ) then
        set opt_link="-L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lioipsl -lnetcdf "
@@ -1009,7 +1008,7 @@
    set optimtru90=" $optimtru90 -module $libo "
    set optim90=" $optim90 -module $libo "
- else if ( $FC_LINUX == 'gfortran' ) then
-   set optimtru90=" $optimtru90 -I$libo  "
-   set optim90=" $optim90 -I$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 -M $libo  "
@@ -1033,7 +1032,9 @@
   set link="sxld $opt_link"
   set link="$f90 -Wl,-hlib_cyclic "
+#  set ar=sxar
 else if $X8BRODIE then
   set link="sxld $opt_link"
   set link="$f90 -Wl,-hlib_cyclic "
+#  set ar=sxar
 endif