Index: /issm/trunk/src/c/solutions/adjoint_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/adjoint_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/adjoint_core.cpp	(revision 4331)
@@ -77,5 +77,5 @@
 
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==AdjointAnalysisEnum){
+	if(solution_type==AdjointSolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointxEnum);
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointyEnum);
Index: /issm/trunk/src/c/solutions/balancedthickness2_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/balancedthickness2_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/balancedthickness2_core.cpp	(revision 4331)
@@ -44,5 +44,5 @@
 
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==Balancedthickness2AnalysisEnum){
+	if(solution_type==Balancedthickness2SolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
 	}
Index: /issm/trunk/src/c/solutions/balancedthickness_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/balancedthickness_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/balancedthickness_core.cpp	(revision 4331)
@@ -39,5 +39,5 @@
 
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==BalancedthicknessAnalysisEnum){
+	if(solution_type==BalancedthicknessSolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
 	}
Index: /issm/trunk/src/c/solutions/balancedvelocities_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/balancedvelocities_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/balancedvelocities_core.cpp	(revision 4331)
@@ -39,5 +39,5 @@
 
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==BalancedvelocitiesAnalysisEnum){
+	if(solution_type==BalancedvelocitiesSolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
Index: /issm/trunk/src/c/solutions/bedslope_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/bedslope_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/bedslope_core.cpp	(revision 4331)
@@ -40,5 +40,5 @@
 	
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==BedSlopeAnalysisEnum){
+	if(solution_type==BedSlopeSolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeXEnum);
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeYEnum);
Index: /issm/trunk/src/c/solutions/diagnostic.cpp
===================================================================
--- /issm/trunk/src/c/solutions/diagnostic.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/diagnostic.cpp	(revision 4331)
@@ -38,5 +38,5 @@
 	const int numanalyses=6;
 	const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum};
-	const int solution_type=DiagnosticAnalysisEnum;
+	const int solution_type=DiagnosticSolutionEnum;
 
 	MODULEBOOT();
Index: /issm/trunk/src/c/solutions/diagnostic_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/diagnostic_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/diagnostic_core.cpp	(revision 4331)
@@ -87,5 +87,5 @@
 
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==DiagnosticAnalysisEnum){
+	if(solution_type==DiagnosticSolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
Index: /issm/trunk/src/c/solutions/prognostic2_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/prognostic2_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/prognostic2_core.cpp	(revision 4331)
@@ -37,5 +37,5 @@
 
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==Prognostic2AnalysisEnum){
+	if(solution_type==Prognostic2SolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
 	}
Index: /issm/trunk/src/c/solutions/prognostic_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/prognostic_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/prognostic_core.cpp	(revision 4331)
@@ -35,5 +35,5 @@
 
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==PrognosticAnalysisEnum){
+	if(solution_type==PrognosticSolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
 	}
Index: /issm/trunk/src/c/solutions/steadystate_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/steadystate_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/steadystate_core.cpp	(revision 4331)
@@ -58,5 +58,5 @@
 	
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==SteadystateAnalysisEnum){
+	if(solution_type==SteadystateSolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
Index: /issm/trunk/src/c/solutions/surfaceslope_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/surfaceslope_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/surfaceslope_core.cpp	(revision 4331)
@@ -40,5 +40,5 @@
 	
 	if(verbose)_printf_("saving results:\n");
-	if(solution_type==SurfaceSlopeAnalysisEnum){
+	if(solution_type==SurfaceSlopeSolutionEnum){
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeXEnum);
 		InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeYEnum);
Index: /issm/trunk/src/c/solutions/thermal_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/thermal_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/thermal_core.cpp	(revision 4331)
@@ -48,5 +48,5 @@
 
 		if(verbose)_printf_("saving results:\n");
-		if(solution_type==ThermalAnalysisEnum){
+		if(solution_type==ThermalSolutionEnum){
 			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i,time);
 			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,i,time);
Index: /issm/trunk/src/c/solutions/transient2d_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/transient2d_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/transient2d_core.cpp	(revision 4331)
@@ -52,5 +52,5 @@
 
 		if(verbose)_printf_("%s\n","saving results:\n");
-		if(solution_type==Transient2DAnalysisEnum){
+		if(solution_type==Transient2DSolutionEnum){
 			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time); 
 			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);
Index: /issm/trunk/src/c/solutions/transient3d_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/transient3d_core.cpp	(revision 4330)
+++ /issm/trunk/src/c/solutions/transient3d_core.cpp	(revision 4331)
@@ -60,5 +60,5 @@
 
 		if(verbose)_printf_("%s\n","saving results:\n");
-		if(solution_type==Transient3DAnalysisEnum){
+		if(solution_type==Transient3DSolutionEnum){
 			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time);
 			InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);