source: issm/oecreview/Archive/14312-15392/ISSM-15052-15053.diff@ 15393

Last change on this file since 15393 was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview
File size: 4.4 KB
RevLine 
[15393]1Index: ../trunk-jpl/src/c/toolkits/adolc/adolcincludes.h
2===================================================================
3--- ../trunk-jpl/src/c/toolkits/adolc/adolcincludes.h (revision 0)
4+++ ../trunk-jpl/src/c/toolkits/adolc/adolcincludes.h (revision 15053)
5@@ -0,0 +1,10 @@
6+/* \file adolcincludes.h
7+ * \brief all includes for ADOLC layer
8+ */
9+
10+#ifndef _ADOLC_PATCHES_INCLUDES_H_
11+#define _ADOLC_PATCHES_INCLUDES_H_
12+
13+#include "./AdolcEdf.h"
14+
15+#endif
16Index: ../trunk-jpl/src/c/toolkits/adolc/AdolcEdf.h
17===================================================================
18--- ../trunk-jpl/src/c/toolkits/adolc/AdolcEdf.h (revision 0)
19+++ ../trunk-jpl/src/c/toolkits/adolc/AdolcEdf.h (revision 15053)
20@@ -0,0 +1,32 @@
21+/*
22+ * adolc_edf.h
23+ *
24+ * Created on: Jun 26, 2012
25+ * Author: utke
26+ */
27+
28+#ifndef _ADOLC_EDF_H_
29+#define _ADOLC_EDF_H_
30+
31+#ifdef HAVE_CONFIG_H
32+ #include <config.h>
33+#else
34+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
35+#endif
36+
37+#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
38+
39+struct Adolc_edf {
40+ ext_diff_fct *myEDF_for_solverx_p;
41+ Adolc_edf() : myEDF_for_solverx_p(0) {}
42+ inline friend std::ostream& operator << ( ostream&, const Adolc_edf& );
43+};
44+
45+std::ostream& operator << ( std::ostream& out, const Adolc_edf& a) {
46+ out << a.myEDF_for_solverx_p;
47+ return out;
48+}
49+
50+#endif
51+
52+#endif
53Index: ../trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp
54===================================================================
55--- ../trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp (revision 15052)
56+++ ../trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp (revision 15053)
57@@ -10,7 +10,7 @@
58 #endif
59
60 #include "../../shared/shared.h"
61-#include "../../classes/AdolcEdf.h"
62+#include "../adolc/adolcincludes.h"
63 #include "../../classes/Params/GenericParam.h"
64 #include "../../classes/Params/Parameters.h"
65 #include "./gslincludes.h"
66Index: ../trunk-jpl/src/c/toolkits/toolkits.h
67===================================================================
68--- ../trunk-jpl/src/c/toolkits/toolkits.h (revision 15052)
69+++ ../trunk-jpl/src/c/toolkits/toolkits.h (revision 15053)
70@@ -27,7 +27,14 @@
71 #include "./gsl/gslincludes.h"
72 #endif
73
74+#ifdef _HAVE_ADOLC_
75+#include "./adolc/adolcincludes.h"
76+#endif
77+
78+#ifdef _HAVE_TRIANGLE_
79 #include "./triangle/triangleincludes.h"
80+#endif
81+
82 #include "./objects/toolkitobjects.h"
83 #include "./toolkitsenums.h"
84 #include "./issm/issmtoolkit.h"
85Index: ../trunk-jpl/src/c/Makefile.am
86===================================================================
87--- ../trunk-jpl/src/c/Makefile.am (revision 15052)
88+++ ../trunk-jpl/src/c/Makefile.am (revision 15053)
89@@ -59,7 +59,6 @@
90 ./classes/Segment.h\
91 ./classes/Vertex.h\
92 ./classes/Vertex.cpp\
93- ./classes/AdolcEdf.h\
94 ./classes/Hook.h\
95 ./classes/Hook.cpp\
96 ./classes/Patch.h\
97@@ -225,6 +224,8 @@
98 ./toolkits/issm/IssmVec.h\
99 ./toolkits/issm/IssmSolver.h\
100 ./toolkits/issm/IssmSolver.cpp\
101+ ./toolkits/adolc/adolcincludes.h\
102+ ./toolkits/adolc/AdolcEdf.h\
103 ./toolkits/ToolkitOptions.h\
104 ./toolkits/ToolkitOptions.cpp\
105 ./toolkits/triangle/triangleincludes.h\
106Index: ../trunk-jpl/src/c/classes/AdolcEdf.h
107===================================================================
108--- ../trunk-jpl/src/c/classes/AdolcEdf.h (revision 15052)
109+++ ../trunk-jpl/src/c/classes/AdolcEdf.h (revision 15053)
110@@ -1,32 +0,0 @@
111-/*
112- * adolc_edf.h
113- *
114- * Created on: Jun 26, 2012
115- * Author: utke
116- */
117-
118-#ifndef _ADOLC_EDF_H_
119-#define _ADOLC_EDF_H_
120-
121-#ifdef HAVE_CONFIG_H
122- #include <config.h>
123-#else
124-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
125-#endif
126-
127-#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
128-
129-struct Adolc_edf {
130- ext_diff_fct *myEDF_for_solverx_p;
131- Adolc_edf() : myEDF_for_solverx_p(0) {}
132- inline friend std::ostream& operator << ( ostream&, const Adolc_edf& );
133-};
134-
135-std::ostream& operator << ( std::ostream& out, const Adolc_edf& a) {
136- out << a.myEDF_for_solverx_p;
137- return out;
138-}
139-
140-#endif
141-
142-#endif
143Index: ../trunk-jpl/src/c/classes/classes.h
144===================================================================
145--- ../trunk-jpl/src/c/classes/classes.h (revision 15052)
146+++ ../trunk-jpl/src/c/classes/classes.h (revision 15053)
147@@ -156,7 +156,6 @@
148 #include "./Update.h"
149 #include "./FemModel.h"
150 #include "./GiaDeflectionCoreArgs.h"
151-#include "./AdolcEdf.h"
152 #include "./RiftStruct.h"
153
154 #endif
Note: See TracBrowser for help on using the repository browser.