Changeset 1492 for LMDZ5/trunk/create_make_gcm

Timestamp:

Mar 8, 2011, 9:10:25 AM (13 years ago)

Author:

Laurent Fairhead

Message:

Merge of development branch LMDZ5V2.0-dev r1455:r1491 into the trunk.
Validation made locally: restart files are strictly equal between the HEAD of the trunk
and r1491 of LMDZ5V2.0-dev

---

Synchro de la branche de développement LMDZ5V2.0-dev r1455:r1491 et de la trunk
Validation faite en local: les fichiers restart sont équivalents entre la HEAD de la trunk
et la révision r1491 de LMDZ5V2.0-dev

Location:

LMDZ5/trunk

Files:

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

LMDZ5/trunk/create_make_gcm

@@ -1 +1 @@
 #!/bin/sh
 #
-# $Header$
+# $Id$
 #
 #set -xv
@@ -59 +59 @@
 echo '# Les differentes librairies pour l"edition des liens:'
 echo
-if ( [ "$XNEC" = '1' ] || [ "$X6NEC" = '1' ] || [ "$X8BRODIE" = '1' ] ) ; then
-  echo 'dyn3d      = $(LIBO)/libsxdyn3d.a $(LIBO)/libsx$(FILTRE).a'
-  echo 'dyn3dpar     = $(LIBO)/libsxdyn3dpar.a $(LIBO)/libsx$(FILTRE).a'
-  echo 'dyn2d      = $(LIBO)/libsxdyn2d.a'
-  echo 'dyn1d      = $(LIBO)/libsxdyn1d.a'
-  echo 'L_DYN      = -lsxdyn$(DIM)d$(FLAG_PARA)'
-  echo 'L_FILTRE   = -lsx$(FILTRE)'
-  echo 'L_PHY = -lsxphy$(PHYS) '
-  echo 'L_BIBIO    = -lsxbibio'
-  echo 'L_ADJNT    ='
-  echo 'L_COSP     = -lsxcosp'
-else
-  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_FILTRE   = -l$(FILTRE)'
-  echo 'L_PHY = -lphy$(PHYS) '
-  echo 'L_BIBIO    = -lbibio'
-  echo 'L_ADJNT    ='
-  echo 'L_COSP     = -lcosp'
-fi
+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_FILTRE   = -l$(FILTRE)'
+echo 'L_PHY = -lphy$(PHYS) '
+echo 'L_BIBIO    = -lbibio'
+echo 'L_ADJNT    ='
+echo 'L_COSP     = -lcosp'
 
 echo
@@ -219 +206 @@
          done
          echo $str1
+         # Compile in LIBO directory; and before compiling, remove
+         # object from library
+         echo ' cd $(LIBO); \'
+         echo ' $(AR) d $(LIBO)/lib'$diri'.a '$fili'.o ; \'
          if [ "$F90" -eq '0' ] ; then
-           echo '       cd $(LOCAL_DIR); \'
+         ## Fixed Form Fortran 77
            echo '       $(COMPILE) $(LIBF)/'$diri'/'$trufile' ; \'
          else
-           echo '       cd $(LOCAL_DIR); \'
+         ## Fortran 90
            if [ -f $fili.F90 ] ; then
-              echo '    $(COMPTRU90) $(LIBF)/'$diri'/'$trufile' ; \'
+              ## Free Form
+              echo '    $(COMPTRU90) $(LIBF)/'$diri'/'$trufile' ; \'
            else
               echo '    $(COMPILE90) $(LIBF)/'$diri'/'$trufile' ; \'
            fi
-           MODU=0; egrep -i '^ *module ' $trufile> /dev/null 2>&1 && MODU=1
-            if [ "$MODU" -eq '1' -a "$CRAY" != '1' ] ; then
-              if [ "$os" = 'UNIX_System_V' ] ; then
-                echo '  cp $(MOD_LOC_DIR)/*.$(MOD_SUFFIX) $(LIBO)/ ; \'
-              else
-                echo '  mv $(MOD_LOC_DIR)/'$fili'.$(MOD_SUFFIX) $(LIBO)/'$fili'.$(MOD_SUFFIX) ; \'
-#                echo ' if [ "$(MOD_LOC_DIR)" ne "$(LIBO)" ] ; then mv $(MOD_LOC_DIR)/'*'.$(MOD_SUFFIX) $(LIBO) ; fi ; \'
-              fi
-            fi
          fi
-         if ( [ "$XNEC" -eq '1' ] || [ "$X6NEC" = '1' ] || [ "$X8BRODIE" = '1' ] ) ; then
-           echo '       sxar r $(LIBO)/libsx'$diri'.a '$fili'.o ; \'
-         fi
+         # Put generated object in library
          echo ' $(AR) r $(LIBO)/lib'$diri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
          echo ' cd $(GCM)'