Changeset 18209

Timestamp:

07/01/14 15:30:36 (11 years ago)

Author:

seroussi

Message:

BUG: forgot to add correction term in analytical FS

File:

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

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

@@ -7 +7 @@
 #include "../cores/cores.h"
 
-//#define FSANALYTICAL 21
+#define FSANALYTICAL 2
 
 /*Model processing*/
@@ -3215 +3215 @@
                 gauss->GaussPoint(ig);
 
-                x_coord=element->GetXcoord(xyz_list,gauss);
-                y_coord=element->GetYcoord(xyz_list,gauss);
-                if(dim==3) z_coord=element->GetZcoord(xyz_list,gauss);
+                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);
                 else z_coord=0.;
 
@@ -3302 +3302 @@
         if(fe_FS==XTaylorHoodEnum){
                 ElementVector* pe2=CreatePVectorFSViscousXTH(element);
+                ElementVector* pe3 = new ElementVector(pe,pe2);
+                delete pe;
+                delete pe2;
+                return pe3;
+        }
+        else if(fe_FS==LATaylorHoodEnum){
+                ElementVector* pe2=CreatePVectorFSViscousLATH(element);
                 ElementVector* pe3 = new ElementVector(pe,pe2);
                 delete pe;