[cig-commits] r13172 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-10-29 15:11:42 -0700 (Wed, 29 Oct 2008)
New Revision: 13172

Modified:
   cs/cigma/trunk/src/fe_quad4.cpp
Log:
Decreased order of quad4's default integration rule (made it too high for some reason).

Modified: cs/cigma/trunk/src/fe_quad4.cpp
===================================================================
--- cs/cigma/trunk/src/fe_quad4.cpp	2008-10-29 22:11:41 UTC (rev 13171)
+++ cs/cigma/trunk/src/fe_quad4.cpp	2008-10-29 22:11:42 UTC (rev 13172)
@@ -53,6 +53,7 @@
 boost::shared_ptr<Quadrature> quad4::default_quadrature()
 {
     // quad4_qr(7)
+    /*
     const int nno = 16;
     const int celldim = 2;
     double qpts[nno*celldim] = {
@@ -78,61 +79,48 @@
         0.22685185,  0.12100299,  0.22685185,  0.22685185,  0.12100299,
         0.22685185,  0.22685185,  0.4252933 ,  0.4252933 ,  0.4252933 ,
         0.4252933
+    }; */
+
+    // quad4_qr(5)
+    /*
+    const int nno = 9;
+    const int celldim = 2;
+    double qpts[nno*celldim] = {
+        -7.74596669e-01,  -7.74596669e-01,
+        -2.46519033e-31,  -7.74596669e-01,
+         7.74596669e-01,  -7.74596669e-01,
+         7.74596669e-01,  -2.46519033e-31,
+         7.74596669e-01,   7.74596669e-01,
+        -2.46519033e-31,   7.74596669e-01,
+        -7.74596669e-01,   7.74596669e-01,
+        -7.74596669e-01,  -2.46519033e-31,
+        -2.46519033e-31,  -2.46519033e-31
     };
+    double qwts[nno] = {
+        0.30864198,  0.49382716,  0.30864198,  0.49382716,  0.30864198,
+        0.49382716,  0.30864198,  0.49382716,  0.79012346
+    }; */
+ 
+
+    // quad4_qr(3)
+    const int nno = 4;
+    const int celldim = 2;
+    double qpts[nno*celldim] = {
+        -0.57735027, -0.57735027,
+         0.57735027, -0.57735027,
+         0.57735027,  0.57735027,
+        -0.57735027,  0.57735027
+    };
+    double qwts[nno] = {
+        1.,  1.,  1.,  1.
+    };
     
     boost::shared_ptr<Quadrature> Q(new Quadrature(nno, celldim));
     Q->setData(qpts, qwts);
     return Q;
 }
 
-/*
-void quad4::qr_default(double **wts, double **pts, int *npts, int *ndim)
-{
-    // quad_qr(7)
-    const int quad_nno = 16;
-    const int quad_celldim = 2;
-    double quad_qpts[quad_nno * quad_celldim] = {
-        -0.86113631, -0.86113631,
-        -0.33998104, -0.86113631,
-         0.33998104, -0.86113631,
-         0.86113631, -0.86113631,
-         0.86113631, -0.33998104,
-         0.86113631,  0.33998104,
-         0.86113631,  0.86113631,
-         0.33998104,  0.86113631,
-        -0.33998104,  0.86113631,
-        -0.86113631,  0.86113631,
-        -0.86113631,  0.33998104,
-        -0.86113631, -0.33998104,
-        -0.33998104, -0.33998104,
-         0.33998104, -0.33998104,
-        -0.33998104,  0.33998104,
-         0.33998104,  0.33998104
-    };
-    double quad_qwts[quad_nno] = {
-        0.12100299,  0.22685185,  0.22685185,  0.12100299,  0.22685185,
-        0.22685185,  0.12100299,  0.22685185,  0.22685185,  0.12100299,
-        0.22685185,  0.22685185,  0.4252933 ,  0.4252933 ,  0.4252933 ,
-        0.4252933
-    };
 
-    int i,j,n;
-    *npts = quad_nno;
-    *ndim = quad_celldim;
-    *wts = new double[(*npts)];
-    *pts = new double[(*npts) * (*ndim)];
-    for (i = 0; i < quad_nno; i++)
-    {
-        (*wts)[i] = quad_qwts[i];
-        for (j = 0; j < (*ndim); j++)
-        {
-            n = (*ndim) * i + j;
-            (*pts)[n] = quad_qpts[n];
-        }
-    }
-}
-*/
-
 // ---------------------------------------------------------------------------
 
 /*