Changeset 1157 for XIOS/dev/branch_yushan_merged/make_xios

Timestamp:

06/06/17 17:09:31 (7 years ago)

Author:

yushan

Message:

branch re-merged with trunk @1156

File:

• XIOS/dev/branch_yushan_merged/make_xios (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/make_xios

@@ -47 +47 @@
          "--job")   job=$2              ; shift ; shift ;;
          "--netcdf_lib")   netcdf_lib=$2 ; shift ; shift ;;
-         "--memtrack")   use_memtrack="true" ; shift ;;
-         *)         code="$1"           ; shift ;;
-      esac
-   done
+         "--memtrack")  use_memtrack="true" memtrack=$2  ; shift ; shift ;;
+          *)         code="$1"           ; shift ;;
+       esac
+    done
 
 # Installation des sources
@@ -172 +172 @@
 if [[ "$use_memtrack" == "true" ]]
    then
-   XIOS_LIB="$ADDR2LINE_LIBDIR $ADDR2LINE_LIB $XIOS_LIB"
    XIOS_CPPKEY="$XIOS_CPPKEY XIOS_MEMTRACK"
+   if [[ "$memtrack" == "light" ]]
+    then
+        XIOS_CPPKEY="$XIOS_CPPKEY XIOS_MEMTRACK_LIGHT"
+    elif [[ "$memtrack" == "FULL"  ]]
+    then
+      XIOS_LIB="$ADDR2LINE_LIBDIR $ADDR2LINE_LIB $XIOS_LIB"
+      XIOS_CPPKEY="$XIOS_CPPKEY XIOS_MEMTRACK_FULL"
+    else
+        echo "Bad choice for --memtrack argument : choose between 'light','full'"
+        exit
+    fi
 fi