Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ4/branches/V3_test/makegcm

    r736 r737  
    543543if ( "$veget" == 'true' ) then
    544544   set cppflags="$cppflags -DCPP_VEGET"
    545    set link_veget=" -lsechiba -lparameters -lstomate"
    546    if ( $XNEC ) then
    547       set link_veget=" -lsxsechiba -lsxparameters -lsxstomate"
     545   set link_veget=" -lsechiba -lparameters -lstomate -lparallel"
     546   if ( $XNEC || $X8BRODIE || $X6NEC) then
     547      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate -lsxparallel"
    548548   endif
    549549endif
     
    565565    set opt_dep="$opt_dep chimie"
    566566    set libchimie="-lchimie"
    567     if ( $XNEC || $X6NEC ) then
     567    if ( $XNEC || $X6NEC || $X8BRODIE ) then
    568568      set libchimie="-lsxchimie"
    569569    endif
     
    961961   set f90=sxmpif90
    962962   if $MODIPSL then
    963      set opt_link="$opt_link Wl,-h lib_cyclic -L$MODIPSLDIR"
     963     set opt_link="$opt_link -L$MODIPSLDIR"
    964964     if ($veget == true) then
    965        set opt_link="$opt_link -lsxsechiba -lsxparameters -lsxstomate"
     965       set opt_link="$opt_link $link_veget"
    966966     endif
    967967     if ($couple == true) then
     
    988988     set opt_link="$opt_link -float0 -Wf,-A dbl4 -L$MODIPSLDIR -lblas"
    989989     if ($veget == true) then
    990        set opt_link="$opt_link -lsxsechiba -lsxparameters -lsxstomate"
     990       set opt_link="$opt_link $link_veget"
    991991     endif
    992992     if ($couple == true) then
     
    10931093else if $X6NEC then
    10941094  set link="sxld $opt_link"
    1095   set link="$f90 "
     1095  set link="$f90 -Wl,-hlib_cyclic "
    10961096else if $X8BRODIE then
    10971097  set link="sxld $opt_link"
Note: See TracChangeset for help on using the changeset viewer.