Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 5461)
+++ /issm/trunk/src/c/Makefile.am	(revision 5462)
@@ -1108,5 +1108,4 @@
 					./solutions/WriteLockFile.cpp\
 					./solutions/control_core.cpp\
-					./solutions/stokescontrolinit.cpp\
 					./solutions/controlrestart.cpp\
 					./solutions/controlconvergence.cpp\
Index: /issm/trunk/src/c/solutions/control_core.cpp
===================================================================
--- /issm/trunk/src/c/solutions/control_core.cpp	(revision 5461)
+++ /issm/trunk/src/c/solutions/control_core.cpp	(revision 5462)
@@ -25,4 +25,5 @@
 	int     dim;
 	int     solution_type;
+	bool    isstokes;
 
 	double* responses=NULL;
@@ -56,4 +57,5 @@
 	femmodel->parameters->FindParam(&dim,DimEnum);
 	femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+	femmodel->parameters->FindParam(&isstokes,IsStokesEnum);
 	/*}}}*/
 
@@ -62,8 +64,7 @@
 	AdjointCorePointerFromSolutionEnum(&adjointcore,solution_type);
 
-	/*some preliminary work to be done if running full-Stokes analysis: */
-//	if (solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum){
-//		stokescontrolinit(femmodel);
-//	}
+	/*Launch once a complete solution to set up all inputs*/
+	_printf_("%s\n","      preparing initial solution");
+	if (isstokes) solutioncore(femmodel);
 
 	/*Initialize responses: */
Index: /issm/trunk/src/c/solutions/solutions.h
===================================================================
--- /issm/trunk/src/c/solutions/solutions.h	(revision 5461)
+++ /issm/trunk/src/c/solutions/solutions.h	(revision 5462)
@@ -43,5 +43,4 @@
 //diverse
 void WriteLockFile(char* filename);
-void stokescontrolinit(FemModel* femmodel);
 void controlrestart(FemModel* femmodel,double* J);
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
Index: sm/trunk/src/c/solutions/stokescontrolinit.cpp
===================================================================
--- /issm/trunk/src/c/solutions/stokescontrolinit.cpp	(revision 5461)
+++ 	(revision )
@@ -1,53 +1,0 @@
-/*!\file: stokescontrolinit.cpp
- * \brief: ...
- */ 
-
-#include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
-#include "../shared/shared.h"
-#include "../EnumDefinitions/EnumDefinitions.h"
-#include "./solutions.h"
-#include "../modules/modules.h"
-#include "../include/include.h"
-#include "../solvers/solvers.h"
-
-void stokescontrolinit(FemModel* femmodel){
-
-	/*flags: */
-	int    verbose = 0;
-	bool   isstokes;
-	double stokesreconditioning;
-	bool   conserve_loads = true;
-	
-	/*first recover parameters common to all solutions:*/
-	femmodel->parameters->FindParam(&verbose,VerboseEnum);
-	femmodel->parameters->FindParam(&isstokes,IsStokesEnum);
-	femmodel->parameters->FindParam(&stokesreconditioning,StokesReconditioningEnum);
-
-	/*if no Stokes analysis carried out, assign output and return*/
-	if (!isstokes){
-		femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-		return;
-	}
-
-	/* For Stokes inverse control method, we are going to carry out the inversion only on the Stokes part. So we need 
-	 * to solve the Hutter or MacAyeal/Pattyn femmodel here, and constrain the Stokes femmodel using the Hutter 
-	 * or MacAyeal/Pattyn at the boundary. We don't want to have to do that at every inversion step, as 
-	 * it needs be done only once: */
-
-	/*Compute slopes: */
-	bedslope_core(femmodel);
-	
-	/*Run a complete diagnostic to update the Stokes spcs: */
-	femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-	solver_diagnostic_nonlinear(femmodel,conserve_loads);
-	femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
-	solver_linear(femmodel);
-
-	if(verbose)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");
-	ResetBoundaryConditions(femmodel,DiagnosticStokesAnalysisEnum);
-
-	if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");
-	femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum);
-	solver_diagnostic_nonlinear(femmodel,conserve_loads);
-}