source: issm/oecreview/Archive/17984-18295/ISSM-18124-18125.diff@ 18296

Last change on this file since 18296 was 18296, checked in by Mathieu Morlighem, 11 years ago

Added 17984-18295
File size: 3.1 KB
RevLine 
[18296]1Index: ../trunk-jpl/src/c/shared/Numerics/isnan.cpp
2===================================================================
3--- ../trunk-jpl/src/c/shared/Numerics/isnan.cpp (revision 0)
4+++ ../trunk-jpl/src/c/shared/Numerics/isnan.cpp (revision 18125)
5@@ -0,0 +1,15 @@
6+/*This routine only used by Intel compler: */
7+
8+#ifdef HAVE_CONFIG_H
9+ #include <config.h>
10+#else
11+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
12+#endif
13+
14+#include "isnan.h"
15+
16+#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
17+template <> int xIsNan<adouble> (const adouble& X){
18+ return isnan(X.getValue());
19+}
20+#endif
21Index: ../trunk-jpl/src/c/shared/Numerics/isnan.h
22===================================================================
23--- ../trunk-jpl/src/c/shared/Numerics/isnan.h (revision 18124)
24+++ ../trunk-jpl/src/c/shared/Numerics/isnan.h (revision 18125)
25@@ -24,9 +24,7 @@
26
27 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
28 #include "./types.h"
29-template <> int xIsNan<adouble> (const adouble& X){
30- return isnan(X.getValue());
31-}
32+template <> int xIsNan<adouble> (const adouble& X);
33 #endif
34
35 #endif
36Index: ../trunk-jpl/src/c/shared/MemOps/MemOps.cpp
37===================================================================
38--- ../trunk-jpl/src/c/shared/MemOps/MemOps.cpp (revision 0)
39+++ ../trunk-jpl/src/c/shared/MemOps/MemOps.cpp (revision 18125)
40@@ -0,0 +1,23 @@
41+/*
42+ * MemOps.cpp
43+ *
44+ * Created on: Sep 10, 2013
45+ * Author: utke
46+ */
47+
48+#ifdef HAVE_CONFIG_H
49+ #include <config.h>
50+#else
51+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
52+#endif
53+
54+#include "MemOps.h"
55+
56+#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
57+template <> adouble* xNew(unsigned int size) {
58+ ensureContiguousLocations(size);
59+ adouble* aT_p=new adouble[size];
60+ assert(aT_p);
61+ return aT_p;
62+}
63+#endif
64Index: ../trunk-jpl/src/c/shared/MemOps/MemOps.h
65===================================================================
66--- ../trunk-jpl/src/c/shared/MemOps/MemOps.h (revision 18124)
67+++ ../trunk-jpl/src/c/shared/MemOps/MemOps.h (revision 18125)
68@@ -143,12 +143,7 @@
69
70 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
71 #include "../Numerics/types.h"
72-template <> adouble* xNew(unsigned int size) {
73- ensureContiguousLocations(size);
74- adouble* aT_p=new adouble[size];
75- assert(aT_p);
76- return aT_p;
77-}
78+template <> adouble* xNew(unsigned int size);
79 #endif
80
81 #endif
82Index: ../trunk-jpl/src/c/Makefile.am
83===================================================================
84--- ../trunk-jpl/src/c/Makefile.am (revision 18124)
85+++ ../trunk-jpl/src/c/Makefile.am (revision 18125)
86@@ -174,6 +174,7 @@
87 ./classes/Profiler.cpp\
88 ./shared/shared.h\
89 ./shared/MemOps/MemOps.h\
90+ ./shared/MemOps/MemOps.cpp\
91 ./shared/Matrix/matrix.h\
92 ./shared/Matrix/MatrixUtils.cpp\
93 ./shared/io/io.h\
94@@ -202,6 +203,7 @@
95 ./shared/Numerics/GaussPoints.cpp\
96 ./shared/Numerics/cross.cpp\
97 ./shared/Numerics/isnan.h\
98+ ./shared/Numerics/isnan.cpp\
99 ./shared/Numerics/cubic.cpp\
100 ./shared/Numerics/NewtonSolveDnorm.cpp\
101 ./shared/Numerics/extrema.cpp\
Note: See TracBrowser for help on using the repository browser.