Changeset 1492 for LMDZ5/trunk/makegcm

Timestamp:

Mar 8, 2011, 9:10:25 AM (14 years ago)

Author:

Laurent Fairhead

Message:

Merge of development branch LMDZ5V2.0-dev r1455:r1491 into the trunk.
Validation made locally: restart files are strictly equal between the HEAD of the trunk
and r1491 of LMDZ5V2.0-dev

---

Synchro de la branche de développement LMDZ5V2.0-dev r1455:r1491 et de la trunk
Validation faite en local: les fichiers restart sont équivalents entre la HEAD de la trunk
et la révision r1491 de LMDZ5V2.0-dev

Location:

LMDZ5/trunk

Files:

• . (modified) (1 prop)
• makegcm (modified) (8 diffs)

LMDZ5/trunk/makegcm

@@ -23 +23 @@
 set OPTIMI='-C debug -eC '
 set OPTIMI=' -ftrace '
-set OPT_LINUX='-O3'
-set OPT_LINUX="-i4 -r8 -O3"
+set OPT_LINUX="-O3 -fdefault-real-8"
+set OPT_LINUX="-O3 -fdefault-real-8"
 set io=ioipsl
 set cosp=false
 
-set FC_LINUX=g95
 set FC_LINUX=gfortran
-#set FC_LINUX=pgf90
-if ( $FC_LINUX == g95 ) then
-   set OPT_LINUX="-O3"
-   set OPT_LINUX="-O3"
+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"
 else if ( $FC_LINUX == gfortran ) then
-   set OPT_LINUX="-fdefault-real-8 -O3"
-#   set OPT_LINUX="-O3 -fno-second-underscore"
-   set OPT_LINUX="-O3 "
+   set OPT_LINUX="-O3 -fdefault-real-8"
+#   set OPT_LINUX="-O3 -fdefault-real-8"
+   set OPT_LINUX="-O3 -fdefault-real-8"
 else
    # pgf90 options
-   set OPT_LINUX="-i4 -r8 -O2 -Munroll -Mnoframe -Mautoinline -Mcache_align"
+   set OPT_LINUX="-O3 -fdefault-real-8"
 endif
 
@@ -53 +53 @@
 #
 #
-setenv IOIPSLDIR /d4/fairhead/gfortran/ioipsl_v2_1_9
-setenv MODIPSLDIR /d4/fairhead/gfortran/ioipsl_v2_1_9
-setenv NCDFINC /d4/fairhead/gfortran_4.4/netcdf-4.1.1/include
-setenv NCDFLIB /d4/fairhead/gfortran_4.4/netcdf-4.1.1/lib
+setenv IOIPSLDIR /d4/fairhead/LMDZ20100928.trunk/modipsl/lib
+setenv MODIPSLDIR /d4/fairhead/LMDZ20100928.trunk/modipsl/lib
+setenv NCDFINC /d4/fairhead/LMDZ20100928.trunk/netcdf-4.0.1/include
+setenv NCDFLIB /d4/fairhead/LMDZ20100928.trunk/netcdf-4.0.1/lib
 
 
@@ -108 +108 @@
   if ( ! $?NCDFLIB ) then
     echo You must initialize the variable NCDFLIB in your environnement
-    echo for instance: "setenv NCDFLIB /usr/myself/netcdf" in .cshrc
+    echo for instance: "setenv NCDFLIB /d4/fairhead/LMDZ20100928.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 /usr/myself/netcdf" in .cshrc
+    echo for instance: "setenv NCDFINC /d4/fairhead/LMDZ20100928.trunk/netcdf-4.0.1/include
     exit
   endif
@@ -263 +263 @@
 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 "
@@ -516 +516 @@
              set optim90="$optim90"" -g -C -Mbounds "
              set optimtru90="$optimtru90"" -g -C -Mbounds "
-           else if ( $FC_LINUX == 'g95' ) then
+           else if ( $FC_LINUX == 'gfortran' ) then
              set optim="$optim"" -g -fbounds-check "
              set optim90="$optim90"" -g -fbounds-check "
@@ -572 +572 @@
 if ( "$veget" == 'true' ) then
    set cppflags="$cppflags -DCPP_VEGET"
-#   set link_veget=" -lsechiba -lparameters -lstomate -lorglob -lparallel"
+#   set link_veget=" -lsechiba -lparameters -lstomate  "
    set link_veget=" -lsechiba -lparameters -lstomate"
    if ( $XNEC || $X8BRODIE || $X6NEC) then
@@ -833 +833 @@
        set 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="-L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lioipsl -lnetcdf "
@@ -1009 +1009 @@
    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  "