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

[luis at geodynamics.org]

Author: luis
Date: 2008-02-19 20:30:41 -0800 (Tue, 19 Feb 2008)
New Revision: 11188

Modified:
   cs/benchmark/cigma/trunk/src/FE.cpp
   cs/benchmark/cigma/trunk/src/FE.h
   cs/benchmark/cigma/trunk/src/FE_Field.cpp
Log:
Moved updates of jxw[] array into FE class


Modified: cs/benchmark/cigma/trunk/src/FE.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/FE.cpp	2008-02-20 04:30:39 UTC (rev 11187)
+++ cs/benchmark/cigma/trunk/src/FE.cpp	2008-02-20 04:30:41 UTC (rev 11188)
@@ -48,3 +48,16 @@
 
 // ---------------------------------------------------------------------------
 
+void cigma::FE::update_jxw()
+{
+    const int nq = quadrature->n_points();
+    const int celldim = cell->n_celldim();
+    for (int q = 0; q < nq; q++)
+    {
+        double jac[3][3];
+        jxw[q] = quadrature->weight(q) * cell->jacobian((*quadrature)[q], jac);
+    }
+}
+
+// ---------------------------------------------------------------------------
+

Modified: cs/benchmark/cigma/trunk/src/FE.h
===================================================================
--- cs/benchmark/cigma/trunk/src/FE.h	2008-02-20 04:30:39 UTC (rev 11187)
+++ cs/benchmark/cigma/trunk/src/FE.h	2008-02-20 04:30:41 UTC (rev 11188)
@@ -25,6 +25,9 @@
     void set_quadrature(Quadrature *quadrature);
 
 public:
+    void update_jxw();
+
+public:
     Cell *cell;
     Quadrature *quadrature;
     double *jxw;

Modified: cs/benchmark/cigma/trunk/src/FE_Field.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/FE_Field.cpp	2008-02-20 04:30:39 UTC (rev 11187)
+++ cs/benchmark/cigma/trunk/src/FE_Field.cpp	2008-02-20 04:30:41 UTC (rev 11188)
@@ -93,14 +93,7 @@
     cell->grad_shape(nq, qpts, fe->basis_jet);
 
     // evaluate jacobian at known quadrature points and calculate jxw
-    int q;
-    int celldim = cell->n_celldim();
-    double *jxw = fe->jxw;
-    for (q = 0; q < nq; q++)
-    {
-        double jac[3][3];
-        jxw[q] = qwts[q] * cell->jacobian(&qpts[celldim*q], jac);
-    }
+    fe->update_jxw();
 }
 
 // ---------------------------------------------------------------------------