Changeset 1999 for LMDZ5/branches/testing/create_make_gcm

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• create_make_gcm (modified) (9 diffs)

LMDZ5/branches/testing/create_make_gcm

@@ -5 +5 @@
 #set -xv
 
-rm -f create_make_gcm.log
 
 machine=`hostname`
 os=`uname`
 gcm=`pwd`
+logfile=$gcm/create_make_gcm.log
+rm -f $logfile ; touch -f $logfile
 libf=$gcm/libf
 libo=$gcm/libo
@@ -48 +49 @@
 echo "LOCAL_DIR=`echo $localdir`"
 echo 'BIBIO    = $(LIBF)/bibio'
+echo 'DYN3D_COMMON   = $(LIBF)/dyn3d_common'
 echo "FILTRE   = filtre"
 echo "PHYS  = "
@@ -67 +69 @@
 echo 'L_PHY = -lphy$(PHYS) '
 echo 'L_BIBIO    = -lbibio'
+echo 'L_DYN3D_COMMON    = -ldyn3d_common'
 echo 'L_ADJNT    ='
 echo 'L_COSP     = -lcosp'
@@ -92 +95 @@
 echo
 #echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
-echo 'main : $(DYN) bibio phys $(OPTION_DEP) '
+echo 'main : $(DYN) bibio dyn3d_common phys $(OPTION_DEP) '
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
-echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_COSP) $(L_PHY) $(L_DYN) $(L_BIBIO) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
+echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_COSP) $(L_PHY) $(L_DYN) $(L_DYN3D_COMMON) $(L_BIBIO) $(L_DYN3D_COMMON) $(L_PHY) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
 echo
 echo 'dyn : $(LIBO)/libdyn$(DIM)d$(FLAG_PARA).a $(FILTRE)$(DIM)d'
@@ -105 +108 @@
 echo
 echo 'bibio : $(LIBO)/libbibio.a'
+echo
+echo 'dyn3d_common : $(LIBO)/libdyn3d_common.a'
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'
@@ -140 +145 @@
       done
       echo
-      echo $listlib >> create_makeg_gcm.log
+      echo $listlib >> $logfile
       echo
       echo "#=================================================================="
@@ -173 +178 @@
 ##########################################################################
 
-         for stri in ` ( sed -e '/^[cC\!]/d' $trufile | sed -n "/\#include/s/\#include//p" | sed 's/\"//g' ; sed -e '/^[cC\!]/d' $trufile | egrep -i '^ *use ' | sed -e 's/,/ /' | awk ' { print $2 } ' ) ` ; do
-            echo $trufile $fili $stri >> create_make_gcm.log
+         for stri in ` ( sed -e '/^[cC\!]/d' $trufile | sed -e "/\#include /s/\#include /XXnclude /" -e "/include /s/include /XXnclude /" -e "/INCLUDE /s/INCLUDE /XXnclude /" | sed -n "/XXnclude /s/XXnclude//p" | sed 's/\"//g' | sort | uniq ; sed -e '/^[cC\!]/d' $trufile | egrep -i '^ *use ' | sed -e 's/,/ /' | awk ' { print $2 } ' | sort | uniq ) ` ; do
+            echo $trufile $fili $stri >> $logfile
             strj=`echo $stri | tr [A-Z] [a-z]`
             str2=""
-            for dirinc in filtrez bibio grid dyn3d phydev $diri $diri/*/ ; do
+            for dirinc in filtrez bibio dyn3d_common grid dyn3d phydev $diri $diri/*/ ; do
 # Recherche dans l'ordre hierarchique inverse car seule la derniere
 # ligne est conservee
@@ -187 +192 @@
                    libstr=$dirinc
                fi
+               echo dirinc $dirinc >> $logfile
                if [ -f $dirinc/$stri ] ; then
                   str2='$(LIBF)/'$dirstr/$stri
@@ -198 +204 @@
                   str2='$(LIBO)/lib'$strlib'.a('$stri'.o)'
                fi
+               echo stri $stri  >> $logfile
+               echo str2 $str2  >> $logfile
             done
+               echo dernier str2 $str2  >> $logfile
             if [ "$str2" = "" ] ; then
-               echo Warn: Include $diri $trufile $fili $stri pas trouve >> $gcm/create_make_gcm.log
+               echo Warn: Include $diri $trufile $fili $stri pas trouve >> $logfile
             elif [ "$str2" = "$str1" ] ; then
-               echo Warn: Include $diri $trufile $fili $stri $str1 trouve 2x >> $gcm/create_make_gcm.log
+               echo Warn: Include $diri $trufile $fili $stri $str1 trouve 2x >> $logfile
             else
                echo $str1 \\