Changeset 16955

Timestamp:

11/26/13 14:40:56 (11 years ago)

Author:

seroussi

Message:

 

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -3521 +3521 @@
 
         /*Prepare node list*/
-        int* cs_list = xNew<int>(2*vnumnodes+pnumnodes);
-        Node **node_list = xNew<Node*>(2*vnumnodes+pnumnodes);
+        int* cs_list = xNew<int>(2*vnumnodes-1+pnumnodes);
+        Node **node_list = xNew<Node*>(2*vnumnodes-1+pnumnodes);
         for(i=0;i<vnumnodes-1;i++){
                 node_list[i] = element->GetNode(i);
@@ -3610 +3610 @@
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingSSAFSViscous(Element* element){/*{{{*/
 
-        printf("CouplingSSAFSviscous\n");
         /*Constants*/
         const int numdofm     = 2 *3;
@@ -3629 +3628 @@
         IssmDouble Ke_gg2[numdofm][numdofs]={0.0}; //local element stiffness matrix 
         IssmDouble *xyz_list    = NULL;
-        Node       *node_list[20];
 
         /*Find penta on bed as FS must be coupled to the dofs on the bed: */
@@ -3640 +3638 @@
 
         /*Prepare node list*/
-        int* cs_list = xNew<int>(2*vnumnodes+pnumnodes);
+        int* cs_list     = xNew<int>(2*vnumnodes-1+pnumnodes);
+        Node **node_list = xNew<Node*>(2*vnumnodes-1+pnumnodes);
         for(i=0;i<vnumnodes-1;i++){
-                node_list[i] = pentabase->GetNode(i);
-                cs_list[i]   = XYEnum;
+                node_list[vnumnodes+pnumnodes+i] = pentabase->GetNode(i);
+                cs_list[vnumnodes+pnumnodes+i]   = XYEnum;
         }
         for(i=0;i<vnumnodes;i++){
-                node_list[i+vnumnodes-1] = element->GetNode(i);
-                cs_list[i+vnumnodes-1]   = XYZEnum;
+                node_list[i] = element->GetNode(i);
+                cs_list[i]   = XYZEnum;
         }
         for(i=0;i<pnumnodes;i++){
-                node_list[2*vnumnodes-1+i] = element->GetNode(vnumnodes+i);
-                cs_list[2*vnumnodes-1+i]   = PressureEnum;
+                node_list[vnumnodes+i] = element->GetNode(vnumnodes+i);
+                cs_list[vnumnodes+i]   = PressureEnum;
         }
 
         /*Initialize Element matrix and return if necessary*/
-        ElementMatrix* Ke1=element  ->NewElementMatrix(FSvelocityEnum);
-        ElementMatrix* Ke2=pentabase->NewElementMatrix(SSAApproximationEnum);
+        ElementMatrix* Ke1=element->NewElementMatrix(FSvelocityEnum);
+        ElementMatrix* Ke2=pentabase->NewElementMatrixCoupling(6,SSAApproximationEnum);
         ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2);
         delete Ke1; delete Ke2;