Changeset 15505

Timestamp:

07/18/13 11:31:53 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added P2xP1 nodal function derivatives

File:

• issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (modified) (2 diffs)

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

@@ -18 +18 @@
 #define NUMNODESP1    6
 #define NUMNODESP1_2d 3
-#define NUMNODESP1b  7
+#define NUMNODESP1b   7
+#define NUMNODESP2xP1 12
+#define NUMNODESP2    15
 
 /*Object constructors and destructor*/
@@ -1252 +1254 @@
                         dbasis[NUMNODESP1b*2+6] = -54*gauss->coord1*gauss->coord2*gauss->coord3*zeta;
                         return;
+                case P2xP1Enum:
+                        /*Nodal function 1*/
+                        dbasis[NUMNODESP2xP1*0+0 ] = .5*(1.-zeta)*(-2.*gauss->coord1 + 0.5);
+                        dbasis[NUMNODESP2xP1*1+0 ] = .5*(1.-zeta)*(-2.*SQRT3/3.*gauss->coord1 + SQRT3/6.);
+                        dbasis[NUMNODESP2xP1*2+0 ] = -.5*gauss->coord1*(2.*gauss->coord1-1.);
+                        /*Nodal function 2*/
+                        dbasis[NUMNODESP2xP1*0+1 ] = .5*(1.-zeta)*(+2.*gauss->coord2 - 0.5);
+                        dbasis[NUMNODESP2xP1*1+1 ] = .5*(1.-zeta)*(-2.*SQRT3/3.*gauss->coord2 + SQRT3/6.);
+                        dbasis[NUMNODESP2xP1*2+1 ] = -.5*gauss->coord2*(2.*gauss->coord2-1.);
+                        /*Nodal function 3*/
+                        dbasis[NUMNODESP2xP1*0+2 ] = 0.;
+                        dbasis[NUMNODESP2xP1*1+2 ] = .5*(1.-zeta)*(4.*SQRT3/3.*gauss->coord3 - SQRT3/3.);
+                        dbasis[NUMNODESP2xP1*2+2 ] = -.5*gauss->coord3*(2.*gauss->coord3-1.);
+                        /*Nodal function 4*/
+                        dbasis[NUMNODESP2xP1*0+3 ] = .5*(1.+zeta)*(-2.*gauss->coord1 + 0.5);
+                        dbasis[NUMNODESP2xP1*1+3 ] = .5*(1.+zeta)*(-2.*SQRT3/3.*gauss->coord1 + SQRT3/6.);
+                        dbasis[NUMNODESP2xP1*2+3 ] = .5*gauss->coord1*(2.*gauss->coord1-1.);
+                        /*Nodal function 5*/
+                        dbasis[NUMNODESP2xP1*0+4 ] = .5*(1.+zeta)*(+2.*gauss->coord2 - 0.5);
+                        dbasis[NUMNODESP2xP1*1+4 ] = .5*(1.+zeta)*(-2.*SQRT3/3.*gauss->coord2 + SQRT3/6.);
+                        dbasis[NUMNODESP2xP1*2+4 ] = .5*gauss->coord2*(2.*gauss->coord2-1.);
+                        /*Nodal function 6*/
+                        dbasis[NUMNODESP2xP1*0+5 ] = 0.;
+                        dbasis[NUMNODESP2xP1*1+5 ] = .5*(1.+zeta)*(4.*SQRT3/3.*gauss->coord3 - SQRT3/3.);
+                        dbasis[NUMNODESP2xP1*2+5 ] = .5*gauss->coord3*(2.*gauss->coord3-1.);
+
+                        /*Nodal function 7*/
+                        dbasis[NUMNODESP2xP1*0+6 ] = (1.-zeta)*gauss->coord3;
+                        dbasis[NUMNODESP2xP1*1+6 ] = .5*(1.-zeta)*(+4.*SQRT3/3.*gauss->coord2 - 2.*SQRT3/3.*gauss->coord3);
+                        dbasis[NUMNODESP2xP1*2+6 ] = -2.*gauss->coord3*gauss->coord2;
+                        /*Nodal function 8*/
+                        dbasis[NUMNODESP2xP1*0+7 ] = -(1.-zeta)*gauss->coord3;
+                        dbasis[NUMNODESP2xP1*1+7 ] = .5*(1.-zeta)*(+4.*SQRT3/3.*gauss->coord1 - 2.*SQRT3/3.*gauss->coord3);
+                        dbasis[NUMNODESP2xP1*2+7 ] = -2.*gauss->coord3*gauss->coord1;
+                        /*Nodal function 9*/
+                        dbasis[NUMNODESP2xP1*0+8 ] = (1.-zeta)*(gauss->coord1-gauss->coord2);
+                        dbasis[NUMNODESP2xP1*1+8 ] = .5*(1.-zeta)*(-2.*SQRT3/3.*(gauss->coord1+gauss->coord2));
+                        dbasis[NUMNODESP2xP1*2+8 ] = -2.*gauss->coord1*gauss->coord2;
+                        /*Nodal function 10*/
+                        dbasis[NUMNODESP2xP1*0+9 ] = (1.+zeta)*gauss->coord3;
+                        dbasis[NUMNODESP2xP1*1+9 ] = .5*(1.+zeta)*(+4.*SQRT3/3.*gauss->coord2 - 2.*SQRT3/3.*gauss->coord3);
+                        dbasis[NUMNODESP2xP1*2+9 ] = 2.*gauss->coord3*gauss->coord2;
+                        /*Nodal function 11*/
+                        dbasis[NUMNODESP2xP1*0+10] = -(1.+zeta)*gauss->coord3;
+                        dbasis[NUMNODESP2xP1*1+10] = .5*(1.+zeta)*(+4.*SQRT3/3.*gauss->coord1 - 2.*SQRT3/3.*gauss->coord3);
+                        dbasis[NUMNODESP2xP1*2+10] = 2.*gauss->coord3*gauss->coord1;
+                        /*Nodal function 12*/
+                        dbasis[NUMNODESP2xP1*0+11] = (1.+zeta)*(gauss->coord1-gauss->coord2);
+                        dbasis[NUMNODESP2xP1*1+11] = .5*(1.+zeta)*(-2.*SQRT3/3.*(gauss->coord1+gauss->coord2));
+                        dbasis[NUMNODESP2xP1*2+11] = 2.*gauss->coord1*gauss->coord2;
+                        return;
                 default:
                         _error_("Element type "<<EnumToStringx(this->element_type)<<" not supported yet");