Changeset 1644 for LMDZ5/trunk/makegcm

Timestamp:

Jul 30, 2012, 12:58:46 PM (12 years ago)

Author:

idelkadi

Message:

Corrections dans makegcm et create_make_gcm pour pouvoir compiler avec Cosp

File:

• LMDZ5/trunk/makegcm (modified) (8 diffs)

LMDZ5/trunk/makegcm

@@ -23 +23 @@
 set OPTIMI='-C debug -eC '
 set OPTIMI=' -ftrace '
-set OPT_LINUX="-O3 -fdefault-real-8"
-set OPT_LINUX="-O3 -fdefault-real-8"
+set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
 set io=ioipsl
 set cosp=false
 
 set FC_LINUX=g95
-set FC_LINUX=gfortran
-#set FC_LINUX=pgf90
+set FC_LINUX=g95
+#set FC_LINUX=g95
 if ( $FC_LINUX == g95 ) then
-  set OPT_LINUX="-O3"
+  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
 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="-i4 -O3 -r8 -DNC_DOUBLE"
+#   set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
+  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
 else
 # pgf90 options
-  set OPT_LINUX="-i4 -r8 -O2 -Munroll -Mnoframe -Mautoinline -Mcache_align"
+  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
 endif
 
@@ -54 +54 @@
 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
+setenv NCDFINC /tmp15/idelkadi/Cosp3D/LMDZ20120724.trunk/netcdf-4.0.1/include
+setenv NCDFLIB /tmp15/idelkadi/Cosp3D/LMDZ20120724.trunk/netcdf-4.0.1/lib
 
 
@@ -107 +107 @@
   if ( ! $?NCDFLIB ) then
     echo You must initialize the variable NCDFLIB in your environnement
-    echo for instance: "setenv NCDFLIB /d4/fairhead/LMDZ20100928.trunk/netcdf-4.0.1/lib
+    echo for instance: "setenv NCDFLIB /tmp15/idelkadi/Cosp3D/LMDZ20120724.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 /d4/fairhead/LMDZ20100928.trunk/netcdf-4.0.1/include
+    echo for instance: "setenv NCDFINC /tmp15/idelkadi/Cosp3D/LMDZ20120724.trunk/netcdf-4.0.1/include
     exit
   endif
@@ -189 +189 @@
 set opt_link=""
 set adjnt=""
-set lcosp=""
+# set lcosp=""
 set opt_dep=""
 set libchimie=""
@@ -563 +563 @@
      set lcosp="-lsxcosp "
    endif
+   set opt_link="$lcosp $opt_link"
 endif
 
@@ -836 +837 @@
    if ( $FC_LINUX == 'pgf90' ) then
      if ( $io == "ioipsl" ) then
-       set opt_link=" -L$MODIPSLDIR $link_veget -L$NCDFLIB -lioipsl -lnetcdf "
+       set opt_link=" $opt_link -L$MODIPSLDIR $link_veget -L$NCDFLIB -lioipsl -lnetcdf "
      else
-       set opt_link=" -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
+       set opt_link="$opt_link  -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
      endif
    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 "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lioipsl -lnetcdf "
      else
-       set opt_link="-L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lnetcdf "
      endif
-   else
-     set opt_link=" "
    endif
 #################
@@ -1068 +1067 @@
 FLAG_PARA="$FLAG_PARA"\
 L_ADJNT="$adjnt" \
-L_COSP="$lcosp" \
+# L_COSP="$lcosp" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \
@@ -1095 +1094 @@
 FLAG_PARA="$FLAG_PARA"\
 L_ADJNT="$adjnt" \
-L_COSP="$lcosp" \
+# L_COSP="$lcosp" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \