Changeset 16894

Timestamp:

11/22/13 12:35:33 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing enthalpy (fabs not used in stabilization)

Location:

issm/trunk-jpl/src/c/analyses

Files:

• EnthalpyAnalysis.cpp (modified) (1 diff)
• StressbalanceAnalysis.cpp (modified) (1 diff)

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

@@ -287 +287 @@
                         vel=sqrt(vx*vx + vy*vy + vz*vz)+1.e-14;
                         h=sqrt( pow(hx*vx/vel,2) + pow(hy*vy/vel,2) + pow(hz*vz/vel,2));
-                        K[0][0]=h/(2.*vel)*fabs(vx*vx);  K[0][1]=h/(2.*vel)*fabs(vx*vy); K[0][2]=h/(2.*vel)*fabs(vx*vz);
-                        K[1][0]=h/(2.*vel)*fabs(vy*vx);  K[1][1]=h/(2.*vel)*fabs(vy*vy); K[1][2]=h/(2.*vel)*fabs(vy*vz);
-                        K[2][0]=h/(2.*vel)*fabs(vz*vx);  K[2][1]=h/(2.*vel)*fabs(vz*vy); K[2][2]=h/(2.*vel)*fabs(vz*vz);
+                        K[0][0]=h/(2.*vel)*vx*vx;  K[0][1]=h/(2.*vel)*vx*vy; K[0][2]=h/(2.*vel)*vx*vz;
+                        K[1][0]=h/(2.*vel)*vy*vx;  K[1][1]=h/(2.*vel)*vy*vy; K[1][2]=h/(2.*vel)*vy*vz;
+                        K[2][0]=h/(2.*vel)*vz*vx;  K[2][1]=h/(2.*vel)*vz*vy; K[2][2]=h/(2.*vel)*vz*vz;
                         for(int i=0;i<3;i++) for(int j=0;j<3;j++) K[i][j] = D_scalar*K[i][j];
 
                         GetBAdvecprime(Bprime,element,xyz_list,gauss); 
-
                         TripleMultiply(Bprime,3,numnodes,1,
                                                 &K[0][0],3,3,0,

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

@@ -1449 +1449 @@
         ElementMatrix* Ke2=CreateKMatrixL1L2Friction(element);
         ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2);
-        //if(element->Id()==62){
-        //Ke->Echo();
-        //Ke=element->CreateKMatrix();
-        //Ke->Echo();
-        //_error_("S");
-        //}
 
         /*clean-up and return*/