Index: /LMDZ4/branches/LMDZ4-dev/makegcm
===================================================================
--- /LMDZ4/branches/LMDZ4-dev/makegcm	(revision 1184)
+++ /LMDZ4/branches/LMDZ4-dev/makegcm	(revision 1185)
@@ -1,5 +1,5 @@
 #!/bin/csh
 #
-# $Header$
+# $Id$
 #
 #set verbose echo
@@ -29,4 +29,10 @@
 set FC_LINUX=g95
 #set FC_LINUX=pgf90
+if ( FC_LINUX == g95 ) then
+   set OPT_LINUX="-i4 -r8 -O3"
+else 
+   # pgf90 options
+   set OPT_LINUX="-i4 -r8 -O2 -Munroll -Mnoframe -Mautoinline -Mcache_align"
+endif
 
 ########################################################################
@@ -255,12 +261,5 @@
 else if $LINUX then
 #################
-   if ( $FC_LINUX == "pgf90" ) then
-     set optim="-fast "
-     set optim90=" -fast "
-     set optimtru90=" -fast -c -Mfree "
-#     set optim=" "
-#     set optim90="  "
-#     set optimtru90=" -c -Mfree "
-   else if ( $FC_LINUX == 'g95' ) then 
+   if ( $FC_LINUX == pgf90 || $FC_LINUX == g95 ) then
      set optim=" $OPT_LINUX "
      set optim90=" $OPT_LINUX "