Changeset 17404

Timestamp:

03/10/14 12:49:25 (11 years ago)

Author:

seroussi

Message:

NEW: another analytical solution

File:

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

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

@@ -19 +19 @@
         IssmDouble p=2;
         IssmDouble q=2;
+        IssmDouble a=1;
 
         switch(testid){
@@ -42 +43 @@
                 case 9:
                         return 4*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) + 2*pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x) + 2*x*z;
+                case 10:
+                        return 4*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) + 2*pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x) + PI*q*pow(z, a)*sin(PI*q*y)*cos(PI*q*x);
 
                 case 101: 
@@ -53 +56 @@
         IssmDouble p=2;
         IssmDouble q=2;
+        IssmDouble a=1;
 
         switch(testid){
@@ -76 +80 @@
                 case 9: 
                         return -2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*y) - 1)*sin(PI*p*x)*sin(PI*p*z) - pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*z)*cos(PI*p*y) + 2*y*z;
+                case 10:
+                        return -2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*y) - 1)*sin(PI*p*x)*sin(PI*p*z) - pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*z)*cos(PI*p*y) + PI*q*pow(z, a)*sin(PI*q*x)*cos(PI*q*y);
 
                 case 101: 
@@ -87 +93 @@
         IssmDouble p = 2.0;  
         IssmDouble q = 2.0;   
+        IssmDouble a = 1.0;
 
         switch(testid){
@@ -101 +108 @@
                 case 9:
                         return -2*pow(PI, 3)*pow(p, 3)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*sin(PI*p*y) - pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*y)*cos(PI*p*z) + pow(x, 2) + pow(y, 2);
+                case 10:
+                        return a*pow(z, a - 1)*(sin(PI*q*x)*sin(PI*q*y) + 1) - 2*pow(PI, 3)*pow(p, 3)*(cos(PI*p*z)/(PI*p) - 1/(PI*p))*sin(PI*p*x)*sin(PI*p*y) - pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*y)*cos(PI*p*z);
                 default:
                         _error_("FS analytical solution"<<testid<<" not implemented yet");