Changeset 17306

Timestamp:

02/19/14 13:17:59 (11 years ago)

Author:

seroussi

Message:

NEW: additional analytical 2d tests

Location:

issm/trunk-jpl/src/c/shared/FSanalyticals

Files:

• fsanalyticals.cpp (modified) (4 diffs)
• fsanalyticals.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.cpp ¶

@@ -32 +32 @@
                 case 6: 
                         return fx=fx6(x,y,z);
+                case 7: 
+                        return fx=fx7(x,y);
+                case 8: 
+                        return fx=1.0;
                 default:
                         _error_("FS analytical solution"<<testid<<" not implemented yet");
@@ -53 +57 @@
                 case 6: 
                         return fy=fy6(x,y,z);
+                case 7: 
+                        return fy=fy7(x,y);
+                case 8: 
+                        return fy=1.0;
                 default:
                         _error_("FS analytical solution"<<testid<<" not implemented yet");
@@ -62 +70 @@
 
         switch(testid){
-                case 1: case 2:
+                case 1: case 2: case 7: case 8:
                         return fz=0.;
                 case 3: 
@@ -228 +236 @@
 }
 /*}}}*/
+IssmDouble fx7(IssmDouble x,IssmDouble y){/*{{{*/
+        IssmDouble functionx;
+        IssmDouble z=y;
+
+        functionx =  4*pow(x, 2)*z*pow(x - 1, 2) + 4*pow(x, 2)*z*(z - 1)*(2*z - 1) + 4*pow(x, 2)*pow(x - 1, 2)*(z - 1) + 2*pow(x, 2)*pow(x - 1, 2)*(2*z - 1) + 16*x*z*(x - 1)*(z - 1)*(2*z - 1) - 4*pow(z, 3)*(6*pow(x, 2) - 6*x + 1) + 6*pow(z, 2)*(6*pow(x, 2) - 6*x + 1) + 4*z*pow(x - 1, 2)*(z - 1)*(2*z - 1) - 2*z*(6*pow(x, 2) - 6*x + 1) + 1;
+        return functionx;
+}
+/*}}}*/
+IssmDouble fy7(IssmDouble x,IssmDouble y){   /*{{{*/
+        IssmDouble functiony;
+        IssmDouble z=y;
+
+        functiony = -8*pow(x, 3) + 4*pow(x, 2)*z*(x - 1)*(z - 1) + 2*pow(x, 2)*z*(x - 1)*(2*z - 1) + 2*pow(x, 2)*(x - 1)*(z - 1)*(2*z - 1) + 12*pow(x, 2) + 4*x*z*pow(x - 1, 2)*(z - 1) + 2*x*z*pow(x - 1, 2)*(2*z - 1) + 2*x*pow(x - 1, 2)*(z - 1)*(2*z - 1) - 4*x - 6*pow(z, 4)*(2*x - 1) + 12*pow(z, 3)*(2*x - 1) - 6*pow(z, 2)*(2*x - 1) - 24*pow(z, 2)*(2*pow(x, 3) - 3*pow(x, 2) + x) + 24*z*(2*pow(x, 3) - 3*pow(x, 2) + x);
+
+        return functiony;
+}
+/*}}}*/

issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.h ¶

@@ -27 +27 @@
 IssmDouble fy6(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 IssmDouble fz6(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fx7(IssmDouble x_coord, IssmDouble y_coord);
+IssmDouble fy7(IssmDouble x_coord, IssmDouble y_coord);
 
 #endif //ifndef _SHARED_ANALYTICALS_H_