Changeset 1403 for trunk/LMDZ.COMMON/create_make_gcm

Timestamp:

Mar 31, 2015, 3:49:07 PM (10 years ago)

Author:

emillour

Message:

All models: Reorganizing the physics/dynamics interface.

• makelmdz and makelmdz_fcm scripts adapted to handle the new directory settings

• misc: (replaces what was the "bibio" directory)
• Should only contain extremely generic (and non physics or dynamics-specific) routines
• Therefore moved initdynav.F90, initfluxsto.F, inithist.F, writedynav.F90, write_field.F90, writehist.F to "dyn3d_common"

• dynlonlat_phylonlat: (new interface directory)
• This directory contains routines relevent to physics/dynamics grid interactions, e.g. routines gr_dyn_fi or gr_fi_dyn and calfis
• Moreover the dynlonlat_phylonlat contains directories "phy*" corresponding to each physics package "phy*" to be used. These subdirectories should only contain specific interfaces (e.g. iniphysiq) or main programs (e.g. newstart)

• phy*/dyn1d: this subdirectory contains the 1D model using physics from phy*

EM

File:

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

trunk/LMDZ.COMMON/create_make_gcm

@@ -5 +5 @@
 #set -xv
 
+# arguments given to create_make_gcm are the directories to scan
+src_dirs=$*
 
 machine=`hostname`
@@ -48 +50 @@
 fi
 echo "LOCAL_DIR=`echo $localdir`"
-echo 'BIBIO    = $(LIBF)/bibio'
-echo 'DYN3D_COMMON   = $(LIBF)/dyn3d_common'
+echo 'MISC    = $(LIBF)/misc'
+#echo 'DYN3D_COMMON   = $(LIBF)/dyn3d_common'
 echo "FILTRE   = filtre"
 echo "PHYS  = "
 echo 'LIBPHY = $(LIBO)/libphy$(PHYS).a'
+echo 'LIBDYN_PHY = $(LIBO)/libdynlmdz_phy$(PHYS).a'
 echo 'DIRMAIN=dyn$(DIM)d$(FLAG_PARA)'
 echo 'RM=rm'
@@ -61 +64 @@
 echo 'L_DYN      = -ldyn$(DIM)d$(FLAG_PARA) -ldyn3d_common'
 echo 'L_FILTRE   = -l$(FILTRE)'
+echo 'L_DYN_PHY = -ldynlmdz_phy$(PHYS) '
 echo 'L_PHY = -lphy$(PHYS) '
-echo 'L_BIBIO    = -lbibio'
+echo 'L_MISC    = -lmisc'
 echo 'L_ADJNT    ='
 echo 'L_COSP     = -lcosp'
@@ -97 +101 @@
 echo
 #echo 'main : chimie $(DYN) bibio phys $(OPTION_DEP) '
-echo 'main : $(DYN) bibio phys $(OPTION_DEP) '
+echo 'main : $(DYN) misc phys dyn_phy $(OPTION_DEP) '
 echo '  cd $(LIBO) ; $(RANLIB) lib*.a ; cd $(GCM) ;\'
 echo '  cd $(LOCAL_DIR); \'
 echo '  $(COMPILE90) $(LIBF)/$(DIRMAIN)/$(SOURCE) -o $(PROG).o ; \'
-echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_ADJNT) $(L_COSP) $(L_AERONOMARS) $(L_PHY) $(L_DYN) $(L_DYN3D_COMMON) $(L_BIBIO) $(L_DYN3D_COMMON) $(L_PHY) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
+echo '  $(LINK) $(PROG).o -L$(LIBO) $(L_DYN) $(L_DYN_PHY) $(L_ADJNT) $(L_COSP) $(L_AERONOMARS) $(L_PHY) $(L_DYN) $(L_DYN3D_COMMON) $(L_MISC) $(L_DYN3D_COMMON) $(L_PHY) $(L_DYN_PHY) $(L_DYN) $(L_FILTRE) $(OPLINK) $(OPTION_LINK) -o $(LOCAL_DIR)/$(PROG).e ; $(RM) $(PROG).o '
 echo
 echo 'phys : $(LIBPHY)'
@@ -108 +112 @@
 echo 'dyn1d :'
 echo
+echo 'dyn_phy: $(LIBDYN_PHYS)'
 echo
 #echo 'chimie : $(LIBO)/libchimie.a'
 echo
-echo 'bibio : $(LIBO)/libbibio.a'
+echo 'misc : $(LIBO)/libmisc.a'
 echo
 echo 'adjnt : $(LIBO)/libadjnt.a'
@@ -133 +138 @@
 echo
 cd $libf >/dev/null 2>&1
-for diri in ` ls ` ; do
+
+for diri in $src_dirs ; do
 
    if [ -d $diri ] ; then
-   if [ "`ls $diri/*.F $diri/*/*.F`" != "" ] || [ "`ls $diri/*.[fF]90 $diri/*/*.[fF]90`" != "" ]  ; then 
+   if [ "`ls $diri/*.F`" != "" ] || [ "`ls $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/*.[fF] $diri/*/*.[fF]` ; do
+      for fili in `ls $diri/*.[fF]` ; do
          # Check if file is a routine or main program
          # i.e: look for the "program" keword preceeded by leading spaces
@@ -150 +156 @@
          fi
       done
-      for fili in `ls $diri/*.[fF]90 $diri/*/*.[fF]90` ; do
+      for fili in `ls $diri/*.[fF]90` ; do
          # Check if file is a routine or main program
          # i.e. look for "program" keyword (with possibly some leading spaces)
@@ -163 +169 @@
       echo $listlib >> $logfile
       echo
+      # topdiri contains main dir name (without trailing "/blabla" for subdirs)
+      topdiri=${diri%/*}
       echo "#======================================================================="
       echo "# Contenu de la bibliotheque correspondant au Directory "$diri
@@ -170 +178 @@
       do
          fili=`echo $trufile | awk -F/ ' { print $NF } ' | cut -d. -f1`
-         echo '$(LIBO)/lib'$diri".a : " '$(LIBO)/lib'$diri".a("$fili".o)"
+         echo '$(LIBO)/lib'$topdiri".a : " '$(LIBO)/lib'$topdiri".a("$fili".o)"
          echo
       done
-      echo '.PRECIOUS   : $(LIBO)/lib'$diri'.a'
-      echo
-      echo
-      echo "# Compilation des membres de la bibliotheque lib"$diri".a"
+      echo '.PRECIOUS   : $(LIBO)/lib'$topdiri'.a'
+      echo
+      echo
+      echo "# Compilation of elements in $diri of library lib"$topdiri".a"
       echo
       for trufile in $listlib ; do
@@ -183 +191 @@
                  egrep -i '^ *module ' $trufile > /dev/null 2>&1 && F90=1
                  egrep -i '#include*.inc ' $trufile > /dev/null 2>&1 && F90=1
-         str1='$(LIBO)/lib'$diri'.a('$fili'.o) : $(LIBF)/'$trufile
-         [ "$fili" = "chem.subs" ] && str1=$str1' $(LIBF)/'$diri/chem.mods.F
+         str1='$(LIBO)/lib'$topdiri'.a('$fili'.o) : $(LIBF)/'$trufile
+         [ "$fili" = "$diri/chem.subs" ] && str1=$str1' $(LIBF)/'$diri/chem.mods.F
 
 ##########################################################################
@@ -199 +207 @@
             strj=`echo $stri | tr [A-Z] [a-z]`
             str2=""
-            for dirinc in filtrez bibio dyn3d_common grid dyn3d phy* $diri $diri/*/ ; do
+            for dirinc in $src_dirs ; do
 # Recherche dans l'ordre hierarchique inverse car seule la derniere
 # ligne est conservee
-               if [ $dirinc = phydev ] ; then
-                   dirstr='$(PHYS)'
-                   libstr='phy$(PHYS)'
-               else
+#               if [ $dirinc = phydev ] ; then
+#                   dirstr='$(PHYS)'
+#                   libstr='phy$(PHYS)'
+#               else
                    dirstr=$dirinc
                    libstr=$dirinc
-               fi
+#               fi
                echo dirinc $dirinc >> $logfile
                if [ -f $dirinc/$stri ] ; then
@@ -238 +246 @@
          # object from library
          echo ' cd $(LIBO); \'
-         echo ' $(AR) d $(LIBO)/lib'$diri'.a '$fili'.o ; \'
+         echo ' $(AR) d $(LIBO)/lib'$topdiri'.a '$fili'.o ; \'
          if [ "$F90" -eq '0' ] ; then
          ## Fixed Form Fortran 77
@@ -252 +260 @@
          fi
          # Put generated object in library
-         echo ' $(AR) r $(LIBO)/lib'$diri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
+         echo ' $(AR) r $(LIBO)/lib'$topdiri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
          echo ' cd $(GCM)'
          echo
@@ -303 +311 @@
                str1='$(LIBF)/'$diri'/'$stri
             else
-               for dirinc in dyn3d grid bibio
+               for dirinc in dyn3d grid misc
                do
                   if [ -f ../$dirinc/$stri ] ; then