source: issm/oecreview/Archive/16554-17801/ISSM-17284-17285.diff

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

@@ -13 +13 @@
 IssmDouble fx2(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 IssmDouble fy2(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
 IssmDouble fz2(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord);
+IssmDouble fx3(IssmDouble x_coord, IssmDouble y_coord);
+IssmDouble fy3(IssmDouble x_coord, IssmDouble y_coord);
 
 #endif //ifndef _SHARED_ANALYTICALS_H_

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

@@ +1 @@
+/*!\file fx.cpp
+ * \brief: analytical fonction for FS 
+ * test case for a cube with Dirichlet conditions on all faces and no variation in z
+ */
+
+#include <math.h>
+#include "../Numerics/types.h"
+#include "../Numerics/constants.h"
+
+IssmDouble fx2(IssmDouble x,IssmDouble y{   
+        IssmDouble p = 2.0;  
+        IssmDouble q = 2.0;   
+        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;
+
+        return functionx;
+}
+IssmDouble fy2(IssmDouble x,IssmDouble y){   
+        IssmDouble p = 2.0;  
+        IssmDouble q = 2.0;   
+        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;
+
+        return functiony;
+}

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

@@ -179 +179 @@
                                         ./shared/FSanalyticals/fsanalyticals.h\
                                         ./shared/FSanalyticals/FSanalytical1.cpp\
                                         ./shared/FSanalyticals/FSanalytical2.cpp\
+                                        ./shared/FSanalyticals/FSanalytical3.cpp\
                                         ./shared/Enum/Enum.h\
                                         ./shared/Enum/EnumDefinitions.h\
                                         ./shared/Enum/EnumToStringx.cpp\