Changeset 2298 for LMDZ5/branches/testing/create_make_gcm

Timestamp:

Jun 14, 2015, 9:13:32 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/create_make_gcm

@@ -5 +5 @@
 #set -xv
 
+# arguments given to create_make_gcm are the directories to scan
+src_dirs=$*
 
 machine=`hostname`
@@ -48 +50 @@
 fi
 echo "LOCAL_DIR=`echo $localdir`"
-echo 'BIBIO    = $(LIBF)/bibio'
+echo 'MISC    = $(LIBF)/misc'
 echo "FILTRE   = filtre"
 echo "PHYS  = "
 echo 'LIBPHY = $(LIBO)/libphy$(PHYS).a'
+echo 'LIBDYN_PHY = $(LIBO)/libdynlmdz_phy$(PHYS).a'
 echo 'DIRMAIN=dyn$(DIM)d$(FLAG_PARA)'
 echo 'RM=rm'
@@ -60 +63 @@
 echo 'L_DYN      = -ldyn$(DIM)d$(FLAG_PARA) -ldyn3d_common'
 echo 'L_FILTRE   = -l$(FILTRE)'
+echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
 echo 'L_PHY = -lphy$(PHYS) '
-echo 'L_BIBIO    = -lbibio'
+echo 'L_MISC    = -lmisc'
 echo 'L_ADJNT    ='
 echo 'L_COSP     = -lcosp'
@@ -87 +91 @@
 echo 'DYN  = dyn$(DIM)d'
 echo
-#echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
-echo 'main : $(DYN) bibio phys $(OPTION_DEP) '
+#echo 'main : chimie $(DYN) misc phys $(OPTION_DEP) '
+echo 'main : $(DYN) misc phys dyn_phy $(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_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 '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_COSP) $(L_PHY) $(L_DYN) $(L_DYN3D_COMMON) $(L_MISC) $(L_DYN3D_COMMON) $(L_PHY) $(L_DYN_PHY) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
 echo
 echo 'phys : $(LIBPHY)'
@@ -99 +103 @@
 echo 'dyn1d :'
 echo
+echo 'dyn_phy: $(LIBDYN_PHYS)'
 echo
 #echo 'chimie : $(LIBO)/libchimie.a'
 echo
-echo 'bibio : $(LIBO)/libbibio.a'
+echo 'misc : $(LIBO)/libmisc.a'
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'
@@ -121 +126 @@
 cd $libf >/dev/null 2>&1
 
-for diri in ` ls ` ; do
+for diri in $src_dirs ; do
 
    if [ -d $diri ] ; then
-   if [ "`ls $diri/*.F $diri/*/*.F`" != "" ] || [ "`ls $diri/*.[fF]90 $diri/*/*.[fF]90`" != "" ]  ; then 
+   if [ "`ls $diri/*.F`" != "" ] || [ "`ls $diri/*.[fF]90`" != "" ]  ; then 
 #      cd $diri >/dev/null 2>&1
       echo
       listlib=""
 # Liste des fichiers .F et .F90 n'etant pas des programmes principaux
-      for fili in `ls $diri/*.[fF] $diri/*/*.[fF]` ; do
-         test=` (  head $fili | grep '      PROGRAM' ) `
+      for fili in `ls $diri/*.[fF]` ; do
+         # Check if file is a routine or main program
+         # i.e: look for the "program" keword preceeded by leading spaces
+         test=` (  head $fili | grep -i '^ *program' ) `
+         # if it is not a main program, add it to the list
          if [ "$test" = "" ] ; then listlib=$listlib" "$fili ; fi
       done
-      for fili in `ls $diri/*.[fF]90 $diri/*/*.[fF]90` ; do
-         test=` (  head $fili | grep 'PROGRAM' ) `
+      for fili in `ls $diri/*.[fF]90` ; do
+         # Check if file is a routine or main program
+         # i.e. look for "program" keyword (with possibly some leading spaces)
+         test=` (  head $fili | grep -i '^ \{0,\}program' ) `
+         # if it is not a main program, add it to the list
          if [ "$test" = "" ] ; then listlib=$listlib" "$fili ; fi 
       done
@@ -140 +151 @@
       echo $listlib >> $logfile
       echo
+      # topdiri contains main dir name (without trailing "/blabla" for subdirs)
+      topdiri=${diri%/*}
       echo "#=================================================================="
       echo "# Contenu de la bibliotheque correspondant au Directory "$diri
@@ -146 +159 @@
       for trufile in $listlib ; do
          fili=`echo $trufile | awk -F/ ' { print $NF } ' | cut -d. -f1`
-         echo '$(LIBO)/lib'$diri".a : " '$(LIBO)/lib'$diri".a("$fili".o)"
+         echo '$(LIBO)/lib'$topdiri".a : " '$(LIBO)/lib'$topdiri".a("$fili".o)"
          echo
       done
-      echo '.PRECIOUS   : $(LIBO)/lib'$diri'.a'
-      echo
-      echo
-      echo "# Compilation des membres de la bibliotheque lib"$diri".a"
+      echo '.PRECIOUS   : $(LIBO)/lib'$topdiri'.a'
+      echo
+      echo
+      echo "# Compilation of elements in $diri of library lib"$topdiri".a"
       echo
       for trufile in $listlib ; do
@@ -159 +172 @@
                  egrep -i '^ *module ' $trufile > /dev/null 2>&1 && F90=1
                  egrep -i '#include*.inc ' $trufile > /dev/null 2>&1 && F90=1
-         str1='$(LIBO)/lib'$diri'.a('$fili'.o) : $(LIBF)/'$trufile
+         str1='$(LIBO)/lib'$topdiri'.a('$fili'.o) : $(LIBF)/'$trufile
          [ "$fili" = "$diri/chem.subs" ] && str1=$str1' $(LIBF)/'$diri/chem.mods.F
 
@@ -175 +188 @@
             strj=`echo $stri | tr [A-Z] [a-z]`
             str2=""
-            for dirinc in filtrez bibio dyn3d_common grid dyn3d phydev $diri $diri/*/ ; do
+            for dirinc in $src_dirs ; do
 # Recherche dans l'ordre hierarchique inverse car seule la derniere
 # ligne est conservee
-               if [ $dirinc = phydev ] ; then
-                   dirstr='$(PHYS)'
-                   libstr='phy$(PHYS)'
-               else
+#               if [ $dirinc = phydev ] ; then
+#                   dirstr='$(PHYS)'
+#                   libstr='phy$(PHYS)'
+#               else
                    dirstr=$dirinc
                    libstr=$dirinc
-               fi
+#               fi
                echo dirinc $dirinc >> $logfile
                if [ -f $dirinc/$stri ] ; then
@@ -214 +227 @@
          # object from library
          echo ' cd $(LIBO); \'
-         echo ' $(AR) d $(LIBO)/lib'$diri'.a '$fili'.o ; \'
+         echo ' $(AR) d $(LIBO)/lib'$topdiri'.a '$fili'.o ; \'
          if [ "$F90" -eq '0' ] ; then
          ## Fixed Form Fortran 77
@@ -228 +241 @@
          fi
          # Put generated object in library
-         echo ' $(AR) r $(LIBO)/lib'$diri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
+         echo ' $(AR) r $(LIBO)/lib'$topdiri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
          echo
       done