Changeset 17298

Timestamp:

02/18/14 19:44:42 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing SSA 2d

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (6 diffs)
• classes/Elements/Element.cpp (modified) (1 diff)

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

@@ -1273 +1273 @@
         switch(meshtype){
                 case Mesh2DverticalEnum:   dim = 1; bsize = 1; break;
-                case Mesh2DhorizontalEnum: dim = 2; bsize = 1; break;
+                case Mesh2DhorizontalEnum: dim = 2; bsize = 3; break;
                 case Mesh3DEnum:           dim = 2; bsize = 3; break;
                 default: _error_("mesh "<<EnumToStringx(meshtype)<<" not supported yet");
@@ -1295 +1295 @@
         Input* vy_input    = NULL;
         Input* vyold_input = NULL;
-        if(dim==3){
-                vy_input=element->GetInput(VyEnum);          _assert_(vy_input);
-                vyold_input=element->GetInput(VyPicardEnum); _assert_(vyold_input);
+        if(dim==2){
+                vy_input    = element->GetInput(VyEnum);       _assert_(vy_input);
+                vyold_input = element->GetInput(VyPicardEnum); _assert_(vyold_input);
         }
         element->FindParam(&viscosity_overshoot,StressbalanceViscosityOvershootEnum);
@@ -1316 +1316 @@
                 newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity);
                 D_scalar=2.*newviscosity*thickness*gauss->weight*Jdet;
-                for(int i=0;i<3;i++) D[i*3+i]=D_scalar;
+                for(int i=0;i<bsize;i++) D[i*bsize+i]=D_scalar;
 
                 TripleMultiply(B,bsize,numdof,1,
@@ -1322 +1322 @@
                                         Bprime,bsize,numdof,0,
                                         &Ke->values[0],1);
+
+                for(int i=0;i<bsize*numdof;i++) if(B[i]==1.) _error_("STREAM");
+                for(int i=0;i<bsize*numdof;i++) if(Bprime[i]==1.) _error_("STREAM");
         }
 
@@ -1525 +1528 @@
         if(dim==2){
                 for(int i=0;i<numnodes;i++){
-                        B[i] = dbasis[i];
-                }
-        }
-        else{
-                for(int i=0;i<numnodes;i++){
                         B[2*numnodes*0+2*i+0] = dbasis[0*numnodes+i];
                         B[2*numnodes*0+2*i+1] = 0.;
@@ -1536 +1534 @@
                         B[2*numnodes*2+2*i+0] = .5*dbasis[1*numnodes+i];
                         B[2*numnodes*2+2*i+1] = .5*dbasis[0*numnodes+i];
+                }
+        }
+        else{
+                for(int i=0;i<numnodes;i++){
+                        B[i] = dbasis[i];
                 }
         }

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

@@ -749 +749 @@
 
         /*Check that both inputs have been found*/
-        if (!vx_input || !vy_input){
+        if(!vx_input || !vy_input){
                 _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n");
         }