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

../trunk-jpl/src/c/toolkits/adolc/adolcincludes.h

@@ +1 @@
+/* \file adolcincludes.h
+ * \brief all includes for ADOLC layer
+ */
+
+#ifndef _ADOLC_PATCHES_INCLUDES_H_
+#define _ADOLC_PATCHES_INCLUDES_H_
+
+#include "./AdolcEdf.h"
+
+#endif

../trunk-jpl/src/c/toolkits/adolc/AdolcEdf.h

@@ +1 @@
+/*
+ * adolc_edf.h
+ *
+ *  Created on: Jun 26, 2012
+ *      Author: utke
+ */
+
+#ifndef _ADOLC_EDF_H_
+#define _ADOLC_EDF_H_
+
+#ifdef HAVE_CONFIG_H
+        #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
+
+struct Adolc_edf {
+    ext_diff_fct *myEDF_for_solverx_p;
+    Adolc_edf() : myEDF_for_solverx_p(0) {}
+    inline friend std::ostream& operator << ( ostream&, const Adolc_edf& );
+};
+
+std::ostream& operator << ( std::ostream& out, const Adolc_edf& a) {
+    out << a.myEDF_for_solverx_p;
+    return out;
+}
+
+#endif
+
+#endif

../trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp

@@ -10 +10 @@
 #endif
 
 #include "../../shared/shared.h"
-#include "../../classes/AdolcEdf.h"
+#include "../adolc/adolcincludes.h"
 #include "../../classes/Params/GenericParam.h"
 #include "../../classes/Params/Parameters.h"
 #include "./gslincludes.h"

../trunk-jpl/src/c/toolkits/toolkits.h

@@ -27 +27 @@
 #include "./gsl/gslincludes.h"
 #endif
 
+#ifdef _HAVE_ADOLC_
+#include "./adolc/adolcincludes.h"
+#endif
+
+#ifdef _HAVE_TRIANGLE_
 #include "./triangle/triangleincludes.h"
+#endif
+
 #include "./objects/toolkitobjects.h"
 #include "./toolkitsenums.h"
 #include "./issm/issmtoolkit.h"

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

@@ -59 +59 @@
                                         ./classes/Segment.h\
                                         ./classes/Vertex.h\
                                         ./classes/Vertex.cpp\
-                                        ./classes/AdolcEdf.h\
                                         ./classes/Hook.h\
                                         ./classes/Hook.cpp\
                                         ./classes/Patch.h\
@@ -225 +224 @@
                                         ./toolkits/issm/IssmVec.h\
                                         ./toolkits/issm/IssmSolver.h\
                                         ./toolkits/issm/IssmSolver.cpp\
+                                        ./toolkits/adolc/adolcincludes.h\
+                                        ./toolkits/adolc/AdolcEdf.h\
                                         ./toolkits/ToolkitOptions.h\
                                         ./toolkits/ToolkitOptions.cpp\
                                         ./toolkits/triangle/triangleincludes.h\

../trunk-jpl/src/c/classes/AdolcEdf.h

@@ -1 @@
-/*
- * adolc_edf.h
- *
- *  Created on: Jun 26, 2012
- *      Author: utke
- */
-
-#ifndef _ADOLC_EDF_H_
-#define _ADOLC_EDF_H_
-
-#ifdef HAVE_CONFIG_H
-        #include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
-
-struct Adolc_edf {
-    ext_diff_fct *myEDF_for_solverx_p;
-    Adolc_edf() : myEDF_for_solverx_p(0) {}
-    inline friend std::ostream& operator << ( ostream&, const Adolc_edf& );
-};
-
-std::ostream& operator << ( std::ostream& out, const Adolc_edf& a) {
-    out << a.myEDF_for_solverx_p;
-    return out;
-}
-
-#endif
-
-#endif

../trunk-jpl/src/c/classes/classes.h

@@ -156 +156 @@
 #include "./Update.h"
 #include "./FemModel.h"
 #include "./GiaDeflectionCoreArgs.h"
-#include "./AdolcEdf.h"
 #include "./RiftStruct.h"
 
 #endif