Changeset 16973

Timestamp:

11/29/13 10:24:05 (11 years ago)

Author:

seroussi

Message:

BUG: fixed HOFS tiling for friction

File:

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

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

@@ -3241 +3241 @@
         /*Intermediaries*/
         int   i,j,init;
-        int*   cs_list   = xNew<int>(6*3+1);
-        int*   cs_list2  = xNew<int>(6*2+1);
-        Node  **node_list = xNew<Node*>(6*3+1);
+        int*   cs_list     = xNew<int>(6*3+1);
+        int*   cs_list2    = xNew<int>(6*2+1);
+        Node  **node_list  = xNew<Node*>(6*3+1);
 
         /*Some parameters needed*/
@@ -3263 +3263 @@
 
         /*compute all stiffness matrices for this element*/
-        ElementMatrix* Ke1=element->NewElementMatrix(FSvelocityEnum);
-        ElementMatrix* Ke2=element->NewElementMatrix(HOApproximationEnum);
+        ElementMatrix* Ke1=element->NewElementMatrixCoupling(6,HOApproximationEnum);
+        ElementMatrix* Ke2=element->NewElementMatrix(FSvelocityEnum);
         ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
         delete Ke1; delete Ke2;
@@ -3278 +3278 @@
 
         for(i=0;i<numdofs;i++) for(j=0;j<6;j++){
-                Ke->values[i*numdoftotal+numdofs+2*j+0]+=Ke1->values[i*numdofs+3*j+0];
-                Ke->values[i*numdoftotal+numdofs+2*j+1]+=Ke1->values[i*numdofs+3*j+1];
+                Ke->values[(i+numdofp)*numdoftotal+2*j+0]+=Ke1->values[i*numdofs+3*j+0];
+                Ke->values[(i+numdofp)*numdoftotal+2*j+1]+=Ke1->values[i*numdofs+3*j+1];
         }
         for(i=0;i<numdofp;i++) for(j=0;j<6;j++){
-                Ke->values[(i+numdofs)*numdoftotal+3*j+0]+=Ke2->values[i*numdofp+2*j+0];
-                Ke->values[(i+numdofs)*numdoftotal+3*j+1]+=Ke2->values[i*numdofp+2*j+1];
+                Ke->values[i*numdoftotal+numdofp+3*j+0]+=Ke2->values[i*numdofp+2*j+0];
+                Ke->values[i*numdoftotal+numdofp+3*j+1]+=Ke2->values[i*numdofp+2*j+1];
         }