Changeset 1811 for LMDZ5/trunk

Timestamp:

Jul 24, 2013, 11:42:06 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Small fix in makelmdz to enable linking with orchidee2.0 library. Added same handling of library dependencies in makelmdz_fcm.
EM

Location:

LMDZ5/trunk

Files:

• makelmdz (modified) (1 diff)
• makelmdz_fcm (modified) (1 diff)

LMDZ5/trunk/makelmdz

@@ -363 +363 @@
    fi
    if [[ "$veget" == "orchidee2.0" ]] ; then
-      listlibs=orchidee
+      orch_libs=orchidee
    else
-      listlibs="sechiba parameters stomate parallel orglob"
+      orch_libs="sechiba parameters stomate parallel orglob"
    fi
    LIB="${LIB} -L${ORCH_LIBDIR}"
-   for lib in sechiba parameters stomate parallel orglob ; do
+   for lib in ${orch_libs} ; do
       if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
          LIB="${LIB} -l${LIBPREFIX}$lib "

LMDZ5/trunk/makelmdz_fcm

@@ -256 +256 @@
 fi
 
-if [[ "$veget" == "orchidee2.0" ]]
-then
-# orchidee2.0 : 
-# Compile with ORCHIDEE 2.0 (or more recent)
+if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" ]
+then
+#NB: option 'true': for backward compatibility. To be used with ORCHIDEE tag 1.9-1.9.6
+#    For this case, cpp flag ORCHIDEE_NOOPENMP must be added to the makelmdz_fcm arguments
+#    option orchidee1.9 : Compile with ORCHIDEE version up to the inclusion of OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
+   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    CPP_KEY="$CPP_KEY CPP_VEGET"
-   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
-   LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}orchidee "
-elif [[ "$veget" == "orchidee1.9" ]]
-then
-# orchidee1.9 : 
-# Compile with ORCHIDEE version up to the inclusion of OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
-   CPP_KEY="$CPP_KEY CPP_VEGET ORCHIDEE_NOOPENMP"
-   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
-   LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
-elif [[ "$veget" == "true" ]]
-then
-# true : 
-# Obsolete, for backward compatibility. To be used with ORCHIDEE tag 1.9-1.9.6
-# For this case, cpp flag ORCHIDEE_NOOPENMP must be added to the makelmdz_fcm arguments
-   CPP_KEY="$CPP_KEY CPP_VEGET"
-   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
-   LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
-elif [[ "$veget" != "false" ]]
-then
+# temporary, for Orchidee versions 1.9.* (before openmp activation)
+   if [[ "$veget" == "orchidee1.9" ]] ; then
+      CPP_KEY="$CPP_KEY ORCHIDEE_NOOPENMP"
+   fi
+   if [[ "$veget" == "orchidee2.0" ]] ; then
+      orch_libs=orchidee
+   else
+      orch_libs="sechiba parameters stomate parallel orglob"
+   fi
+   LIB="${LIB} -L${ORCH_LIBDIR}"
+   for lib in ${orch_libs} ; do
+      if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
+         LIB="${LIB} -l${LIBPREFIX}$lib "
+      fi
+   done
+elif [[ "$veget" != "false" ]] ; then
    echo "Option -v $veget does not exist"
    echo "Use ./makelmdz_fcm -h for more information"