Changeset 18218

Timestamp:

07/03/14 09:30:45 (11 years ago)

Author:

seroussi

Message:

BUG: minor problem in FS analytical

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (5 diffs)

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

@@ -7 +7 @@
 #include "../cores/cores.h"
 
-//#define FSANALYTICAL 2
+//#define FSANALYTICAL 24
 
 /*Model processing*/
@@ -3188 +3188 @@
         IssmDouble  x_coord,y_coord,z_coord;
         IssmDouble *xyz_list_base = NULL;
+        IssmDouble *xyz_list      = NULL;
         Gauss*      gauss         = NULL;
 
@@ -3205 +3206 @@
         /*Retrieve all inputs and parameters*/
         element->GetVerticesCoordinatesBase(&xyz_list_base);
+        element->GetVerticesCoordinates(&xyz_list);
         Input* vx_input         = element->GetInput(VxEnum);      _assert_(vx_input);
         Input* vy_input         = element->GetInput(VyEnum);      _assert_(vy_input);
@@ -3215 +3217 @@
                 gauss->GaussPoint(ig);
 
-                x_coord=element->GetXcoord(xyz_list_base,gauss);
-                y_coord=element->GetYcoord(xyz_list_base,gauss);
-                if(dim==3) z_coord=element->GetZcoord(xyz_list_base,gauss);
+                x_coord=element->GetXcoord(xyz_list,gauss);
+                y_coord=element->GetYcoord(xyz_list,gauss);
+                if(dim==3) z_coord=element->GetZcoord(xyz_list,gauss);
                 else z_coord=0.;
 
@@ -3236 +3238 @@
         /*Clean up and return*/
         delete gauss;
+        xDelete<IssmDouble>(xyz_list);
         xDelete<IssmDouble>(xyz_list_base);
         xDelete<IssmDouble>(B);