Changeset 2242 for LMDZ5/trunk/makelmdz

Timestamp:

Mar 24, 2015, 9:08:43 AM (10 years ago)

Author:

Ehouarn Millour

Message:

Further reorganizing of the physics-dynamics interface.
Things related to dynamics grid and physics grid go in "dynlonlat_phylonlat".
Any physics phy* related stuff (e.g. iniphysiq, ce0l) goes in a phy* subdirectory of dynlonlat_phylonlat.
EM

File:

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

LMDZ5/trunk/makelmdz

@@ -501 +501 @@
    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}"
+     src_dirs="$src_dirs dynlonlat_phylonlat dynlonlat_phylonlat/phy${physique}"
+     libdyn_phy="-ldynlonlat_phylonlat"
+     LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
+     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat'
+     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat_'"${physique}"
    fi
    cd $LIBFGCM/grid
@@ -608 +609 @@
   dirmain=phy$physique
   source_code=${code}.F90
-elif [[ -r $LMDGCM/libf/dynlmdz_phy$physique/${code}.F90 ]] ; then
-  dirmain=dynlmdz_phy${physique}
+elif [[ -r $LMDGCM/libf/dynlonlat_phylonlat/phy$physique/${code}.F90 ]] ; then
+  dirmain="dynlonlat_phylonlat/phy${physique}"
   source_code=${code}.F90
 elif [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F90 ]] ; then