Changeset 2160 for LMDZ5/branches/testing/create_make_gcm

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/create_make_gcm

@@ -124 +124 @@
 
    if [ -d $diri ] ; then
-   if [ "`ls $diri/*.F $diri/*/*.F`" != "" ] || [ "`ls $diri/*.F90 $diri/*/*.F90`" != "" ]  ; then 
+   if [ "`ls $diri/*.F $diri/*/*.F`" != "" ] || [ "`ls $diri/*.[fF]90 $diri/*/*.[fF]90`" != "" ]  ; then 
 #      cd $diri >/dev/null 2>&1
       echo
       listlib=""
 # Liste des fichiers .F et .F90 n'etant pas des programmes principaux
-      for fili in `ls $diri/*.F $diri/*/*.F` ; do
+      for fili in `ls $diri/*.[fF] $diri/*/*.[fF]` ; do
          test=` (  head $fili | grep '      PROGRAM' ) `
          if [ "$test" = "" ] ; then listlib=$listlib" "$fili ; fi
       done
-      for fili in `ls $diri/*.F90 $diri/*/*.F90` ; do
+      for fili in `ls $diri/*.[fF]90 $diri/*/*.[fF]90` ; do
          test=` (  head $fili | grep 'PROGRAM' ) `
          if [ "$test" = "" ] ; then listlib=$listlib" "$fili ; fi 
@@ -190 +190 @@
                elif [ -f $dirinc/$strj ] ; then
                   str2='$(LIBF)/'$dirstr/$stri
-               elif [ -f $dirinc/$strj.F90 ]  || [ -f $dirinc/$strj.F ]  ; then 
+               elif [ -f $dirinc/$strj.[fF]90 ]  || [ -f $dirinc/$strj.[fF] ]  ; then 
                   strlib=`echo $libstr | awk -F/ ' { print $1 } '`
                   str2='$(LIBO)/lib'$strlib'.a('$strj'.o)'
-               elif [ -f $dirinc/$stri.F90 ]  || [ -f $dirinc/$stri.F ]  ; then 
+               elif [ -f $dirinc/$stri.[fF]90 ]  || [ -f $dirinc/$stri.[fF] ]  ; then 
                   strlib=`echo $libstr | awk -F/ ' { print $1 } '`
                   str2='$(LIBO)/lib'$strlib'.a('$stri'.o)'