Changeset 2071 for LMDZ5/branches/LMDZ5-DOFOCO/create_make_gcm

Timestamp:

Jun 23, 2014, 10:35:34 AM (11 years ago)

Author:

jghattas

Message:

Updated all compile envrionement with r2064 from the trunk.

File:

• LMDZ5/branches/LMDZ5-DOFOCO/create_make_gcm (modified) (7 diffs)

LMDZ5/branches/LMDZ5-DOFOCO/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
@@ -42 +43 @@
 echo 'LIBF    = $(GCM)/libf'
 if [ "$CRAY" = '0' ] ; then
-#   echo 'LIBO    = $(GCM)/libo/$(MACHINE)'
    echo 'LIBO    = $(LIBOGCM)/$(MACHINE)'
 else
    echo 'LIBO    = $(GCM)/libo'
 fi
-#echo 'LOCAL_DIR=$(GCM)'
-#echo $localdir
 echo "LOCAL_DIR=`echo $localdir`"
 echo 'BIBIO    = $(LIBF)/bibio'
 echo "FILTRE   = filtre"
 echo "PHYS  = "
-echo "DYN  = dyn "
 echo 'LIBPHY = $(LIBO)/libphy$(PHYS).a'
 echo 'DIRMAIN=dyn$(DIM)d$(FLAG_PARA)'
@@ -61 +58 @@
 echo
 echo '# Les differentes librairies pour l"edition des liens:'
-echo
-echo 'dyn3d            = $(LIBO)/libdyn3d.a $(LIBO)/lib$(FILTRE).a'
-echo 'dyn3dpar      = $(LIBO)/libdyn3dpar.a $(LIBO)/lib$(FILTRE).a'
-echo 'dyn2d            = $(LIBO)/libdyn2d.a'
-echo 'dyn1d            = $(LIBO)/libdyn1d.a'
-echo 'L_DYN      = -ldyn$(DIM)d$(FLAG_PARA)'
+echo 'L_DYN      = -ldyn$(DIM)d$(FLAG_PARA) -ldyn3d_common'
 echo 'L_FILTRE   = -l$(FILTRE)'
 echo 'L_PHY = -lphy$(PHYS) '
@@ -93 +85 @@
 echo
 echo "PROG = code"
+echo 'DYN  = dyn$(DIM)d'
 echo
 #echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
@@ -99 +92 @@
 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
-echo 'dyn : $(LIBO)/libdyn$(DIM)d$(FLAG_PARA).a $(FILTRE)$(DIM)d'
+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 'phys : $(LIBPHY)'
+echo 'dyn3d : $(LIBO)/libdyn$(DIM)d$(FLAG_PARA).a $(LIBO)/lib$(FILTRE).a $(LIBO)/libdyn3d_common.a'
+echo 'dyn2d : $(LIBO)/libdyn2d.a'
+echo 'dyn1d :'
+echo
 echo
 #echo 'chimie : $(LIBO)/libchimie.a'
@@ -143 +138 @@
       done
       echo
-      echo $listlib >> create_makeg_gcm.log
+      echo $listlib >> $logfile
       echo
       echo "#=================================================================="
@@ -176 +171 @@
 ##########################################################################
 
-         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 $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
+               if [ $dirinc = phydev ] ; then
+                   dirstr='$(PHYS)'
+                   libstr='phy$(PHYS)'
+               else
+                   dirstr=$dirinc
+                   libstr=$dirinc
+               fi
+               echo dirinc $dirinc >> $logfile
                if [ -f $dirinc/$stri ] ; then
-                  str2='$(LIBF)/'$dirinc/$stri
+                  str2='$(LIBF)/'$dirstr/$stri
                elif [ -f $dirinc/$strj ] ; then
-                  str2='$(LIBF)/'$dirinc/$stri
+                  str2='$(LIBF)/'$dirstr/$stri
                elif [ -f $dirinc/$strj.F90 ]  || [ -f $dirinc/$strj.F ]  ; then 
-                  strlib=`echo $dirinc | awk -F/ ' { print $1 } '`
+                  strlib=`echo $libstr | awk -F/ ' { print $1 } '`
                   str2='$(LIBO)/lib'$strlib'.a('$strj'.o)'
+               elif [ -f $dirinc/$stri.F90 ]  || [ -f $dirinc/$stri.F ]  ; then 
+                  strlib=`echo $libstr | awk -F/ ' { print $1 } '`
+                  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 \\