Changeset 15396 for issm/trunk/src/c/shared/Numerics/extrema.cpp

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/shared/Numerics/extrema.cpp (modified) (2 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -9 +9 @@
 #endif
 
-#include "../../include/include.h"
+#include "./types.h"
 
 IssmDouble min(IssmDouble a,IssmDouble b){
@@ -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

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache