Changeset 17291

Timestamp:

02/17/14 11:51:54 (11 years ago)

Author:

seroussi

Message:

NEW: added analytical test 5:

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• shared/FSanalyticals/FSanalytical3.cpp (modified) (1 diff)
• shared/FSanalyticals/fsanalyticals.h (modified) (1 diff)

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

@@ -6 +6 @@
 #include "../solutionsequences/solutionsequences.h"
 
-//#define FSANALYTICAL 4
+//#define FSANALYTICAL 5
 
 /*Model processing*/
@@ -2907 +2907 @@
                         forcey=fy4(x_coord,y_coord,z_coord);
                         forcez=fz4(x_coord,y_coord,z_coord);
+                #elif FSANALYTICAL == 5
+                        forcex=fx5(x_coord,y_coord,z_coord);
+                        forcey=fy5(x_coord,y_coord,z_coord);
+                        forcez=fz5(x_coord,y_coord,z_coord);
                 #else 
                         _error_("FS analytical not implemented yet");

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

@@ -44 +44 @@
         return functionz;
 }
+IssmDouble fx5(IssmDouble x,IssmDouble y,IssmDouble z){   
+        IssmDouble functionx;
+        int p=2;
+        int q=2;
+
+        functionx = 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*sin(PI*q*y)*sin(PI*q*z)*cos(PI*q*x);
+
+        return functionx;
+}
+IssmDouble fy5(IssmDouble x,IssmDouble y,IssmDouble z){   
+        IssmDouble functiony;
+        int p=2;
+        int q=2;
+
+        functiony =  -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*sin(PI*q*x)*sin(PI*q*z)*cos(PI*q*y);
+
+        return functiony;
+}
+IssmDouble fz5(IssmDouble x,IssmDouble y,IssmDouble z){   
+        IssmDouble functionz;
+        int p=2;
+        int q=2;
+
+        functionz =  -2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*z) - 1)*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) + PI*q*sin(PI*q*x)*sin(PI*q*y)*cos(PI*q*z);
+
+        return functionz;
+}

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

@@ -19 +19 @@
 IssmDouble fy4(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 IssmDouble fz4(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fx5(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fy5(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fz5(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 
 #endif //ifndef _SHARED_ANALYTICALS_H_