Changeset 1279 for LMDZ4/trunk/create_make_gcm

Timestamp:

Dec 10, 2009, 10:02:56 AM (14 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)
• create_make_gcm (modified) (4 diffs)

LMDZ4/trunk/create_make_gcm

@@ -69 +69 @@
   echo 'L_BIBIO    = -lsxbibio'
   echo 'L_ADJNT    ='
+  echo 'L_COSP     = -lsxcosp'
 else
   echo 'dyn3d            = $(LIBO)/libdyn3d.a $(LIBO)/lib$(FILTRE).a'
@@ -79 +80 @@
   echo 'L_BIBIO    = -lbibio'
   echo 'L_ADJNT    ='
+  echo 'L_COSP     = -lcosp'
 fi
 
@@ -107 +109 @@
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(PROG).F -o $(PROG).o ; \'
-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 '
+echo '  $(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 '
 echo
 echo 'dyn : $(LIBO)/libdyn$(DIM)d$(FLAG_PARA).a $(FILTRE)$(DIM)d'
@@ -118 +120 @@
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'
+echo
+echo 'cosp : $(LIBO)/libcosp.a'
 echo
 echo '$(FILTRE)3d : $(LIBO)/lib$(FILTRE).a'