Index: /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp	(revision 4122)
+++ /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp	(revision 4123)
@@ -290,5 +290,5 @@
 		case WaitOnLockEnum : return "WaitOnLock";
 		case YtsEnum : return "Yts";
-		default : ISSMERROR("Enum %i not found",en);
+		default : return "unknown";
 
 	}
Index: /issm/trunk/src/c/EnumDefinitions/SynchronizeStrings.sh
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/SynchronizeStrings.sh	(revision 4122)
+++ /issm/trunk/src/c/EnumDefinitions/SynchronizeStrings.sh	(revision 4123)
@@ -101,5 +101,5 @@
 #Add footer of of EnumAsString.cpp{{{1
 cat <<END >> EnumAsString.cpp
-		default : ISSMERROR("Enum %i not found",en);
+		default : return "unknown";
 
 	}
Index: /issm/trunk/src/c/objects/Elements/Penta.cpp
===================================================================
--- /issm/trunk/src/c/objects/Elements/Penta.cpp	(revision 4122)
+++ /issm/trunk/src/c/objects/Elements/Penta.cpp	(revision 4123)
@@ -634,55 +634,39 @@
 void  Penta::InputUpdateFromSolution(double* solution){
 
-	int analysis_type,sub_analysis_type;
-
-	/*retrive parameters: */
+	int analysis_type;
+
+	/*retreive parameters: */
 	parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-	parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
 
 	/*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */
 	if (analysis_type==ControlAnalysisEnum){
-		
 		InputUpdateFromSolutionDiagnosticHoriz( solution);
 	}
-	else if (analysis_type==DiagnosticAnalysisEnum){
-	
-		if (sub_analysis_type==HorizAnalysisEnum){
-
-			InputUpdateFromSolutionDiagnosticHoriz( solution);
-		}
-		else if (sub_analysis_type==StokesAnalysisEnum){
-
-			InputUpdateFromSolutionDiagnosticStokes( solution);
-		}
-		else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
-
+	else if (analysis_type==DiagnosticHorizAnalysisEnum){
+		InputUpdateFromSolutionDiagnosticHoriz( solution);
+	}
+	else if (analysis_type==DiagnosticStokesAnalysisEnum){
+		InputUpdateFromSolutionDiagnosticStokes( solution);
 	}
 	else if (analysis_type==SlopeAnalysisEnum){
-
 		InputUpdateFromSolutionSlopeCompute( solution);
 	}
 	else if (analysis_type==PrognosticAnalysisEnum){
-
 		InputUpdateFromSolutionPrognostic( solution);
 	}
 	else if (analysis_type==Prognostic2AnalysisEnum){
-
 		InputUpdateFromSolutionPrognostic2(solution);
 	}
 	else if (analysis_type==BalancedthicknessAnalysisEnum){
-
 		InputUpdateFromSolutionBalancedthickness( solution);
 	}
 	else if (analysis_type==Balancedthickness2AnalysisEnum){
-
 		InputUpdateFromSolutionBalancedthickness2( solution);
 	}
 	else if (analysis_type==BalancedvelocitiesAnalysisEnum){
-
 		InputUpdateFromSolutionBalancedvelocities( solution);
 	}
 	else{
-
-		ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
+		ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumAsString(analysis_type));
 	}
 }
Index: /issm/trunk/src/c/objects/Elements/Tria.cpp
===================================================================
--- /issm/trunk/src/c/objects/Elements/Tria.cpp	(revision 4122)
+++ /issm/trunk/src/c/objects/Elements/Tria.cpp	(revision 4123)
@@ -575,9 +575,8 @@
 void  Tria::InputUpdateFromSolution(double* solution){
 
-	int analysis_type,sub_analysis_type;
+	int analysis_type;
 
 	/*retrive parameters: */
 	parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-	parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
 
 	/*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */
@@ -585,9 +584,6 @@
 		InputUpdateFromSolutionDiagnosticHoriz( solution);
 	}
-	else if (analysis_type==DiagnosticAnalysisEnum){
-		if (sub_analysis_type==HorizAnalysisEnum){
-			InputUpdateFromSolutionDiagnosticHoriz( solution);
-		}
-		else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
+	else if (analysis_type==DiagnosticHorizAnalysisEnum){
+		InputUpdateFromSolutionDiagnosticHoriz( solution);
 	}
 	else if (analysis_type==SlopeAnalysisEnum){
@@ -610,5 +606,5 @@
 	}
 	else{
-		ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
+		ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumAsString(analysis_type));
 	}
 }