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

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.cpp (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.cpp

@@ -1 @@
-/*This routine only used by Intel compler: */
-
 #ifdef HAVE_CONFIG_H
    #include <config.h>
@@ -7 +5 @@
 #endif
 
+/*Special overloading definitions for AD*/
 #include "./isnan.h"
 
 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
-template <> int xIsNan<adouble> (const adouble& X){
-  return std::isnan(X.getValue());
-}
-template <> int xIsInf<adouble> (const adouble& X){
-  return std::isinf(X.getValue());
-}
+template <> int xIsNan<adouble> (const adouble& X){ return std::isnan(X.getValue()); }
+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());
-}
+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

@@ -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