Changeset 1695 for trunk/LMDZ.COMMON/makelmdz_fcm

Timestamp:

Apr 17, 2017, 4:10:07 PM (8 years ago)

Author:

emillour

Message:

Common dynamics/framework:
Removed some obsolete arch files.
Reorganization of the way paths to external libraries are handles by makelmdz_fcm and makelmdz. This will ease interfacing with Dynamico which follows simillar rules with respect to a given external library ,e.g. for SOMELIBRARY, in the arch.path file:
SOMELIBRARY_LIBDIR="-L/path/to/the/library/libdir -L/possible/other/required/path"
SOMELIBRARY_LIB"-lsomelib -lsomeotherrequiredlib"
SOMELIBRARY_INCDIR"-I/path/to/the/library/incdir -I/possible/other/required/include/path"
EM

File:

• trunk/LMDZ.COMMON/makelmdz_fcm (modified) (6 diffs)

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -338 +338 @@
    CPP_KEY="$CPP_KEY INCA"
    INCLUDE="$INCLUDE -I${INCA_INCDIR}"
-   LIB="$LIB -L${INCA_LIBDIR} -lchimie"
+   LIB="$LIB -L${INCA_LIBDIR} ${INCA_LIB}"
 fi
 
@@ -349 +349 @@
         export OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
         INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
-        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lmpp_io"
+        LIB="$LIB -L${OASIS_LIBDIR} ${OASIS_LIB}"
     else
         CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
         INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
-        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
+        LIB="$LIB -L${OASIS_LIBDIR} ${OASIS_LIB}"
     fi
 fi
@@ -394 +394 @@
 #    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}"
+   INCLUDE="${INCLUDE} ${ORCHIDEE_INCDIR}"
    CPP_KEY="$CPP_KEY CPP_VEGET"
 # temporary, for Orchidee versions 1.9.* (before openmp activation)
@@ -405 +405 @@
       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
+   LIB="${LIB} -L${ORCHIDEE_LIBDIR} ${ORCHIDEE_LIB}"
 elif [[ "$veget" != "false" ]] ; then
    echo "Option -v $veget does not exist"
@@ -444 +439 @@
 then
    CPP_KEY="$CPP_KEY CPP_IOIPSL"
-   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
+   INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
+   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
 elif [[ $io == mix ]]
 then
    # For now, xios implies also using ioipsl
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
-   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
+   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
+   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
 elif [[ $io == xios ]]
 then
    # For now, xios implies also using ioipsl
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
-   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
+   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
+   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
 fi
 
@@ -488 +483 @@
 fi
 
+# NETCDF library include/library paths
 INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
-LIB="$LIB ${NETCDF_LIBDIR}"
+LIB="$LIB ${NETCDF_LIBDIR} ${NETCDF_LIB}"
 
 ########################################################################