Changeset 17178

Timestamp:

01/28/14 07:54:25 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing free surfaces in 1d

Location:

issm/trunk-jpl/src/c/analyses

Files:

• FreeSurfaceBaseAnalysis.cpp (modified) (2 diffs)
• FreeSurfaceTopAnalysis.cpp (modified) (3 diffs)

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

@@ -327 +327 @@
         /*Build B: */
         for(int i=0;i<numnodes;i++){
-                for(int j=0;j<dim;i++){
+                for(int j=0;j<dim;j++){
                         B[numnodes*j+i] = basis[i];
                 }
@@ -350 +350 @@
 
         /*Get nodal functions derivatives*/
-        IssmDouble* dbasis=xNew<IssmDouble>(2*numnodes);
+        IssmDouble* dbasis=xNew<IssmDouble>(dim*numnodes);
         element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
 

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

@@ -154 +154 @@
         Input* vx_input=topelement->GetInput(VxEnum); _assert_(vx_input);
         Input* vy_input=NULL;
-        if(dim>1) topelement->GetInput(VyEnum); _assert_(vy_input);
+        if(dim>1){topelement->GetInput(VyEnum); _assert_(vy_input);}
         h = topelement->CharacteristicLength();
 
@@ -331 +331 @@
         /*Build B: */
         for(int i=0;i<numnodes;i++){
-                for(int j=0;j<dim;i++){
+                for(int j=0;j<dim;j++){
                         B[numnodes*j+i] = basis[i];
                 }
@@ -354 +354 @@
 
         /*Get nodal functions derivatives*/
-        IssmDouble* dbasis=xNew<IssmDouble>(2*numnodes);
+        IssmDouble* dbasis=xNew<IssmDouble>(dim*numnodes);
         element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);