Changeset 519 for trunk/LMDZ.MARS/create_make_gcm

Timestamp:

Feb 9, 2012, 3:48:30 PM (13 years ago)

Author:

emillour

Message:

Mars GCM:

• Updated the makegcm(s) so that default behaviour is to set LMDGCM env variable to be the directory in which the makegcm script is. Updated the makegcm_* to use "SOURCE" to identify main program to compile.
• Adapted "create_make_gcm" script so that it can compile a main program that is either something.F or something.F90. Also added that object files are removed from archive before compiling a new version.

EM

File:

• trunk/LMDZ.MARS/create_make_gcm (modified) (3 diffs)

trunk/LMDZ.MARS/create_make_gcm

@@ -109 +109 @@
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'
-echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(PROG).F -o $(PROG).o ; \'
+echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
 if [ "$CRAY" = '0' ] ; then
 echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_FILTRE) $(L_AERONOMARS) $(L_PHY) $(L_BIBIO) $(L_DYN) $(L_AERONOMARS) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
@@ -219 +219 @@
          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); \'
+         ## Fixed Form Fortran 77
            echo '       $(COMPILE) $(LIBF)/'$diri'/'$trufile' ; \'
          else
+         ## Fortran 90
            echo '       cd $(LOCAL_DIR); \'
            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
+           ## If a module, handle created module descriptor file
            MODU=0; egrep -i '^ *module ' $trufile> /dev/null 2>&1 && MODU=1
             if [ "$MODU" -eq '1' -a "$CRAY" != '1' ] ; then
@@ -242 +250 @@
            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)'