Changeset 24313 for issm/trunk/src/c/shared/Numerics/isnan.h

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/shared/Numerics/isnan.h (modified) (2 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

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

@@ -1 @@
-/*!\file:  isnan.h
- * \brief: only used for intel compiler.
- */ 
-
 #ifndef _XISNAN_H_
 #define _XISNAN_H_
@@ -12 +8 @@
 #endif
 
-/*If include cmath instead of math, isnan on linux64 murdo does not work: */
+/*cmath defines isnan and isinf*/
 #include <cmath>
 
-template <class T> int xIsNan(const T& X) {
 #ifdef _INTEL_WIN_
-                return (X!=X)?1:0;
+template <class T> int xIsNan(const T& X){return (X!=X)?1:0;}
 #else
-                return std::isnan(X);
+template <class T> int xIsNan(const T& X){return std::isnan(X); }
 #endif
-}
+template <class T> int xIsInf(const T& X){return std::isinf(X); }
 
-template <class T> int xIsInf(const T& X) {
-        return std::isinf(X);
-}
+/*Special overloading definitions for AD*/
 
 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota