Changeset 17141

Timestamp:

01/17/14 13:38:33 (11 years ago)

Author:

seroussi

Message:

CHG: improved FS analytical 2

File:

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

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

@@ -6 +6 @@
 #include "../solutionsequences/solutionsequences.h"
 
-//#define FSANALYTICAL 1
+//#define FSANALYTICAL 2
 
 /*Model processing*/
@@ -2762 +2762 @@
                 z_coord=element->GetZcoord(gauss);
 
-                forcex=fx1(x_coord,y_coord,z_coord);
-                forcey=fy1(x_coord,y_coord,z_coord);
-                forcez=fz1(x_coord,y_coord,z_coord);
+                #if FSANALYTICAL == 1
+                        forcex=fx1(x_coord,y_coord,z_coord);
+                        forcey=fy1(x_coord,y_coord,z_coord);
+                        forcez=fz1(x_coord,y_coord,z_coord);
+                #elseif FSANALYTICAL == 2
+                        forcex=fx2(x_coord,y_coord,z_coord);
+                        forcey=fy2(x_coord,y_coord,z_coord);
+                        forcez=fz2(x_coord,y_coord,z_coord);
+                #else 
+                        _error_("FS analytical not implemented yet");
+                #endif
 
                 for(i=0;i<vnumnodes;i++){
@@ -3155 +3163 @@
          *
          *      In 3d
-         *         Bvi=[ dh/dx          0             0      ]
-         *                                      [   0           dh/dy           0      ]
-         *                                      [   0             0           dh/dz    ]
-         *                                      [ 1/2*dh/dy    1/2*dh/dx        0      ]
-         *                                      [ 1/2*dh/dz       0         1/2*dh/dx  ]
-         *                                      [   0          1/2*dh/dz    1/2*dh/dy  ]
-         *                                      [   0             0             0      ]
-         *                                      [ dh/dx         dh/dy         dh/dz    ]
+         *         Bvi=[ dh/dx     0        0    ]
+         *                                      [   0      dh/dy      0    ]
+         *                                      [   0        0      dh/dz  ]
+         *                                      [ dh/dy    dh/dx      0    ]
+         *                                      [ dh/dz      0      dh/dx  ]
+         *                                      [   0      dh/dz    dh/dy  ]
+         *                                      [ dh/dx    dh/dy    dh/dz  ]
+         *                                      [   0        0        0    ]
          *
          *         Bpi=[ 0 ]
@@ -3170 +3178 @@
          *                                      [ 0 ]
          *                                      [ 0 ]
+         *                                      [ 0 ]
          *                                      [ h ]
-         *                                      [ 0 ]
          *      where phi is the finiteelement function for node i.
          *      In 3d: