Index: /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.cpp	(revision 17303)
+++ /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.cpp	(revision 17304)
@@ -16,8 +16,8 @@
 #include "../shared.h"
 
-IssmDouble fx(IssmDouble x,IssmDouble y,IssmDouble z,int FSANALYTICAL){ /*{{{*/ 
+IssmDouble fx(IssmDouble x,IssmDouble y,IssmDouble z,int testid){ /*{{{*/ 
 	IssmDouble fx;
 
-	switch(FSANALYTICAL){
+	switch(testid){
 		case 1:
 			return fx=fx1(x,y);
@@ -33,12 +33,12 @@
 			return fx=fx6(x,y,z);
 		default:
-			_error_("FS analytical solution"<<FSANALYTICAL<<" not implemented yet");
+			_error_("FS analytical solution"<<testid<<" not implemented yet");
 	}
 }
 /*}}}*/
-IssmDouble fy(IssmDouble x,IssmDouble y,IssmDouble z,int FSANALYTICAL){ /*{{{*/ 
+IssmDouble fy(IssmDouble x,IssmDouble y,IssmDouble z,int testid){ /*{{{*/ 
 	IssmDouble fy;
 
-	switch(FSANALYTICAL){
+	switch(testid){
 		case 1:
 			return fy=fy1(x,y);
@@ -54,12 +54,12 @@
 			return fy=fy6(x,y,z);
 		default:
-			_error_("FS analytical solution"<<FSANALYTICAL<<" not implemented yet");
+			_error_("FS analytical solution"<<testid<<" not implemented yet");
 	}
 }
 /*}}}*/
-IssmDouble fz(IssmDouble x,IssmDouble y,IssmDouble z,int FSANALYTICAL){ /*{{{*/ 
+IssmDouble fz(IssmDouble x,IssmDouble y,IssmDouble z,int testid){ /*{{{*/ 
 	IssmDouble fz;
 
-	switch(FSANALYTICAL){
+	switch(testid){
 		case 1: case 2:
 			return fz=0.;
@@ -73,5 +73,5 @@
 			return fz=fz6(x,y,z);
 		default:
-			_error_("FS analytical solution"<<FSANALYTICAL<<" not implemented yet");
+			_error_("FS analytical solution"<<testid<<" not implemented yet");
 	}
 }
Index: /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.h	(revision 17303)
+++ /issm/trunk-jpl/src/c/shared/FSanalyticals/fsanalyticals.h	(revision 17304)
@@ -8,7 +8,7 @@
 #include "../Numerics/types.h"
 
-IssmDouble fx(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int FSANALYTICAL);
-IssmDouble fy(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int FSANALYTICAL);
-IssmDouble fz(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int FSANALYTICAL);
+IssmDouble fx(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int testid);
+IssmDouble fy(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int testid);
+IssmDouble fz(IssmDouble x_coord, IssmDouble y_coord, IssmDouble z_coord, int testid);
 IssmDouble fx1(IssmDouble x_coord, IssmDouble y_coord);
 IssmDouble fy1(IssmDouble x_coord, IssmDouble y_coord);