Changeset 15051

Timestamp:

05/20/13 21:02:43 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moved Solver.h, Vector.h and Matrix.h from classes/toolkits to toolkits/objects, where
it makes more sense.

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• classes/Elements/Elements.cpp (modified) (1 diff)
• classes/classes.h (modified) (1 diff)
• classes/toolkits (deleted)
• modules/Solverx/Solverx.h (modified) (1 diff)
• toolkits/objects (added)
• toolkits/objects/Matrix.h (copied) (copied from issm/trunk-jpl/src/c/classes/toolkits/Matrix.h ) (1 diff)
• toolkits/objects/Solver.h (copied) (copied from issm/trunk-jpl/src/c/classes/toolkits/Solver.h ) (1 diff)
• toolkits/objects/Vector.h (copied) (copied from issm/trunk-jpl/src/c/classes/toolkits/Vector.h ) (1 diff)
• toolkits/objects/toolkitobjects.h (copied) (copied from issm/trunk-jpl/src/c/classes/toolkits/toolkitobjects.h )
• toolkits/toolkits.h (modified) (1 diff)

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

@@ -128 +128 @@
                                         ./classes/matrix/ElementVector.h\
                                         ./classes/matrix/ElementVector.cpp\
-                                        ./classes/toolkits/toolkitobjects.h\
-                                        ./classes/toolkits/Matrix.h\
-                                        ./classes/toolkits/Vector.h\
-                                        ./classes/toolkits/Solver.h\
                                         ./classes/Params/Parameters.h\
                                         ./classes/Params/Parameters.cpp\
@@ -233 +229 @@
                                         ./toolkits/ToolkitOptions.cpp\
                                         ./toolkits/triangle/triangleincludes.h\
+                                        ./toolkits/objects/toolkitobjects.h\
+                                        ./toolkits/objects/Matrix.h\
+                                        ./toolkits/objects/Vector.h\
+                                        ./toolkits/objects/Solver.h\
                                         ./toolkitsenums.h\
                                         ./toolkits.h\

issm/trunk-jpl/src/c/classes/Elements/Elements.cpp

@@ -17 +17 @@
 #include "../ExternalResults/GenericExternalResult.h"
 #include "../Patch.h"
-#include "../toolkits/toolkitobjects.h"
+#include "../../toolkits/toolkits.h"
 #include "../../shared/shared.h"
 

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

@@ -140 +140 @@
 #include "./matrix/matrixobjects.h"
 
-/*toolkit objects: */
-#include "./toolkits/toolkitobjects.h"
-
 /*bamg: */
 #include "./bamg/bamgobjects.h"

issm/trunk-jpl/src/c/modules/Solverx/Solverx.h

@@ -12 +12 @@
 #endif
 
-#include "../../classes/toolkits/toolkitobjects.h"
+#include "../../toolkits/toolkits.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/toolkits/objects/Matrix.h

@@ -15 +15 @@
 #endif
 #include <cstring>
-#include "../../toolkits/toolkits.h"
 #include "../../shared/Enum/Enum.h"
+#include "../issm/issmtoolkit.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/toolkits/objects/Solver.h

@@ -11 +11 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-#include "../../toolkits/toolkits.h"
 #include "./Matrix.h"
 #include "./Vector.h"
+#include "../issm/issmtoolkit.h"
 class Parameters;
 

issm/trunk-jpl/src/c/toolkits/objects/Vector.h

@@ -15 +15 @@
 #endif
 #include <cstring>
-#include "../../toolkits/toolkits.h"
 #include "../../shared/Enum/Enum.h"
+#include "../issm/issmtoolkit.h"
 /*}}}*/
 

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

@@ -29 +29 @@
 
 #include "./triangle/triangleincludes.h"
+#include "./objects/toolkitobjects.h"
 #include "./toolkitsenums.h"
 #include "./issm/issmtoolkit.h"