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

Legend:

Unmodified
Added
Removed
  • LMDZ4/trunk

  • LMDZ4/trunk/create_make_gcm

    r1112 r1279  
    6969  echo 'L_BIBIO    = -lsxbibio'
    7070  echo 'L_ADJNT    ='
     71  echo 'L_COSP     = -lsxcosp'
    7172else
    7273  echo 'dyn3d            = $(LIBO)/libdyn3d.a $(LIBO)/lib$(FILTRE).a'
     
    7980  echo 'L_BIBIO    = -lbibio'
    8081  echo 'L_ADJNT    ='
     82  echo 'L_COSP     = -lcosp'
    8183fi
    8284
     
    107109echo '  cd $(LOCAL_DIR); \'
    108110echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(PROG).F -o $(PROG).o ; \'
    109 echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_FILTRE) $(L_PHY) $(L_DYN) $(L_BIBIO) $(L_DYN) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
     111echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_COSP) $(L_FILTRE) $(L_PHY) $(L_DYN) $(L_BIBIO) $(L_DYN) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
    110112echo
    111113echo 'dyn : $(LIBO)/libdyn$(DIM)d$(FLAG_PARA).a $(FILTRE)$(DIM)d'
     
    118120echo
    119121echo 'adjnt : $(LIBO)/libadjnt.a'
     122echo
     123echo 'cosp : $(LIBO)/libcosp.a'
    120124echo
    121125echo '$(FILTRE)3d : $(LIBO)/lib$(FILTRE).a'
Note: See TracChangeset for help on using the changeset viewer.