Changeset 737

Timestamp:

Nov 22, 2006, 3:39:12 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Mise en coherence pour les liens veget et pour l'edition des liens sur mercure
AC/LF

File:

• LMDZ4/branches/V3_test/makegcm (modified) (5 diffs)

LMDZ4/branches/V3_test/makegcm

@@ -543 +543 @@
 if ( "$veget" == 'true' ) then
    set cppflags="$cppflags -DCPP_VEGET"
-   set link_veget=" -lsechiba -lparameters -lstomate"
-   if ( $XNEC ) then
-      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate"
+   set link_veget=" -lsechiba -lparameters -lstomate -lparallel"
+   if ( $XNEC || $X8BRODIE || $X6NEC) then
+      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate -lsxparallel"
    endif
 endif
@@ -565 +565 @@
     set opt_dep="$opt_dep chimie" 
     set libchimie="-lchimie"
-    if ( $XNEC || $X6NEC ) then
+    if ( $XNEC || $X6NEC || $X8BRODIE ) then
       set libchimie="-lsxchimie"
     endif
@@ -961 +961 @@
    set f90=sxmpif90
    if $MODIPSL then
-     set opt_link="$opt_link Wl,-h lib_cyclic -L$MODIPSLDIR"
+     set opt_link="$opt_link -L$MODIPSLDIR"
      if ($veget == true) then
-       set opt_link="$opt_link -lsxsechiba -lsxparameters -lsxstomate"
+       set opt_link="$opt_link $link_veget"
      endif
      if ($couple == true) then
@@ -988 +988 @@
      set opt_link="$opt_link -float0 -Wf,-A dbl4 -L$MODIPSLDIR -lblas"
      if ($veget == true) then
-       set opt_link="$opt_link -lsxsechiba -lsxparameters -lsxstomate"
+       set opt_link="$opt_link $link_veget"
      endif
      if ($couple == true) then
@@ -1093 +1093 @@
 else if $X6NEC then
   set link="sxld $opt_link"
-  set link="$f90 "
+  set link="$f90 -Wl,-hlib_cyclic "
 else if $X8BRODIE then
   set link="sxld $opt_link"