Changeset 17113

Timestamp:

01/14/14 16:20:16 (11 years ago)

Author:

seroussi

Message:

CHG: adding analytical function values

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• shared/FSanalyticals/FSanalytical1.cpp (moved) (moved from issm/trunk-jpl/src/c/shared/FSanalyticals/fx.cpp ) (1 diff)
• shared/FSanalyticals/fsanalyticals.h (modified) (1 diff)
• shared/FSanalyticals/fy.cpp (deleted)
• shared/FSanalyticals/fz.cpp (deleted)

issm/trunk-jpl/src/c/Makefile.am

@@ -178 +178 @@
                                         ./shared/LatLong/Xy2llx.cpp\
                                         ./shared/FSanalyticals/fsanalyticals.h\
-                                        ./shared/FSanalyticals/fx.cpp\
-                                        ./shared/FSanalyticals/fy.cpp\
-                                        ./shared/FSanalyticals/fz.cpp\
+                                        ./shared/FSanalyticals/FSanalytical1.cpp\
                                         ./shared/Enum/Enum.h\
                                         ./shared/Enum/EnumDefinitions.h\

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

@@ -1 +1 @@
 /*!\file fx.cpp
- * \brief: analytical fonction for FS
+ * \brief: analytical fonction for FS 
+ * test case for a cube with Dirichlet conditions on all faces
  */
 
 #include <math.h>
 #include "../Numerics/types.h"
+#include "../Numerics/constants.h"
 
-IssmDouble fx(IssmDouble x,IssmDouble y,IssmDouble z){   
+IssmDouble fx1(IssmDouble x,IssmDouble y,IssmDouble z){   
         IssmDouble p = 2.0;  
         IssmDouble q = 2.0;   
-        IssmDouble cst = 1.0;  
-        IssmDouble n   = 1.0;
         IssmDouble functionx;
 
-        functionx=1.0;
+        functionx =  4. * PI*PI * p*p * (cos(p*PI*x)-1) * sin(p*PI*y) * sin(p*PI*z)+ 2. * PI*PI*p*p*  sin(p*PI*y)    * sin(p*PI*z) * cos(p*PI*x) + q * PI * cos(q*PI*x) * sin(q*PI*y) * sin(q*PI*z);
 
         return functionx;
 }
+IssmDouble fy1(IssmDouble x,IssmDouble y,IssmDouble z){   
+        IssmDouble p = 2.0;  
+        IssmDouble q = 2.0;   
+        IssmDouble functiony;
+
+        functiony = - 4. * PI*PI * p*p * (cos(p*PI*y)-1) * sin(p*PI*x) * sin(p*PI*z)-  2. * PI*PI * p*p *  sin(p*PI*x)    * cos(p*PI*y) * sin(p*PI*z)+ q * PI * sin(q*PI*x) * cos(q*PI*y) * sin(q*PI*z);
+
+        return functiony;
+}
+IssmDouble fz1(IssmDouble x,IssmDouble y,IssmDouble z){   
+        IssmDouble p = 2.0;  
+        IssmDouble q = 2.0;   
+        IssmDouble functionz;
+
+        functionz = - 2. * PI*PI * p*p * (cos(p*PI*z)-1) * sin(p*PI*x) * sin(p*PI*y)-PI*PI * p*p *  sin(p*PI*x)    * sin(p*PI*y) * cos(p*PI*z)+ q * PI * sin(q*PI*x) * sin(q*PI*y) * cos(q*PI*z);
+
+        return functionz;
+}

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

@@ -8 +8 @@
 #include "../Numerics/types.h"
 
-IssmDouble fx(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
-IssmDouble fy(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
-IssmDouble fz(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fx1(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fy1(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fz1(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 
 #endif //ifndef _SHARED_ANALYTICALS_H_