Changeset 10529 for issm/trunk

Timestamp:

11/08/11 12:19:09 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed pattyn stokes coupling terms

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (3 diffs)
• shared/Elements/TransformInvStiffnessMatrixCoord.cpp (added)
• shared/Elements/elements.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -487 +487 @@
                                                         ./shared/Elements/TransformLoadVectorCoord.cpp \
                                                         ./shared/Elements/TransformStiffnessMatrixCoord.cpp \
+                                                        ./shared/Elements/TransformInvStiffnessMatrixCoord.cpp \
                                                         ./shared/Elements/TransformSolutionCoord.cpp
 diagnostic_psources =./solutions/diagnostic_core.cpp\

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -5565 +5565 @@
 ElementMatrix* Penta::CreateKMatrixCouplingPattynStokes(void){
 
+        /*Constants*/
+        const int numnodes  = 2 *NUMVERTICES;
+        const int numdofp     = NDOF2 *NUMVERTICES;
+        const int numdofs     = NDOF4 *NUMVERTICES;
+        const int numdoftotal = (NDOF2+NDOF4) *NUMVERTICES;
+
+        /*Intermediaries*/
+        Node     *node_list[numnodes];
+        int       cs_list[numnodes];
+        int       i,j;
+
+        /*Prepare node list*/
+        for(i=0;i<NUMVERTICES;i++){
+                node_list[i+0*NUMVERTICES] = this->nodes[i];
+                node_list[i+1*NUMVERTICES] = this->nodes[i];
+                cs_list[i+0*NUMVERTICES] = XYEnum;
+                cs_list[i+1*NUMVERTICES] = XYZPEnum;
+        }
+
         /*compute all stiffness matrices for this element*/
         ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
@@ -5571 +5590 @@
         delete Ke1;
         delete Ke2;
-        Ke1=CreateKMatrixDiagnosticPattyn();
-        Ke2=CreateKMatrixDiagnosticStokes();
-
-        /*Constants*/
-        const int numdofp     = NDOF2 *NUMVERTICES;
-        const int numdofs     = NDOF4 *NUMVERTICES;
-        const int numdoftotal = (NDOF2+NDOF4) *NUMVERTICES;
-        int       i,j;
+        Ke1=CreateKMatrixDiagnosticPattyn(); TransformInvStiffnessMatrixCoord(Ke1,this->nodes,NUMVERTICES,XYEnum);
+        Ke2=CreateKMatrixDiagnosticStokes(); TransformInvStiffnessMatrixCoord(Ke2,this->nodes,NUMVERTICES,XYZPEnum);
 
         for(i=0;i<numdofs;i++) for(j=0;j<NUMVERTICES;j++){
@@ -5588 +5601 @@
                 Ke->values[i*numdoftotal+numdofp+NDOF4*j+1]+=Ke1->values[i*numdofp+NDOF2*j+1];
         }
+
+        /*Transform Coordinate System*/
+        TransformStiffnessMatrixCoord(Ke,node_list,numnodes,cs_list);
 
         /*clean-up and return*/

issm/trunk/src/c/shared/Elements/elements.h

@@ -19 +19 @@
 void   CoordinateSystemTransform(double** ptransform,Node** nodes,int numnodes,int* cs_array);
 #ifdef _HAVE_DIAGNOSTIC_
+void   TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum);
+void   TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array);
 void   TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int cs_enum);
 void   TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes,int numnodes,int* cs_array);