Changeset 2408 for LMDZ5/branches/testing/makelmdz

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/makelmdz

@@ -296 +296 @@
 then
    #We'll use some physics
-   src_dirs="$src_dirs phy$physique"
+   src_dirs="$src_dirs phy_common phy$physique"
    LIBPHY='$(LIBO)/libphy'"$physique"'.a'
-   lib_phy='-lphy'"$physique"
+   LIBPHY_COMMON='$(LIBO)/libphy_common.a'
+   lib_phy='-lphy'"$physique"' -lphy_common'
    CPP_KEY="$CPP_KEY CPP_PHYS"
    if [[ $phys_root == "lmd" ]]
@@ -690 +691 @@
 "PHYS=$physique" \
 LIBPHY=${LIBPHY} \
+LIBPHY_COMMON=${LIBPHY_COMMON} \
 LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \
@@ -721 +723 @@
 "PHYS=$physique" \
 LIBPHY=${LIBPHY} \
+LIBPHY_COMMON=${LIBPHY_COMMON} \
 LIBDYN_PHYS=${LIBDYN_PHYS} \
 DIM=$dimc \