Changeset 15061

Timestamp:

05/21/13 16:10:12 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moved all the bamg objects to bamg. Will progressively try and unplug the bamg and make it into a library.

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/bamg (moved) (moved from issm/trunk-jpl/src/c/classes/bamg )
• c/bamg/BamgGeom.cpp (modified) (1 diff)
• c/bamg/BamgMesh.cpp (modified) (1 diff)
• c/bamg/BamgOpts.cpp (modified) (1 diff)
• c/bamg/BamgQuadtree.cpp (modified) (1 diff)
• c/bamg/BamgQuadtree.h (modified) (1 diff)
• c/bamg/BamgVertex.cpp (modified) (1 diff)
• c/bamg/Curve.h (modified) (1 diff)
• c/bamg/Direction.h (modified) (1 diff)
• c/bamg/Edge.cpp (modified) (1 diff)
• c/bamg/Edge.h (modified) (1 diff)
• c/bamg/EigenMetric.cpp (modified) (1 diff)
• c/bamg/GeomEdge.cpp (modified) (1 diff)
• c/bamg/GeomVertex.cpp (modified) (1 diff)
• c/bamg/Geometry.cpp (modified) (1 diff)
• c/bamg/ListofIntersectionTriangles.cpp (modified) (1 diff)
• c/bamg/Mesh.cpp (modified) (1 diff)
• c/bamg/Metric.cpp (modified) (1 diff)
• c/bamg/Metric.h (modified) (1 diff)
• c/bamg/SetOfE4.cpp (modified) (1 diff)
• c/bamg/Triangle.cpp (modified) (1 diff)
• c/bamg/det.h (modified) (1 diff)
• c/classes/classes.h (modified) (1 diff)
• c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp (modified) (1 diff)
• c/modules/Bamgx/Bamgx.cpp (modified) (1 diff)
• c/modules/Bamgx/Bamgx.h (modified) (1 diff)
• wrappers/matlab/io/matlabio.h (modified) (1 diff)
• wrappers/python/io/pythonio.h (modified) (1 diff)

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

@@ -543 +543 @@
 #}}}
 #Bamg sources  {{{
-bamg_sources =  ./classes/bamg/bamgobjects.h\
-                                ./classes/bamg/BamgGeom.h\
-                                ./classes/bamg/BamgGeom.cpp\
-                                ./classes/bamg/BamgMesh.h\
-                                ./classes/bamg/BamgMesh.cpp\
-                                ./classes/bamg/BamgOpts.h\
-                                ./classes/bamg/BamgOpts.cpp\
-                                ./classes/bamg/CrackedEdge.h\
-                                ./classes/bamg/CrackedEdge.cpp\
-                                ./classes/bamg/Curve.h\
-                                ./classes/bamg/Curve.cpp\
-                                ./classes/bamg/Direction.h\
-                                ./classes/bamg/Direction.cpp\
-                                ./classes/bamg/DoubleAndInt.h\
-                                ./classes/bamg/Edge.h\
-                                ./classes/bamg/Edge.cpp\
-                                ./classes/bamg/GeomEdge.h\
-                                ./classes/bamg/GeomEdge.cpp\
-                                ./classes/bamg/GeomSubDomain.h\
-                                ./classes/bamg/GeomSubDomain.cpp\
-                                ./classes/bamg/GeomVertex.h\
-                                ./classes/bamg/GeomVertex.cpp\
-                                ./classes/bamg/Geometry.cpp\
-                                ./classes/bamg/Geometry.h\
-                                ./classes/bamg/ListofIntersectionTriangles.cpp\
-                                ./classes/bamg/ListofIntersectionTriangles.h\
-                                ./classes/bamg/EigenMetric.cpp\
-                                ./classes/bamg/Metric.cpp\
-                                ./classes/bamg/Metric.h\
-                                ./classes/bamg/BamgQuadtree.cpp\
-                                ./classes/bamg/BamgQuadtree.h\
-                                ./classes/bamg/R2.h\
-                                ./classes/bamg/SetOfE4.cpp\
-                                ./classes/bamg/SetOfE4.h\
-                                ./classes/bamg/SubDomain.h\
-                                ./classes/bamg/SubDomain.cpp\
-                                ./classes/bamg/AdjacentTriangle.h\
-                                ./classes/bamg/AdjacentTriangle.cpp\
-                                ./classes/bamg/Triangle.cpp\
-                                ./classes/bamg/det.h \
-                                ./classes/bamg/Triangle.h\
-                                ./classes/bamg/BamgVertex.cpp\
-                                ./classes/bamg/BamgVertex.h\
-                                ./classes/bamg/VertexOnEdge.h\
-                                ./classes/bamg/VertexOnEdge.cpp\
-                                ./classes/bamg/VertexOnGeom.h\
-                                ./classes/bamg/VertexOnGeom.cpp\
-                                ./classes/bamg/VertexOnVertex.h\
-                                ./classes/bamg/VertexOnVertex.cpp\
-                                ./classes/bamg/Mesh.cpp\
-                                ./classes/bamg/Mesh.h\
+bamg_sources =  ./bamg/bamgobjects.h\
+                                ./bamg/BamgGeom.h\
+                                ./bamg/BamgGeom.cpp\
+                                ./bamg/BamgMesh.h\
+                                ./bamg/BamgMesh.cpp\
+                                ./bamg/BamgOpts.h\
+                                ./bamg/BamgOpts.cpp\
+                                ./bamg/CrackedEdge.h\
+                                ./bamg/CrackedEdge.cpp\
+                                ./bamg/Curve.h\
+                                ./bamg/Curve.cpp\
+                                ./bamg/Direction.h\
+                                ./bamg/Direction.cpp\
+                                ./bamg/DoubleAndInt.h\
+                                ./bamg/Edge.h\
+                                ./bamg/Edge.cpp\
+                                ./bamg/GeomEdge.h\
+                                ./bamg/GeomEdge.cpp\
+                                ./bamg/GeomSubDomain.h\
+                                ./bamg/GeomSubDomain.cpp\
+                                ./bamg/GeomVertex.h\
+                                ./bamg/GeomVertex.cpp\
+                                ./bamg/Geometry.cpp\
+                                ./bamg/Geometry.h\
+                                ./bamg/ListofIntersectionTriangles.cpp\
+                                ./bamg/ListofIntersectionTriangles.h\
+                                ./bamg/EigenMetric.cpp\
+                                ./bamg/Metric.cpp\
+                                ./bamg/Metric.h\
+                                ./bamg/BamgQuadtree.cpp\
+                                ./bamg/BamgQuadtree.h\
+                                ./bamg/R2.h\
+                                ./bamg/SetOfE4.cpp\
+                                ./bamg/SetOfE4.h\
+                                ./bamg/SubDomain.h\
+                                ./bamg/SubDomain.cpp\
+                                ./bamg/AdjacentTriangle.h\
+                                ./bamg/AdjacentTriangle.cpp\
+                                ./bamg/Triangle.cpp\
+                                ./bamg/det.h \
+                                ./bamg/Triangle.h\
+                                ./bamg/BamgVertex.cpp\
+                                ./bamg/BamgVertex.h\
+                                ./bamg/VertexOnEdge.h\
+                                ./bamg/VertexOnEdge.cpp\
+                                ./bamg/VertexOnGeom.h\
+                                ./bamg/VertexOnGeom.cpp\
+                                ./bamg/VertexOnVertex.h\
+                                ./bamg/VertexOnVertex.cpp\
+                                ./bamg/Mesh.cpp\
+                                ./bamg/Mesh.h\
                                 ./shared/Bamg/Abs.h \
                                 ./shared/Bamg/BigPrimeNumber.h\

issm/trunk-jpl/src/c/bamg/BamgGeom.cpp ¶

@@ -1 @@
-#include "../classes.h"
-#include "../../shared/shared.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 
 /*Constructors/Destructors*/

issm/trunk-jpl/src/c/bamg/BamgMesh.cpp ¶

@@ -1 @@
-#include "../classes.h"
-#include "../../shared/shared.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 
 /*Constructors/Destructors*/

issm/trunk-jpl/src/c/bamg/BamgOpts.cpp ¶

@@ -1 @@
-#include "../classes.h"
-#include "../../shared/shared.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 
 /*Constructors/Destructors*/

issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp ¶

@@ -3 +3 @@
 #include <stdlib.h>
 
-#include "../classes.h"
+#include "../classes/classes.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/BamgQuadtree.h ¶

@@ -4 +4 @@
 
 #include "./include.h"
-#include "../Object.h"
+#include "../classes/Object.h"
 class DataSet;
 

issm/trunk-jpl/src/c/bamg/BamgVertex.cpp ¶

@@ -4 +4 @@
 #include <ctime>
 
-#include "../classes.h"
+#include "../classes/classes.h"
 #include "./det.h"
 

issm/trunk-jpl/src/c/bamg/Curve.h ¶

@@ -2 +2 @@
 #define _CURVE_H_
 
-#include "../../shared/Bamg/shared.h"
+#include "../shared/Bamg/shared.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/Direction.h ¶

@@ -3 +3 @@
 
 #include "./include.h"
-#include "../../shared/Bamg/shared.h"
+#include "../shared/Bamg/shared.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/Edge.cpp ¶

@@ -7 +7 @@
 #include "Mesh.h"
 #include "Geometry.h"
-#include "../../shared/io/Print/Print.h"
+#include "../shared/io/Print/Print.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/Edge.h ¶

@@ -3 +3 @@
 
 #include "./BamgVertex.h"
-#include "../../shared/Exceptions/exceptions.h"
+#include "../shared/Exceptions/exceptions.h"
 #include "./GeomEdge.h"
 

issm/trunk-jpl/src/c/bamg/EigenMetric.cpp ¶

@@ -5 +5 @@
 
 #include "Metric.h"
-#include "../../shared/io/Print/Print.h"
+#include "../shared/io/Print/Print.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/GeomEdge.cpp ¶

@@ -3 +3 @@
 #include <cmath>
 
-#include "../../shared/Exceptions/exceptions.h"
+#include "../shared/Exceptions/exceptions.h"
 
 #include "GeomEdge.h"

issm/trunk-jpl/src/c/bamg/GeomVertex.cpp ¶

@@ -5 +5 @@
 
 #include "GeomVertex.h"
-#include "../../shared/Exceptions/exceptions.h"
+#include "../shared/Exceptions/exceptions.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/Geometry.cpp ¶

@@ -4 +4 @@
 #include <ctime>
 
-#include "../classes.h"
-#include "../../shared/Exceptions/exceptions.h"
+#include "../classes/classes.h"
+#include "../shared/Exceptions/exceptions.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/ListofIntersectionTriangles.cpp ¶

@@ -4 +4 @@
 #include <ctime>
 
-#include "../classes.h"
+#include "../classes/classes.h"
 #include "./det.h"
 

issm/trunk-jpl/src/c/bamg/Mesh.cpp ¶

@@ -4 +4 @@
 #include <ctime>
 
-#include "../classes.h"
+#include "../classes/classes.h"
 #include "./det.h"
 

issm/trunk-jpl/src/c/bamg/Metric.cpp ¶

@@ -4 +4 @@
 
 #include "Metric.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/io/Print/Print.h"
+#include "../shared/Exceptions/exceptions.h"
+#include "../shared/io/Print/Print.h"
 
 using namespace std;

issm/trunk-jpl/src/c/bamg/Metric.h ¶

@@ -3 +3 @@
 
 #include "./include.h"
-#include "../../shared/Bamg/shared.h"
+#include "../shared/Bamg/shared.h"
 #include "R2.h"
 #include <math.h>

issm/trunk-jpl/src/c/bamg/SetOfE4.cpp ¶

@@ -1 @@
-#include "../classes.h"
+#include "../classes/classes.h"
 
 using namespace std;

issm/trunk-jpl/src/c/bamg/Triangle.cpp ¶

@@ -4 +4 @@
 #include <ctime>
 
-#include "../classes.h"
+#include "../classes/classes.h"
 #include "./det.h"
 

issm/trunk-jpl/src/c/bamg/det.h ¶

@@ -2 +2 @@
 #define _BAMGDET_H_
 
-#include "../../classes/bamg/include.h"
+#include "./include.h"
 
 namespace bamg {

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

@@ -140 +140 @@
 #include "./matrix/matrixobjects.h"
 
-/*bamg: */
-#include "./bamg/bamgobjects.h"
-
 /*gauss: */
 #include "./gauss/gaussobjects.h"

issm/trunk-jpl/src/c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp ¶

@@ -6 +6 @@
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"
-#include "../../classes/bamg/bamgobjects.h"
+#include "../../bamg/bamgobjects.h"
 
 using namespace bamg;

issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp ¶

@@ -3 +3 @@
  */
 #include "./Bamgx.h"
-#include "../../classes/bamg/bamgobjects.h"
+#include "../../bamg/bamgobjects.h"
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.h ¶

@@ -6 +6 @@
 #define _BAMGX_H
 
-#include "../../classes/bamg/bamgobjects.h"
+#include "../../bamg/bamgobjects.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h ¶

@@ -13 +13 @@
 
 #include "../include/matlabincludes.h"
+#include "../../c/bamg/bamgobjects.h"
 #include "../../c/classes/classes.h"
 #include "../../c/toolkits/toolkits.h"

issm/trunk-jpl/src/wrappers/python/io/pythonio.h ¶

@@ -13 +13 @@
 
 #include "../include/pythonincludes.h"
+#include "../../c/bamg/bamgobjects.h"
 #include "../../c/classes/classes.h"