Changeset 23244

Timestamp:

09/10/18 21:23:01 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: integrating changes from CoDiPack's branche

Location:

issm/trunk-jpl/src/c/shared/Numerics

Files:

• extrema.cpp (modified) (2 diffs)
• isnan.cpp (modified) (1 diff)
• isnan.h (modified) (1 diff)
• numerics.h (modified) (1 diff)
• recast.h (modified) (2 diffs)
• types.h (modified) (1 diff)

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

@@ -11 +11 @@
 #include "./types.h"
 
+#ifndef _HAVE_CODIPACK_// already defined in codipack headers
 IssmDouble min(IssmDouble a,IssmDouble b){
         if (a<b)return a;
         else return b;
 }
+#endif
 int min(int a,int b){
         if (a<b)return a;
         else return b;
 }
+#ifndef _HAVE_CODIPACK_// already defined in codipack headers
 IssmDouble max(IssmDouble a,IssmDouble b){
         if (a>b)return a;
         else return b;
 }
+#endif
 int max(int a,int b){
         if (a>b)return a;
@@ -28 +32 @@
 }
 
-#ifdef _HAVE_ADOLC_
+#ifdef _HAVE_AD_
 IssmPDouble  min(IssmPDouble a,IssmPDouble b){
         if (a<b)return a;

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

@@ -13 +13 @@
   return std::isnan(X.getValue());
 }
-#endif
-
-#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
 template <> int xIsInf<adouble> (const adouble& X){
   return std::isinf(X.getValue());
 }
 #endif
+
+#if defined(_HAVE_CODIPACK_) && !defined(_WRAPPERS_)
+template <> int xIsNan<IssmDouble> (const IssmDouble& X){
+          return std::isnan(X.getValue());
+}
+template <> int xIsInf<IssmDouble> (const IssmDouble& X){
+        return std::isinf(X.getValue());
+}
+#endif

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

@@ -33 +33 @@
 #endif
 
+#if defined(_HAVE_CODIPACK_) && !defined(_WRAPPERS_)
+#include "./types.h"
+template <> int xIsNan<IssmDouble> (const IssmDouble& X);
+template <> int xIsInf<IssmDouble> (const IssmDouble& X);
 #endif
+
+#endif

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

@@ -20 +20 @@
 #include "./OptPars.h"
 
+#if !defined(_HAVE_CODIPACK_)
+// already defined in codipack headers
 IssmDouble  min(IssmDouble a,IssmDouble b);
 IssmDouble  max(IssmDouble a,IssmDouble b);
+#endif
 
-#ifdef _HAVE_ADOLC_
+#ifdef _HAVE_AD_
 IssmPDouble  min(IssmPDouble a,IssmPDouble b);
 IssmPDouble  max(IssmPDouble a,IssmPDouble b);

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

@@ -15 +15 @@
 #endif
 
-#if !defined(_HAVE_ADOLC_) || defined(_WRAPPERS_)
+#if !defined(_HAVE_AD_) || defined(_WRAPPERS_)
 
 template<class To, class From> To reCast(const From& from) {
@@ -34 +34 @@
  * partial specialization
  */
+#ifdef _HAVE_ADOLC_
 template<class To> struct ForPartialSpecialization<To,adouble> {
     static  To reCast(const adouble& from ) { return (To) (from.getValue());}
 };
+#endif
+#ifdef _HAVE_CODIPACK_
+template<class To> struct ForPartialSpecialization<To,IssmDouble> {
+            static  To reCast(const IssmDouble& from ) { return (To) (from.getValue());}
+};
+#endif
 
 #endif

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

@@ -22 +22 @@
 
 #if defined(_HAVE_ADOLC_) &&  !defined(_WRAPPERS_)
+/*ADOLC typedefs*/
 #include "adolc/adolc.h"
-// for active variables
-typedef adouble IssmDouble;
-// for passive variables
+typedef adouble IssmDouble; /*for active variables*/
+typedef double IssmPDouble; /*for passive variables*/
+
+#elif defined(_HAVE_CODIPACK_) && !defined(_WRAPPERS_)
+/*CoDiPack typedefs*/
+#include <codi.hpp>
+typedef codi::RealReverse IssmDouble;
 typedef double IssmPDouble;
+
+/*Non-AD typedefs*/
 #else 
-// see above
 typedef double IssmDouble; 
-// see above
 typedef IssmDouble IssmPDouble;
 #endif