Changeset 2435 for LMDZ5/branches/testing/makelmdz

Timestamp:

Jan 28, 2016, 5:02:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2396:2434 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• makelmdz (modified) (2 diffs)

LMDZ5/branches/testing/makelmdz

@@ -511 +511 @@
    src_dirs="$src_dirs $filtre dyn3d_common dyn3d${FLAG_PARA}"
    if [[ $physique != "nophys" ]] ; then
-     src_dirs="$src_dirs dynlonlat_phylonlat dynlonlat_phylonlat/phy${phys_root}"
-     libdyn_phy="-ldynlonlat_phylonlat"
-     LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
-     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat'
-     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat/'"phy${phys_root}"
+     src_dirs="$src_dirs dynphy_lonlat dynphy_lonlat/phy${phys_root}"
+     libdyn_phy="-ldynphy_lonlat"
+     LIBDYN_PHYS='$(LIBO)/libdynphy_lonlat.a'
+     INCLUDE="$INCLUDE "'-I$(LIBF)/dynphy_lonlat'
+     INCLUDE="$INCLUDE "'-I$(LIBF)/dynphy_lonlat/'"phy${phys_root}"
    fi
    cd $LIBFGCM/grid
@@ -632 +632 @@
   dirmain=phy$physique
   source_code=${code}.F90
-elif [[ -r $LMDGCM/libf/dynlonlat_phylonlat/phy$phys_root/${code}.F90 ]] ; then
-  dirmain="dynlonlat_phylonlat/phy${phys_root}"
+elif [[ -r $LMDGCM/libf/dynphy_lonlat/phy$phys_root/${code}.F90 ]] ; then
+  dirmain="dynphy_lonlat/phy${phys_root}"
   source_code=${code}.F90
 elif [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F90 ]] ; then