Changeset 1391 for trunk/LMDZ.COMMON/create_make_gcm

Timestamp:

Mar 6, 2015, 3:12:12 PM (10 years ago)

Author:

emillour

Message:

Common dynamical core:
Updates in the dynamics to keeup up with updates in LMDZ5
(up to LMDZ5 trunk rev 2200):

• compilation:
• create_make_gcm : added processing of .f & .f90 files (not just .F and .F90)
• makelmdz: add "mix" option for -io (ouptut with both IOIPSL and XIOS)
• makelmdz_fcm: add "mix" option for -io

• filtrez:
• acc.F and eigen.F : add "implicit none" and variable declarations

• bibio:
• handle_err_m.F90: replace "stop" with call to abort_gcm()
• i1mach.F, j4save.F: add "implicit none" and variable declarations
• xercnt.F, xermsg.F, xerprn.F, xersve.F, xgetua.F: add "implicit none" and variable declarations

• dyn3d_common:
• disvert.F90 : added comments on meaning of "pa" variable
• grid_atob.F : better control on level of default ouputs
• infotrac.F90: update Earth-specific stuff (nqo water tracers)
• interpre.F: correction on the size of input array w
• juldate.F, massbar.F, ppm3d.F, ran1.F: add "implicit none" and variable declarations
• sortvarc.F: code cleanup
• iniacademic.F90: cleanup and extra sanity check.

• dyn3d:
• abort_gcm.F: additions for XIOS
• conf_gcm.F90: transformed to free form from conf_gcm.F
• gcm.F: added test to check that iphysiq is a multiple of iperiod
• getparam.F90, guidz_mod.F: update from LMDZ5
• integrd.F: replace stop with call_abort()

• dyn3dpar:
• abort_gcm.F: minor cleanup
• gcm.F: added test to check that iphysiq is a multiple of iperiod
• getparam.F90, guide_p_mod.F90: update from LMDZ5
• integrd_p.F: abort with call_abort when there is negative surface pressure
• leapfrog_p.F: add INCA specific stuff to keep up with current LMDZ5
• conf_gcm.F90: transformed to free form from conf_gcm.F

EM

File:

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

trunk/LMDZ.COMMON/create_make_gcm

@@ -136 +136 @@
 
    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
          # Check if file is a routine or main program
          # i.e: look for the "program" keword preceeded by leading spaces
@@ -150 +150 @@
          fi
       done
-      for fili in `ls $diri/*.F90 $diri/*/*.F90` ; do
+      for fili in `ls $diri/*.[fF]90 $diri/*/*.[fF]90` ; do
          # Check if file is a routine or main program
          # i.e. look for "program" keyword (with possibly some leading spaces)
@@ -214 +214 @@
                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)'