Changeset 2645

Timestamp:

Mar 23, 2022, 10:24:23 AM (3 years ago)

Author:

emillour

Message:

Common Dynamics:
Minor improvement in makelmdz_fcm: rename internal variable "INCLUDE"
as "INCLUDE_DIR" to avoid collisions with environment variable "INCLUDE"
present on some systems.
EM

File:

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

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -65 +65 @@
 
 CPP_KEY="" 
-INCLUDE=""
+INCLUDE_DIR=""
 LIB=""
 adjnt=""
@@ -173 +173 @@
       
       "-include")
-          INCLUDE="$INCLUDE -I$2" ; shift ; shift ;;
+          INCLUDE_DIR="$INCLUDE_DIR -I$2" ; shift ; shift ;;
 
       "-cpp")
@@ -324 +324 @@
 then
    CPP_KEY="$CPP_KEY INCA"
-   INCLUDE="$INCLUDE -I${INCA_INCDIR}"
+   INCLUDE_DIR="$INCLUDE_DIR -I${INCA_INCDIR}"
    LIB="$LIB -L${INCA_LIBDIR} ${INCA_LIB}"
 fi
@@ -335 +335 @@
         export OASIS_INCDIR=$LMDGCM/../../prism/X64/build/lib/psmile.MPI1
         export OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
-        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
+        INCLUDE_DIR="$INCLUDE_DIR -I${OASIS_INCDIR}"
         LIB="$LIB -L${OASIS_LIBDIR} ${OASIS_LIB}"
     else
         CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
-        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
+        INCLUDE_DIR="$INCLUDE_DIR -I${OASIS_INCDIR}"
         LIB="$LIB -L${OASIS_LIBDIR} ${OASIS_LIB}"
     fi
@@ -381 +381 @@
 #    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} ${ORCHIDEE_INCDIR}"
+   INCLUDE_DIR="${INCLUDE_DIR} ${ORCHIDEE_INCDIR}"
    CPP_KEY="$CPP_KEY CPP_VEGET"
 # temporary, for Orchidee versions 1.9.* (before openmp activation)
@@ -426 +426 @@
 then
    CPP_KEY="$CPP_KEY CPP_IOIPSL"
-   INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
+   INCLUDE_DIR="$INCLUDE_DIR ${IOIPSL_INCDIR}"
    LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
 elif [[ $io == mix ]]
@@ -432 +432 @@
    # For now, xios implies also using ioipsl
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
-   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
+   INCLUDE_DIR="$INCLUDE_DIR ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
    LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
 elif [[ $io == xios ]]
@@ -438 +438 @@
    # For now, xios implies also using ioipsl
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
-   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
+   INCLUDE_DIR="$INCLUDE_DIR ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
    LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
 fi
@@ -453 +453 @@
 then
    CHEM_PATH="${LIBFGCM}/chim${physique}"
-   INCLUDE="$INCLUDE -I${LIBFGCM}/chim${physique}"
+   INCLUDE_DIR="$INCLUDE_DIR -I${LIBFGCM}/chim${physique}"
 fi
 
@@ -475 +475 @@
 then
    CLOUD_PATH="${LIBFGCM}/phy${physique}/cloud${physique}"
-   INCLUDE="$INCLUDE -I${LIBFGCM}/phy${physique}/cloud${physique}"
+   INCLUDE_DIR="$INCLUDE_DIR -I${LIBFGCM}/phy${physique}/cloud${physique}"
 fi
 
@@ -482 +482 @@
 then
    AERONO_PATH="${LIBFGCM}/aerono${physique}"
-   INCLUDE="$INCLUDE -I${LIBFGCM}/aerono${physique}"
+   INCLUDE_DIR="$INCLUDE_DIR -I${LIBFGCM}/aerono${physique}"
 fi
 
 # NETCDF library include/library paths
-INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
+INCLUDE_DIR="$INCLUDE_DIR ${NETCDF_INCDIR}"
 LIB="$LIB ${NETCDF_LIBDIR} ${NETCDF_LIB}"
 
@@ -596 +596 @@
   CPP_KEY="$CPP_KEY CPP_1D"
 ##in 1D, add dyn3d to include path (because main prog is in physics)
-  INCLUDE="$INCLUDE -Ilibf/dyn3d -Ilibf/dyn3d_common"
+  INCLUDE_DIR="$INCLUDE_DIR -Ilibf/dyn3d -Ilibf/dyn3d_common"
 ## no filtre in 1d:
   FILTRE_PATH=$LMDGCM/.void_dir
@@ -706 +706 @@
 
 echo "%ARCH          $arch"          >> $config_fcm
-echo "%INCDIR        $INCLUDE"       >> $config_fcm 
+echo "%INCDIR        $INCLUDE_DIR"       >> $config_fcm 
 echo "%LIB           $LIB"           >> $config_fcm
 echo "%ROOT_PATH     $PWD"           >> $config_fcm