Changeset 375

Timestamp:

Nov 10, 2011, 4:11:18 PM (13 years ago)

Author:

emillour

Message:

Generic GCM: Upgrade of the 'create_make_gcm' script: objects are removed from the libraries before compilation, which enforces that the gcm will fail to compile if any routine failed to compile.
Get rid of 'tmp' file; it has nothing to do in the svn repository.
EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• create_make_gcm (modified) (2 diffs)
• tmp (deleted)

trunk/LMDZ.GENERIC/README

@@ -546 +546 @@
   "datafile.h" into a F90 module "datafile_mod.F90" and spread this change
   to all routines that used to use "datafile.h".
+
+== 10/11/2011 == EM
+- Upgrade of the 'create_make_gcm' script: objects are removed from the
+  libraries before compilation, which enforces that the gcm will fail to
+  compile if any routine failed to compile.

trunk/LMDZ.GENERIC/create_make_gcm

@@ -222 +222 @@
          done
          echo $str1
+         # Compile in LOCAL_DIR directory, and before compiling,
+         # remove the object from the library
+         echo ' cd $(LOCAL_DIR); \'
+         echo ' $(AR) d $(LIBO)/lib'$diri'.a '$fili'.o ; \'
          if [ "$F90" -eq '0' ] ; then
-           echo '       cd $(LOCAL_DIR); \'
-           echo '       $(COMPILE) $(LIBF)/'$diri'/'$trufile' ; \'
+         ## 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 Fortran 90
+              echo '    $(COMPTRU90) $(LIBF)/'$diri'/'$trufile' ; \'
            else
-              echo '    $(COMPILE90) $(LIBF)/'$diri'/'$trufile' ; \'
+           ## Fixed Form Fortran 90
+              echo '    $(COMPILE90) $(LIBF)/'$diri'/'$trufile' ; \'
            fi
            MODU=0; egrep -i '^ *module ' $trufile> /dev/null 2>&1 && MODU=1
@@ -245 +251 @@
            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)'