Changeset 1279 for LMDZ4/trunk/makegcm

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

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

LMDZ4/trunk/makegcm

@@ -1 +1 @@
 #!/bin/csh
 #
-# $Header$
+# $Id$
 #
 #set verbose echo
@@ -24 +24 @@
 set OPTIMI=' -ftrace '
 set OPT_LINUX='-O3'
+set OPT_LINUX="-i4 -r8 -O3"
 set io=ioipsl
+set cosp=false
 
 set FC_LINUX=g95
 #set FC_LINUX=pgf90
+if ( $FC_LINUX == g95 ) then
+   set OPT_LINUX="-O3"
+else 
+   # pgf90 options
+   set OPT_LINUX="-i4 -r8 -O2 -Munroll -Mnoframe -Mautoinline -Mcache_align"
+endif
 
 ########################################################################
@@ -37 +45 @@
 #setenv LIBOGCM $LMDGCM/libo
 set INCALIB=../INCA3/config/lib
-set LMDGCM="`pwd`"
-setenv LIBOGCM $LMDGCM/libo
+#set LMDGCM="`pwd`"
+#setenv LIBOGCM $LMDGCM/libo
 #set LMDGCM=/d4/fairhead/V4/
 #setenv LIBOGCM $LMDGCM/libo
 #
 #
-#setenv IOIPSLDIR /u/fairhead/modipsl_ioipsl_3/lib_i4r4_32bits
-#setenv MODIPSLDIR /u/fairhead/modipsl_ioipsl_3/lib_i4r4_32bits
-#setenv NCDFINC /distrib/local/netcdf/pgi_32bits/include
-#setenv NCDFLIB /distrib/local/netcdf/pgi_32bits/lib/
-setenv IOIPSLDIR /d4/fairhead/Install_LMDZ4_FH/LMDZ4preV4/modipsl/lib/
-setenv MODIPSLDIR /d4/fairhead/Install_LMDZ4_FH/LMDZ4preV4/modipsl/lib/
-setenv NCDFINC /d4/fairhead/Install_LMDZ4_FH/LMDZ4preV4/netcdf-3.6.1/include
-setenv NCDFLIB /d4/fairhead/Install_LMDZ4_FH/LMDZ4preV4/netcdf-3.6.1/lib
+#setenv NCDFINC /tmpdir/fairhead/1P1bis/netcdf-3.6.1/include
+#setenv NCDFLIB /tmpdir/fairhead/1P1bis/netcdf-3.6.1/lib
+#setenv IOIPSLDIR /tmpdir/fairhead/IOIPSL/modipsl/lib
+#setenv MODIPSLDIR /tmpdir/fairhead/IOIPSL/modipsl/lib
 
 
@@ -182 +186 @@
 set opt_link=""
 set adjnt=""
+set lcosp=""
 set opt_dep=""
 set libchimie=""
@@ -254 +259 @@
 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 "
@@ -428 +426 @@
 -adjnt     Pour compiler la l'adjoint du code dynamique
 
+-cosp true|false      
+           Pour compiler avec cosp
+
 -filtre  filtre
            Pour choisir le filtre en longitude dans les regions polaires.
@@ -483 +484 @@
         set opt_dep="$opt_dep adjnt" ; set adjnt="-ladjnt -ldyn3d "
         set optim="$optim -Dadj" ; shift ; goto top
+
+     case -cosp
+        set cosp="$2"; shift ; shift ; goto top
 
      case -filtre
@@ -542 +546 @@
 endif
 
+if ( "$cosp" == 'true' ) then
+    set cppflags="$cppflags -DCPP_COSP"
+    set include="$include"' -I$(LIBF)/cosp '
+    set opt_dep="$opt_dep cosp"
+#    set lcosp="-lcosp -lphy$physique "
+     set lcosp="-lcosp "
+   if ( $XNEC || $X8BRODIE || $X6NEC) then
+#    set lcosp="-lsxcosp -lsxphy$physique "
+     set lcosp="-lsxcosp "
+   endif
+endif
+
 if ( "$physique" == 'nophys' ) then
    set phys="L_PHY= LIBPHY="
@@ -552 +568 @@
 if ( "$veget" == 'true' ) then
    set cppflags="$cppflags -DCPP_VEGET"
-   set link_veget=" -lsechiba -lparameters -lstomate -lorglob -lparallel"
+#   set link_veget=" -lsechiba -lparameters -lstomate -lorglob -lparallel"
+   set link_veget=" -lsechiba -lparameters -lstomate"
    if ( $XNEC || $X8BRODIE || $X6NEC) then
-      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate -lsxorglob -lsxparallel"
+#      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate -lsxorglob -lsxparallel"
+      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate "
    endif
 endif
@@ -902 +920 @@
 ##################
    set f77=sxmpif90
-   set f90=sxmpif90
+   set f90=sxmpif90 
    if $MODIPSL then
      set opt_link="$opt_link -float0 -Wf,-A dbl4 -L$MODIPSLDIR -lblas"
@@ -1029 +1047 @@
 FLAG_PARA="$FLAG_PARA"\
 L_ADJNT="$adjnt" \
+L_COSP="$lcosp" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \
@@ -1054 +1073 @@
 FLAG_PARA="$FLAG_PARA"\
 L_ADJNT="$adjnt" \
+L_COSP="$lcosp" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \