Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 17112)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 17113)
@@ -178,7 +178,5 @@
 					./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\
Index: /issm/trunk-jpl/src/c/shared/FSanalyticals/FSanalytical1.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/FSanalyticals/FSanalytical1.cpp	(revision 17113)
+++ /issm/trunk-jpl/src/c/shared/FSanalyticals/FSanalytical1.cpp	(revision 17113)
@@ -0,0 +1,36 @@
+/*!\file fx.cpp
+ * \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 fx1(IssmDouble x,IssmDouble y,IssmDouble z){   
+	IssmDouble p = 2.0;  
+	IssmDouble q = 2.0;   
+	IssmDouble functionx;
+
+	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;
+}
Index: /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.h	(revision 17112)
+++ /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.h	(revision 17113)
@@ -8,7 +8,7 @@
 #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_
Index: sm/trunk-jpl/src/c/shared/FSanalyticals/fx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/FSanalyticals/fx.cpp	(revision 17112)
+++ 	(revision )
@@ -1,18 +1,0 @@
-/*!\file fx.cpp
- * \brief: analytical fonction for FS
- */
-
-#include <math.h>
-#include "../Numerics/types.h"
-
-IssmDouble fx(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;
-
-	return functionx;
-}
Index: sm/trunk-jpl/src/c/shared/FSanalyticals/fy.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/FSanalyticals/fy.cpp	(revision 17112)
+++ 	(revision )
@@ -1,18 +1,0 @@
-/*!\file fy.cpp
- * \brief: analytical fonction for FS
- */
-
-#include <math.h>
-#include "../Numerics/types.h"
-
-IssmDouble fy(IssmDouble x,IssmDouble y,IssmDouble z){   
-	IssmDouble p = 2.0;  
-	IssmDouble q = 2.0;   
-	IssmDouble cst = 1.0;  
-	IssmDouble n   = 1.0;
-	IssmDouble functiony;
-
-	functiony=x+y+z;
-
-	return functiony;
-}
Index: sm/trunk-jpl/src/c/shared/FSanalyticals/fz.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/FSanalyticals/fz.cpp	(revision 17112)
+++ 	(revision )
@@ -1,18 +1,0 @@
-/*!\file fz.cpp
- * \brief: analytical fonction for FS
- */
-
-#include <math.h>
-#include "../Numerics/types.h"
-
-IssmDouble fz(IssmDouble x,IssmDouble y,IssmDouble z){   
-	IssmDouble p = 2.0;  
-	IssmDouble q = 2.0;   
-	IssmDouble cst = 1.0;  
-	IssmDouble n   = 1.0;
-	IssmDouble functionz;
-
-	functionz=x+y+z;
-
-	return functionz;
-}