Changeset 2239 for LMDZ5/trunk/makelmdz

Timestamp:

Mar 23, 2015, 8:27:30 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Reorganizing physics/dynamics interface:

• what is related to dynamics-physics interface is now in a seperate directory: dynlmdz_phy* for physics in phy*
• 1d model and related dependencies (including a couple from "dynamics", set up as symbolic links) is now in subdirectory "dyn1d" of phy*.
• "bibio" directory is now "misc" and should only contain autonomous utilities.
• "cosp" is now a subdirectory of phylmd.

EM

File:

• LMDZ5/trunk/makelmdz (modified) (11 diffs)

LMDZ5/trunk/makelmdz

@@ -77 +77 @@
 
 CPP_KEY="" 
-INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. '
+INCLUDE='-I$(LIBF)/grid -I$(LIBF)/misc -I$(LIBF)/filtrez -I. '
 LIB=""
 adjnt=""
@@ -85 +85 @@
 EXT_SRC=""
 #src_dirs: directories containing source files 
-src_dirs="grid bibio" 
+src_dirs="grid misc" 
 ########################################################################
 # lecture des options
@@ -288 +288 @@
    #We'll use some physics
    src_dirs="$src_dirs phy$physique"
+   LIBPHY='$(LIBO)/libphy'"$physique"'.a'
+   lib_phy='-lphy'"$physique"
    CPP_KEY="$CPP_KEY CPP_PHYS"
    if [[ "${physique:0:3}" == "lmd" ]]
@@ -417 +419 @@
 then
    CPP_KEY="$CPP_KEY CPP_COSP"
-   COSP_PATH="$LIBFGCM/cosp"
+   COSP_PATH="$LIBFGCM/phylmd/cosp"
    src_dirs="$src_dirs cosp"
 #   LIB="${LIB} -l${LIBPREFIX}cosp"
@@ -498 +500 @@
 if (( $dimc == 3 )) ; then
    src_dirs="$src_dirs $filtre dyn3d_common dyn3d${FLAG_PARA}"
+   if [[ $physique != "nophys" ]] ; then
+     src_dirs="$src_dirs dynlmdz_phy${physique}"
+     libdyn_phy="-ldynlmdz_phy${physique}"
+     LIBDYN_PHYS='$(LIBO)/libdynlmdz_phy'"${physique}"'.a'
+     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlmdz_phy'"${physique}"
+   fi
    cd $LIBFGCM/grid
    \rm fxyprim.h
@@ -504 +512 @@
    INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} -I$(LIBF)/dyn3d_common '
 elif (( $dimc == 2 )) ; then
+   src_dirs="$src_dirs dyn2d"
    filtre="FILTRE= L_FILTRE= "
    INCLUDE="$INCLUDE "'-I$(LIBF)/dyn2d'
 elif (( $dimc == 1 )) ; then
-   src_dirs="$src_dirs dyn3d dyn3d_common filtrez"
+   #src_dirs="$src_dirs dyn3d dyn3d_common filtrez"
+   src_dirs="$src_dirs phy${physique}/dyn1d"
    CPP_KEY="$CPP_KEY CPP_1D"
-   filtre="L_DYN= DYN= FILTRE= L_FILTRE= DIRMAIN=phy$physique "
-   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d -I$(LIBF)/dyn3d_common ' # Pas tres propre
+   filtre="L_DYN= DYN= FILTRE= L_FILTRE= "
+   #INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d -I$(LIBF)/dyn3d_common ' # Pas tres propre
+   INCLUDE="$INCLUDE "' -I$(LIBF)/phy'"$physique"'/dyn1d'
 else
    echo Dimension dimc=$dimc pas prevu ; exit
@@ -590 +601 @@
 
 source_code=${code}.F
+dirmain=dyn${dimc}d${FLAG_PARA}
 if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]]
 then
   source_code=${code}.F90
 elif [[ -r $LMDGCM/libf/phy$physique/${code}.F90 ]] ; then
+  dirmain=phy$physique
+  source_code=${code}.F90
+elif [[ -r $LMDGCM/libf/dynlmdz_phy$physique/${code}.F90 ]] ; then
+  dirmain=dynlmdz_phy${physique}
+  source_code=${code}.F90
+elif [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F90 ]] ; then
+  dirmain=phy$physique/dyn1d
   source_code=${code}.F90
 fi
@@ -647 +666 @@
 LIBO=${LIBOGCM}/${nomlib} \
 "PHYS=$physique" \
+LIBPHY=${LIBPHY} \
+LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \
 FLAG_PARA=$FLAG_PARA \
+L_PHY="$lib_phy" \
+L_DYN_PHY="$libdyn_phy" \
 L_ADJNT=$adjnt \
 L_COSP="$lcosp" \
@@ -661 +684 @@
 MOD_SUFFIX="mod" \
 AR=$arcommand \
+DIRMAIN=$dirmain \
 SOURCE=$source_code \
 PROG=$code
@@ -673 +697 @@
 LIBO=${LIBOGCM}/${nomlib} \
 "PHYS=$physique" \
+LIBPHY=${LIBPHY} \
+LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \
 FLAG_PARA=$FLAG_PARA \
+L_PHY="$lib_phy" \
+L_DYN_PHY="$libdyn_phy" \
 L_ADJNT=$adjnt \
 L_COSP="$lcosp" \
@@ -687 +715 @@
 MOD_SUFFIX="mod" \
 AR=$arcommand \
+DIRMAIN=$dirmain \
 SOURCE=$source_code \
 PROG=$code