Changeset 18212

Timestamp:

07/01/14 16:41:47 (11 years ago)

Author:

seroussi

Message:

NEW: changes for augmented lagrangian pressure in 3d

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (1 diff)
• PentaRef.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2273 +2273 @@
                         penta_node_ids[23]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->numberoffaces+iomodel->elements[6*index+5];
                         break;
+                case LATaylorHoodEnum:
+                        numnodes         = 18;
+                        penta_node_ids   = xNew<int>(numnodes);
+                        penta_node_ids[ 0]=iomodel->nodecounter+iomodel->elements[6*index+0];
+                        penta_node_ids[ 1]=iomodel->nodecounter+iomodel->elements[6*index+1];
+                        penta_node_ids[ 2]=iomodel->nodecounter+iomodel->elements[6*index+2];
+                        penta_node_ids[ 3]=iomodel->nodecounter+iomodel->elements[6*index+3];
+                        penta_node_ids[ 4]=iomodel->nodecounter+iomodel->elements[6*index+4];
+                        penta_node_ids[ 5]=iomodel->nodecounter+iomodel->elements[6*index+5];
+                        penta_node_ids[ 6]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+0]+1;
+                        penta_node_ids[ 7]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+1]+1;
+                        penta_node_ids[ 8]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+2]+1;
+                        penta_node_ids[ 9]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+3]+1;
+                        penta_node_ids[10]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+4]+1;
+                        penta_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+5]+1;
+                        penta_node_ids[12]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+6]+1;
+                        penta_node_ids[13]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+7]+1;
+                        penta_node_ids[14]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[9*index+8]+1;
+                        penta_node_ids[15]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+2]+1;
+                        penta_node_ids[16]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+3]+1;
+                        penta_node_ids[17]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elementtofaceconnectivity[5*index+4]+1;
+                        break;
                 case OneLayerP4zEnum:
                         numnodes         = 30+6;

issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp

@@ -997 +997 @@
                 case MINIEnum:           return P1Enum;
                 case TaylorHoodEnum:     return P1Enum;
-                case LATaylorHoodEnum:   return P1Enum;
+                case LATaylorHoodEnum:   return NoneEnum;
                 case OneLayerP4zEnum:    return P1Enum;
                 case CrouzeixRaviartEnum:return P1DGEnum;