[cig-commits] r9157 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-01-28 20:04:20 -0800 (Mon, 28 Jan 2008)
New Revision: 9157

Modified:
   cs/benchmark/cigma/trunk/src/Cell.h
   cs/benchmark/cigma/trunk/src/Hex.h
   cs/benchmark/cigma/trunk/src/Quad.h
   cs/benchmark/cigma/trunk/src/Tet.h
   cs/benchmark/cigma/trunk/src/Tri.h
Log:
Added geometry() method to Cell class

Modified: cs/benchmark/cigma/trunk/src/Cell.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Cell.h	2008-01-29 01:50:18 UTC (rev 9156)
+++ cs/benchmark/cigma/trunk/src/Cell.h	2008-01-29 04:04:20 UTC (rev 9157)
@@ -40,6 +40,17 @@
     virtual void xyz2uvw(double xyz[3], double uvw[3]);
     void uvw2xyz(double uvw[3], double xyz[3]);
 
+public:
+    typedef enum {
+        POINT = 0,
+        TRIANGLE,
+        QUADRANGLE,
+        TETRAHEDRON,
+        HEXAHEDRON
+    } Geometry;
+
+    virtual Geometry geometry() = 0;
+
     //virtual double volume() = 0;
 
 public:

Modified: cs/benchmark/cigma/trunk/src/Hex.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Hex.h	2008-01-29 01:50:18 UTC (rev 9156)
+++ cs/benchmark/cigma/trunk/src/Hex.h	2008-01-29 04:04:20 UTC (rev 9157)
@@ -18,6 +18,7 @@
     int n_nodes() { return 8; }
     int n_celldim() { return 3; }
     int n_dim() { return 3; }
+    Geometry geometry() { return HEXAHEDRON; }
 
 public:
     void shape(int num, double *points, double *values);

Modified: cs/benchmark/cigma/trunk/src/Quad.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Quad.h	2008-01-29 01:50:18 UTC (rev 9156)
+++ cs/benchmark/cigma/trunk/src/Quad.h	2008-01-29 04:04:20 UTC (rev 9157)
@@ -18,6 +18,7 @@
     int n_nodes() { return 4; }
     int n_celldim() { return 2; }
     int n_dim() { return 3; }
+    Geometry geometry() { return QUADRANGLE; }
 
 public:
     void shape(int num, double *points, double *values);

Modified: cs/benchmark/cigma/trunk/src/Tet.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Tet.h	2008-01-29 01:50:18 UTC (rev 9156)
+++ cs/benchmark/cigma/trunk/src/Tet.h	2008-01-29 04:04:20 UTC (rev 9157)
@@ -18,6 +18,7 @@
     int n_nodes() { return 4; }
     int n_celldim() { return 3; }
     int n_dim() { return 3; }
+    Geometry geometry() { return TETRAHEDRON; }
 
 public:
     void shape(int num, double *points, double *values);

Modified: cs/benchmark/cigma/trunk/src/Tri.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Tri.h	2008-01-29 01:50:18 UTC (rev 9156)
+++ cs/benchmark/cigma/trunk/src/Tri.h	2008-01-29 04:04:20 UTC (rev 9157)
@@ -18,6 +18,7 @@
     int n_nodes() { return 3; }
     int n_celldim() { return 2; }
     int n_dim() { return 3; }
+    Geometry geometry() { return TRIANGLE; }
 
 public:
     void shape(int num, double *points, double *values);