Changeset 14998

Timestamp:

05/09/13 23:53:42 (12 years ago)

Author:

Eric.Larour

Message:

CHG: had to define min and max for IssmPDouble in adolc mode.

Location:

issm/trunk-jpl/src/c

Files:

• shared/Numerics/extrema.cpp (modified) (1 diff)
• shared/Numerics/numerics.h (modified) (2 diffs)
• toolkits/issm/IssmSeqVec.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Numerics/extrema.cpp

@@ -27 +27 @@
         else return b;
 }
+
+#ifdef _HAVE_ADOLC_
+IssmPDouble  min(IssmPDouble a,IssmPDouble b){
+        if (a<b)return a;
+        else return b;
+}
+IssmPDouble  max(IssmPDouble a,IssmPDouble b){
+        if (a>b)return a;
+        else return b;
+}
+#endif
+
+

issm/trunk-jpl/src/c/shared/Numerics/numerics.h

@@ -5 +5 @@
 #ifndef _NUMERICS_H_
 #define  _NUMERICS_H_
+
+#ifdef HAVE_CONFIG_H
+        #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
 
 #include "./Verbosity.h"
@@ -17 +23 @@
 IssmDouble  min(IssmDouble a,IssmDouble b);
 IssmDouble  max(IssmDouble a,IssmDouble b);
+
+#ifdef _HAVE_ADOLC_
+IssmPDouble  min(IssmPDouble a,IssmPDouble b);
+IssmPDouble  max(IssmPDouble a,IssmPDouble b);
+#endif
+
 int         min(int a,int b);
 int         max(int a,int b);

issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h

@@ -17 +17 @@
 #endif
 
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/io/Print/Print.h"
-#include "../../shared/MemOps/MemOps.h"
+#include "../../shared/shared.h"
 #include <math.h>