Index: /issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp
===================================================================
--- /issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp	(revision 4350)
+++ /issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp	(revision 4351)
@@ -25,9 +25,9 @@
 	if(iomodel->control_analysis){
 
-		if (strcmp(iomodel->control_type,"drag")==0){
+		if (strcmp(iomodel->control_type,"drag_coefficient")==0){
 			parameters->AddObject(new BoolParam(ExtrudeParamEnum,false));
 			parameters->AddObject(new IntParam(ControlTypeEnum,DragCoefficientEnum));
 		}
-		else  if (strcmp(iomodel->control_type,"B")==0){
+		else  if (strcmp(iomodel->control_type,"rheology_B")==0){
 			parameters->AddObject(new BoolParam(ExtrudeParamEnum,true));
 			parameters->AddObject(new IntParam(ControlTypeEnum,RheologyBEnum));
Index: /issm/trunk/src/c/solutions/stokescontrolinit.cpp
===================================================================
--- /issm/trunk/src/c/solutions/stokescontrolinit.cpp	(revision 4350)
+++ /issm/trunk/src/c/solutions/stokescontrolinit.cpp	(revision 4351)
@@ -15,8 +15,8 @@
 
 	/*flags: */
-	int verbose=0;
-	int isstokes=0;
+	int    verbose = 0;
+	bool   isstokes;
 	double stokesreconditioning;
-	bool conserve_loads=true;
+	bool   conserve_loads = true;
 	
 	/*first recover parameters common to all solutions:*/
@@ -26,5 +26,8 @@
 
 	/*if no Stokes analysis carried out, assign output and return*/
-	if (!isstokes)femmodel->SetCurrentAnalysis(DiagnosticHorizAnalysisEnum);
+	if (!isstokes){
+		femmodel->SetCurrentAnalysis(DiagnosticHorizAnalysisEnum);
+		return;
+	}
 
 	/* For Stokes inverse control method, we are going to carry out the inversion only on the Stokes part. So we need