Changeset 1300 for trunk/LMDZ.COMMON/create_make_gcm

Timestamp:

Jun 25, 2014, 1:19:59 PM (11 years ago)

Author:

emillour

Message:

Common dynamics:
Some updates to keep up with LMDZ5 Earth model evolution (up to LMDZ5 rev 1955).
Main change is the introduction of a "dyn3d_common" directory
to store files common to dyn3d and dyn3dpar.
See file "DOC/chantiers/commit_importants.log" for detailed list
of changes. These changes do not change results on test cases.
EM

File:

• trunk/LMDZ.COMMON/create_make_gcm (modified) (5 diffs)

trunk/LMDZ.COMMON/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'
+echo 'DYN3D_COMMON   = $(LIBF)/dyn3d_common'
 echo "FILTRE   = filtre"
 echo "PHYS  = "
@@ -70 +68 @@
 echo 'L_PHY = -lphy$(PHYS) '
 echo 'L_BIBIO    = -lbibio'
+echo 'L_DYN3D_COMMON    = -ldyn3d_common'
 echo 'L_ADJNT    ='
 echo 'L_COSP     = -lcosp'
@@ -103 +102 @@
 echo
 #echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
-echo 'main : bibio $(DYN) 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_AERONOMARS) $(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_AERONOMARS) $(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'
@@ -116 +115 @@
 echo
 echo 'bibio : $(LIBO)/libbibio.a'
+echo
+echo 'dyn3d_common : $(LIBO)/libdyn3d_common.a'
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'
@@ -212 +213 @@
             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
                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
             done