Changeset 17859

Timestamp:

04/28/14 14:12:55 (11 years ago)

Author:

seroussi

Message:

BUG: fixed contact condition for FS

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (4 diffs)

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

@@ -1450 +1450 @@
         /*Intermediaries*/
         IssmDouble* xyz_list = NULL;
+        IssmDouble* xyz_list_base = NULL;
         IssmDouble  pressure,water_pressure,sigma_nn,viscosity,bed,base;
         IssmDouble  bed_normal[2];
@@ -1458 +1459 @@
         /* Get node coordinates and dof list: */
         GetVerticesCoordinates(&xyz_list);
+        GetVerticesCoordinatesTop(&xyz_list_base);
 
         /*Retrieve all inputs we will be needing: */
@@ -1484 +1486 @@
 
                         /*Get normal vector to the bed */
-                        NormalBase(&bed_normal[0],xyz_list);
+                        NormalBase(&bed_normal[0],xyz_list_base);
 
                         /*basalforce*/
@@ -1518 +1520 @@
         delete gauss;
         xDelete<IssmDouble>(xyz_list);
+        xDelete<IssmDouble>(xyz_list_base);
 }
 /*}}}*/