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

[luis at geodynamics.org]

Author: luis
Date: 2008-01-14 21:27:46 -0800 (Mon, 14 Jan 2008)
New Revision: 9027

Modified:
   cs/benchmark/cigma/trunk/src/Cell.cpp
   cs/benchmark/cigma/trunk/src/Cell.h
Log:
Remove quadrature from Cell

Modified: cs/benchmark/cigma/trunk/src/Cell.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Cell.cpp	2008-01-15 05:27:44 UTC (rev 9026)
+++ cs/benchmark/cigma/trunk/src/Cell.cpp	2008-01-15 05:27:46 UTC (rev 9027)
@@ -97,7 +97,7 @@
 }
 
 
-void cigma::Cell::update_vertices(double *vertices, int num, int dim)
+void cigma::Cell::set_global_vertices(double *vertices, int num, int dim)
 {
     assert(num == n_nodes());
     assert(dim == n_dim());
@@ -125,39 +125,7 @@
     return;
 }
 
-
-/*
-void cigma::Cell::set_quadrature(const double *quadpts, const double *quadwts, int num_points)
-{
-    assert(nsd > 0);
-    nq = num_points;
-    qwts = new double[nq];
-    qpts = new double[nq*celldim];
-    gqpts = new double[nq*nsd];
-    for (int q = 0; q < nq; q++)
-    {
-        qwts[q] = quadwts[q];
-        for (int i = 0; i < celldim; i++)
-        {
-            int n = celldim*q + i;
-            qpts[n] = quadpts[n];
-        }
-    }
-    if (basis_tab != NULL)
-    {
-        update_quadrature();
-    }
-}
-void cigma::Cell::update_quadrature(void)
-{
-    assert(nsd > 0);
-    assert(nq > 0);
-    for (int q = 0; q < nq; q++)
-        uvw2xyz(&qpts[celldim*q], &gqpts[nsd*q]);
-}
-*/
 
-
 //----------------------------------------------------------------------------
 
 

Modified: cs/benchmark/cigma/trunk/src/Cell.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Cell.h	2008-01-15 05:27:44 UTC (rev 9026)
+++ cs/benchmark/cigma/trunk/src/Cell.h	2008-01-15 05:27:46 UTC (rev 9027)
@@ -30,12 +30,8 @@
     //void set_dims(int ndofs, int celldim, int nsd);
 
     void set_reference_vertices(double *vertices, int num_vertices);
+    void set_global_vertices(double *vertices, int num_vertices, int nsd);
 
-    void update_vertices(double *vertices, int num_vertices, int nsd);
-
-    //void set_quadrature(const double *quadpts, const double *quadwts, int num_points);
-    //void update_quadrature(void);
-
     //void set_tabulation(const double *basis_tab, const double *basis_jet);
     //void update_tabulation(void);
 
@@ -73,12 +69,6 @@
     double *refverts;   // [nno x celldim]
     double *globverts;  // [nno x nsd]
 
-    //int nq;
-    //double *jxw;        // [nq x 1]
-    //double *qwts;       // [nq x 1]
-    //double *qpts;       // [nq x celldim]
-    //double *gqpts;      // [nq x nsd]
-
     //int ndofs;
     //double *basis_tab;  // [nq x ndofs]
     //double *basis_jet;  // [nq x ndofs x celldim]