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

[luis at geodynamics.org]

Author: luis
Date: 2008-01-16 17:25:09 -0800 (Wed, 16 Jan 2008)
New Revision: 9082

Modified:
   cs/benchmark/cigma/trunk/src/Cell.cpp
   cs/benchmark/cigma/trunk/src/Cell.h
   cs/benchmark/cigma/trunk/src/Hex.cpp
   cs/benchmark/cigma/trunk/src/Tet.cpp
Log:
Cleaned up some cruft comments

Modified: cs/benchmark/cigma/trunk/src/Cell.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Cell.cpp	2008-01-16 20:53:14 UTC (rev 9081)
+++ cs/benchmark/cigma/trunk/src/Cell.cpp	2008-01-17 01:25:09 UTC (rev 9082)
@@ -7,11 +7,6 @@
 cigma::Cell::Cell()
 {
     //std::cout << "Calling cigma::Cell::Cell()\n";
-
-    /*nno = 0;
-    nsd = 0;
-    celldim = 0;*/
-
     globverts = NULL;
     refverts = NULL;
 }
@@ -22,33 +17,8 @@
     //std::cout << "Calling cigma::Cell::~Cell()\n";
 }
 
-
-/*
-int cigma::Cell::n_nodes() const
-{
-    return nno;
-}
-
-int cigma::Cell::n_dim() const
-{
-    return nsd;
-}
-
-int cigma::Cell::n_celldim() const
-{
-    return celldim;
-}*/
-
 //----------------------------------------------------------------------------
 
-
-/*
-void cigma::Cell::set_dims(int ndofs, int celldim, int nsd)
-{
-    this->nno = ndofs;
-    this->celldim = celldim;
-    this->nsd = nsd;
-}*/
 
 
 void cigma::Cell::set_reference_vertices(double *vertices, int num_vertices)
@@ -67,9 +37,10 @@
     refverts = new double[nno*celldim];
     globverts = new double[nno*nsd];
 
+    // copy data from vertices
     for (i = 0; i < nno; i++)
     {
-        /*
+        //*
         for (j = 0; j < nsd; j++)
         {
             globverts[nsd*i + j] = 0.0;

Modified: cs/benchmark/cigma/trunk/src/Cell.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Cell.h	2008-01-16 20:53:14 UTC (rev 9081)
+++ cs/benchmark/cigma/trunk/src/Cell.h	2008-01-17 01:25:09 UTC (rev 9082)
@@ -19,19 +19,16 @@
     Cell();
     virtual ~Cell();
 
-
 public:
     virtual int n_nodes() = 0;
     virtual int n_celldim() = 0;
     virtual int n_dim() = 0;
 
 public:
-
     void set_reference_vertices(double *vertices, int num_vertices);
     void set_global_vertices(double *vertices, int num_vertices, int nsd);
 
 public:
-
     virtual void shape(int num, double *points, double *values) = 0;
     virtual void grad_shape(int num, double *points, double *values) = 0;
 
@@ -47,7 +44,6 @@
     //virtual double volume() = 0;
 
 public:
-
     void bbox(double *min, double *max);
     void centroid(double c[3]);
     virtual bool interior(double u, double v, double w) = 0;
@@ -55,21 +51,11 @@
 
 
 public:
-
-    /*int nno;
-    int celldim;
-    int nsd;*/
-
     double *refverts;   // [nno x celldim]
     double *globverts;  // [nno x nsd]
 
 };
 
 
-
 // ---------------------------------------------------------------------------
-
-
-// ---------------------------------------------------------------------------
-
 #endif

Modified: cs/benchmark/cigma/trunk/src/Hex.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Hex.cpp	2008-01-16 20:53:14 UTC (rev 9081)
+++ cs/benchmark/cigma/trunk/src/Hex.cpp	2008-01-17 01:25:09 UTC (rev 9082)
@@ -61,7 +61,6 @@
 {
     const int hex_nno = 8;
     const int hex_celldim = 3;
-    //const int hex_nsd = 3;
     double verts[hex_nno * hex_celldim] = {
         -1.0, -1.0, -1.0,
         +1.0, -1.0, -1.0,
@@ -72,7 +71,6 @@
         +1.0, +1.0, +1.0,
         -1.0, +1.0, +1.0
     };
-    //set_dims(hex_nno, hex_celldim, hex_nsd);
     set_reference_vertices(verts, hex_nno);
 }
 
@@ -82,7 +80,7 @@
 
 
 /*
- * @param points points is an [num x nsd] array (in)
+ * @param points points is an [num x celldim] array (in)
  * @param values values is an [num x ndofs] array (out)
  *
  */

Modified: cs/benchmark/cigma/trunk/src/Tet.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Tet.cpp	2008-01-16 20:53:14 UTC (rev 9081)
+++ cs/benchmark/cigma/trunk/src/Tet.cpp	2008-01-17 01:25:09 UTC (rev 9082)
@@ -43,14 +43,12 @@
     //std::cout << "Calling cigma::Tet::Tet()\n";
     const int tet_nno = 4;
     const int tet_celldim = 3;
-    //const int tet_nsd = 3;
     double verts[tet_nno * tet_celldim] = {
         0.0, 0.0, 0.0,
         1.0, 0.0, 0.0,
         0.0, 1.0, 0.0,
         0.0, 0.0, 1.0
     };
-    //set_dims(tet_nno, tet_celldim, tet_nsd);
     set_reference_vertices(verts, tet_nno);
 }