Changeset 1403 for trunk/LMDZ.MARS/makegcm_ifort

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.MARS/makegcm_ifort (modified) (12 diffs)

trunk/LMDZ.MARS/makegcm_ifort

@@ -8 +8 @@
 set physique=mars
 set phys="PHYS=$physique"
-set include='-I$(LIBF)/grid -I$(LIBF)/bibio -I. -I$(LIBF)/aeronomars'
+set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
 set ntrac = 1
 set filtre=filtrez
@@ -14 +14 @@
 set dyntype="dyn"
 set full=""
+#src_dirs: directories containing source files 
+set src_dirs="grid misc" 
+
 ########################################################################
 # path a changer contenant les sources et les objets du modele
@@ -416 +419 @@
 if ( "$physique" == 'nophys' ) then
    set phys="L_PHY= LIBPHY="
-endif
-
+else
+   set src_dirs="$src_dirs aerono$physique phy$physique"
+   set include="$include "'-I$(LIBF)/aerono'"$physique"' -I$(LIBF)/phy'"$physique"
+endif
+set libdyn_phy=""
+set LIBDYN_PHYS=""
 ########################################################################
 # choix du nombre de traceur par defaut si il n'a pas ete choisi,
@@ -499 +506 @@
   set include="$include "'-I$(LIBF)/dyn2d '
   set dimh=$dim
-else
+endif
+if ( "$dimc" == "3" ) then
   if ( "$dyntype" == "olddyn" ) then
     set include="$include "'-I$(LIBF)/olddyn3d '
+    set src_dirs="$src_dirs olddyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
   else
     set include="$include "'-I$(LIBF)/dyn3d '
+    set src_dirs="$src_dirs dyn3d dynlonlat_phylonlat dynlonlat_phylonlat/phy$physique"
   endif
+  set libdyn_phy="-ldynlonlat_phylonlat"
+  set LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
   set dimh=`echo $dim | awk ' { print $1 "." $2 } '`
 endif
@@ -563 +575 @@
 ## NB: we still need to have L_DYN=libdyn3d to reach routines and module
 ## objects which are located in dyn3d
-  set dyn="L_DYN=-ldyn3d DYN= L_FILTRE= DIRMAIN=phy$physique "
+  set dyntype=""
+  set filtre="L_DYN= DYN= FILTRE= L_FILTRE= "
+  set dyn="L_DYN= DYN= L_FILTRE= "
+  set dirmain="phy$physique/dyn1d"
+  set src_dirs="$src_dirs phy$physique/dyn1d "
+  set include="$include "' -I$(LIBF)/phy'"$physique"'/dyn1d'
 endif
 endif
@@ -603 +620 @@
 if ( `expr $dimc \> 2` == 1 ) then
    set filtre="FILTRE=$filtre"
+   if ( "$dyntype" == "olddyn" ) then
+     set src_dirs="$src_dirs oldfiltrez"
+   else
+     set src_dirs="$src_dirs filtrez"
+   endif
 else
-   set filtre="FILTRE= L_FILTRE= "
+   set filtre="FILTRE= L_FILTRE= L_DYN= "
 endif
 echo "MACRO FILTRE $filtre"
@@ -646 +668 @@
         \cp tmp90 liste_des_sources_f90
         echo "On recree le makefile"
-        if ("$dyntype" == "olddyn") then
-          ./create_make_gcm olddyn3d grid bibio aeronomars phy$physique >! tmp
-        else
-          ./create_make_gcm dyn3d grid bibio aeronomars phy$physique >! tmp
-        endif
+        echo "src_dirs: $src_dirs"
+        create_make_gcm $src_dirs >! tmp
         \mv tmp makefile
         echo "Nouveau makefile cree."
@@ -750 +769 @@
 cd $localdir
 
-## locate main program (could be in dyn3d or phy$physique
-##                      and could be .F or .F90)
+## locate main program (could be in dyn3d or dynlonlat_phylonlat/phy$physique
+##  or phy$physique/dyn1d   and could be .F or .F90)
 set source_code=${code}.F
+set dirmain=dyn${dimc}d
 if ( -f $LMDGCM/libf/dyn3d/${code}.F90 ) then
   set source_code=${code}.F90
 endif
-if ( -f $LMDGCM/libf/phy${physique}/${code}.F ) then
+if ( -f $LMDGCM/libf/phy${physique}/dyn1d/${code}.F ) then
+  set dirmain=phy${physique}/dyn1d
   set source_code=${code}.F
 endif
-if ( -f $LMDGCM/libf/phy${physique}/${code}.F90 ) then
+if ( -f $LMDGCM/libf/phy${physique}/dyn1d/${code}.F90 ) then
+  set dirmain=phy${physique}/dyn1d
   set source_code=${code}.F90
 endif
-
-## locate directory where main program is located
-if ( $dimension == 3 ) then
-  if ( -f $LMDGCM/libf/dyn3d/${source_code} ) then
-    set dyn="DIRMAIN=dyn3d "
-  endif
-  if ( -f $LMDGCM/libf/phy${physique}/${source_code} ) then
-    set dyn="DIRMAIN=phy${physique} "
-  endif
+if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F ) then
+  set dirmain=dynlonlat_phylonlat/phy${physique}
+  set source_code=${code}.F
+endif
+if ( -f $LMDGCM/libf/dynlonlat_phylonlat/phy${physique}/${code}.F90 ) then
+  set dirmain=dynlonlat_phylonlat/phy${physique}
+  set source_code=${code}.F90
 endif
 
@@ -781 +801 @@
 $filtre \
 LIBO=$libo \
-$dyn \
 $phys \
+LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \
 DYNTYPE="$dyntype" \
+L_DYN_PHY="$libdyn_phy" \
 L_ADJNT="$adjnt" \
 LOCAL_DIR="$localdir"  \
@@ -795 +816 @@
 MOD_SUFFIX=$mod_suffix \
 AR=$ar \
+DIRMAIN=$dirmain \
 SOURCE=$source_code \
 PROG=$code
@@ -807 +829 @@
 $filtre \
 LIBO=$libo \
-$dyn \
 $phys \
+LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \
 DYNTYPE="$dyntype" \
+L_DYN_PHY="$libdyn_phy" \
 L_ADJNT="$adjnt" \
 LOCAL_DIR="$localdir"  \
@@ -821 +844 @@
 MOD_SUFFIX=$mod_suffix \
 AR=$ar \
+DIRMAIN=$dirmain \
 SOURCE=$source_code \
 PROG=$code
 
-# cleanup, remove dimensions.h 
+# cleanup, remove dimensions.h
 \rm -f $libf/grid/dimensions.h