[cig-commits] r12297 - mc/3D/CitcomS/trunk/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-06-20 15:41:57 -0700 (Fri, 20 Jun 2008)
New Revision: 12297

Modified:
   mc/3D/CitcomS/trunk/lib/Shape_functions.c
Log:
Compute E->L and E->Lx 1d shape functions (1d is a misnomer, they are 2d actually).

Modified: mc/3D/CitcomS/trunk/lib/Shape_functions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Shape_functions.c	2008-06-20 22:41:04 UTC (rev 12296)
+++ mc/3D/CitcomS/trunk/lib/Shape_functions.c	2008-06-20 22:41:57 UTC (rev 12297)
@@ -129,14 +129,19 @@
   for(j=1;j<=onedvpoints[E->mesh.nsd];j++)
     for(k=1;k<=onedvpoints[E->mesh.nsd];k++)   {
        E->M.vpt[GMVINDEX(j,k)] = 1.0;
-       for(d=1;d<=E->mesh.nsd-1;d++)
+       E->L.vpt[GMVINDEX(j,k)] = 1.0;
+       for(d=1;d<=E->mesh.nsd-1;d++) {
           E->M.vpt[GMVINDEX(j,k)] *= lpoly(bb[d-1][j],s_point[k].x[d-1]);
-
+          E->L.vpt[GMVINDEX(j,k)] *= lpoly(bb[d-1][j],l_1d[k].x[d-1]);
+       }
        for(dd=1;dd<=E->mesh.nsd-1;dd++) {
           E->Mx.vpt[GMVXINDEX(dd-1,j,k)] = lpolydash(bb[dd-1][j],s_point[k].x[d-1]);
+          E->Lx.vpt[GMVXINDEX(dd-1,j,k)] = lpolydash(bb[dd-1][j],l_1d[k].x[d-1]);
           for(d=1;d<=E->mesh.nsd-1;d++)
-             if (d != dd)
+             if (d != dd) {
                 E->Mx.vpt[GMVXINDEX(dd-1,j,k)] *= lpoly(bb[d-1][j],s_point[k].x[d-1]);
+                E->Lx.vpt[GMVXINDEX(dd-1,j,k)] *= lpoly(bb[d-1][j],l_1d[k].x[d-1]);
+            }
           }
        }