Changeset 17180

Timestamp:

01/28/14 11:11:06 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: Fixing free surface models

Location:

issm/trunk-jpl/src/c/analyses

Files:

• FreeSurfaceBaseAnalysis.cpp (modified) (1 diff)
• FreeSurfaceTopAnalysis.cpp (modified) (1 diff)

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

@@ -173 +173 @@
                 D[0] = D_scalar*vx;
                 if(dim==2) D[1*dim+1] = D_scalar*vy;
-                TripleMultiply(B,dim,numnodes,1,
-                                        D,dim,dim,0,
-                                        B,dim,numnodes,0,
-                                        &Ke->values[0],1);
-
-                D[0*dim+0]=D_scalar*vx;
-                if(dim==2) D[1*dim+1]=D_scalar*vy;
                 TripleMultiply(B,dim,numnodes,1,
                                         D,dim,dim,0,

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

@@ -181 +181 @@
                 for(int i=0;i<dim*dim;i++) D[i]=0.;
                 D[0] = D_scalar*vx;
-                if(dim==2) D[1*dim+1] = D_scalar*vy;
-                TripleMultiply(B,dim,numnodes,1,
-                                        D,dim,dim,0,
-                                        B,dim,numnodes,0,
-                                        &Ke->values[0],1);
-
-                D[0*dim+0]=D_scalar*vx;
+
                 if(dim==2) D[1*dim+1]=D_scalar*vy;
                 TripleMultiply(B,dim,numnodes,1,