Changeset 1864 for LMDZ5/branches/testing/create_make_gcm

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/create_make_gcm

@@ -42 +42 @@
 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'
@@ -180 +177 @@
             strj=`echo $stri | tr [A-Z] [a-z]`
             str2=""
-            for dirinc in filtrez bibio grid dyn3d $diri $diri/*/ ; do
+            for dirinc in filtrez bibio 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
                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)'
                fi