Changeset 18125

Timestamp:

06/09/14 09:49:48 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: reverting back, AD does not compile like that (multiple definitions)

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• shared/MemOps/MemOps.cpp (added)
• shared/MemOps/MemOps.h (modified) (1 diff)
• shared/Numerics/isnan.cpp (added)
• shared/Numerics/isnan.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -175 +175 @@
                                         ./shared/shared.h\
                                         ./shared/MemOps/MemOps.h\
+                                        ./shared/MemOps/MemOps.cpp\
                                         ./shared/Matrix/matrix.h\
                                         ./shared/Matrix/MatrixUtils.cpp\
@@ -203 +204 @@
                                         ./shared/Numerics/cross.cpp\
                                         ./shared/Numerics/isnan.h\
+                                        ./shared/Numerics/isnan.cpp\
                                         ./shared/Numerics/cubic.cpp\
                                         ./shared/Numerics/NewtonSolveDnorm.cpp\

issm/trunk-jpl/src/c/shared/MemOps/MemOps.h

@@ -144 +144 @@
 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
 #include "../Numerics/types.h"
-template <> adouble*  xNew(unsigned int size) {
-        ensureContiguousLocations(size);
-        adouble* aT_p=new adouble[size];
-        assert(aT_p);
-        return aT_p;
-}
+template <> adouble*  xNew(unsigned int size);
 #endif
 

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

@@ -25 +25 @@
 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
 #include "./types.h"
-template <> int xIsNan<adouble> (const adouble& X){
-  return isnan(X.getValue());
-}
+template <> int xIsNan<adouble> (const adouble& X);
 #endif