Changeset 17286

Timestamp:

02/15/14 14:44:42 (11 years ago)

Author:

seroussi

Message:

BUG: y instead of z

File:

• issm/trunk-jpl/src/c/shared/FSanalyticals/FSanalytical3.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/FSanalyticals/FSanalytical3.cpp

@@ -13 +13 @@
         IssmDouble functionx;
 
-        functionx =  -2*(z-1)*(z-1)*(x-1)*(2*x-1)*z-4*(z-1)*(z-1)*(x-1)*x*z-2*(z-1)*(z-1)*(2*x-1)*x*z +4*(z-1)*(2*z-1)*(x-1)*(x-1)*z+16*(z-1)*(2*z-1)*(x-1)*x*z+4*(z-1)*(2*z-1)*x*x*z +4*(z-1)*(x-1)*(x-1)*x*x-2*(z-1)*(x-1)*(2*x-1)*z*z-4*(z-1)*(x-1)*x*z*z -2*(z-1)*(2*x-1)*x*z*z+2*(2*z-1)*(x-1)*(x-1)*x*x+4*(x-1)*(x-1)*x*x*z+z-1/2;
-
+        functionx =  -2*(y-1)*(y-1)*(x-1)*(2*x-1)*y-4*(y-1)*(y-1)*(x-1)*x*y-2*(y-1)*(y-1)*(2*x-1)*x*y +4*(y-1)*(2*y-1)*(x-1)*(x-1)*y+16*(y-1)*(2*y-1)*(x-1)*x*y+4*(y-1)*(2*y-1)*x*x*y +4*(y-1)*(x-1)*(x-1)*x*x-2*(y-1)*(x-1)*(2*x-1)*y*y-4*(y-1)*(x-1)*x*y*y -2*(y-1)*(2*x-1)*x*y*y+2*(2*y-1)*(x-1)*(x-1)*x*x+4*(x-1)*(x-1)*x*x*y+y-1/2; 
         return functionx;
 }
@@ -22 +21 @@
         IssmDouble functiony;
 
-        functiony = -4*(z-1)*(z-1)*(x-1)*(2*x-1)*x-4*(z-1)*(z-1)*(x-1)*z*z-2*(z-1)*(z-1)*(2*x-1)*z*z -4*(z-1)*(z-1)*x*z*z+2*(z-1)*(2*z-1)*(x-1)*(x-1)*x+2*(z-1)*(2*z-1)*(x-1)*x*x +4*(z-1)*(x-1)*(x-1)*x*z-16*(z-1)*(x-1)*(2*x-1)*x*z+4*(z-1)*(x-1)*x*x*z +2*(2*z-1)*(x-1)*(x-1)*x*z+2*(2*z-1)*(x-1)*x*x*z -4*(x-1)*(2*x-1)*x*z*z+x-1/2;
+        functiony = -4*(y-1)*(y-1)*(x-1)*(2*x-1)*x-4*(y-1)*(y-1)*(x-1)*y*y-2*(y-1)*(y-1)*(2*x-1)*y*y -4*(y-1)*(y-1)*x*y*y+2*(y-1)*(2*y-1)*(x-1)*(x-1)*x+2*(y-1)*(2*y-1)*(x-1)*x*x +4*(y-1)*(x-1)*(x-1)*x*y-16*(y-1)*(x-1)*(2*x-1)*x*y+4*(y-1)*(x-1)*x*x*y +2*(2*y-1)*(x-1)*(x-1)*x*y+2*(2*y-1)*(x-1)*x*x*y -4*(x-1)*(2*x-1)*x*y*y+x-1/2;
 
         return functiony;