Changeset 13080

Timestamp:

08/17/12 12:50:53 (13 years ago)

Author:

Eric.Larour

Message:

CHG: need ADOLC_VERSION for compile with old versions of adolc or new dvpt versions.
Also shielded tape_stats routine using the new ADOLC_VERSION version number.

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/solutions/issm.cpp (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -474 +474 @@
         AC_MSG_RESULT($HAVE_ADOLC)
         dnl }}}
+        dnl adolc-version{{{
+        AC_ARG_WITH([adolc-version],
+                AS_HELP_STRING([--with-adolc-version=number], [adolc version.]),
+                [ADOLC_VERSION=$withval],[ADOLC_VERSION=2]) 
+        AC_MSG_CHECKING(for adolc-version) 
+
+        AC_DEFINE_UNQUOTED([_ADOLC_VERSION_],$ADOLC_VERSION,[ADOLC version])
+        AC_MSG_RESULT($ADOLC_VERSION)
+        dnl }}}
         dnl adic2{{{
         AC_ARG_WITH([adic2-dir],

issm/trunk-jpl/src/c/solutions/issm.cpp

@@ -15 +15 @@
 
         /*AD: */
-        int   tape_stats[11];
+        #if _ADOLC_VERSION_ == 2
+        int      tape_stats[11];
+        #else
+        size_t   tape_stats[11];
+        #endif
 
         /*FemModel: */