Index: /issm/trunk/src/c/parallel/control.cpp
===================================================================
--- /issm/trunk/src/c/parallel/control.cpp	(revision 1886)
+++ /issm/trunk/src/c/parallel/control.cpp	(revision 1887)
@@ -84,4 +84,8 @@
 	_printf_("\n   reading surface and bed slope computation model data:\n");
 	model->AddFormulation(fid,SlopeComputeAnalysisEnum());
+	
+	/*recover parameters: */
+	model->FindParam(&waitonlock,"waitonlock");
+	model->FindParam(&qmu_analysis,"qmu_analysis");
 
 	_printf_("initialize inputs:\n");
@@ -105,6 +109,4 @@
 
 	/*are we running the solution sequence, or a qmu wrapper around it? : */
-	model->FindParam(&qmu_analysis,"qmu_analysis");
-	
 	if(!qmu_analysis){
 
@@ -140,5 +142,4 @@
 
 	_printf_("write lock file:\n");
-	model->FindParam(&waitonlock,"waitonlock");
 	if (waitonlock){
 		WriteLockFile(lockname);
Index: /issm/trunk/src/c/parallel/diagnostic.cpp
===================================================================
--- /issm/trunk/src/c/parallel/diagnostic.cpp	(revision 1886)
+++ /issm/trunk/src/c/parallel/diagnostic.cpp	(revision 1887)
@@ -77,9 +77,12 @@
 	_printf_("\n   reading surface and bed slope computation model data:\n");
 	model->AddFormulation(fid,SlopeComputeAnalysisEnum());
+	
+	/*get parameters: */
+	model->FindParam(&qmu_analysis,"qmu_analysis");
+	model->FindParam(&waitonlock,"waitonlock");
 
 	_printf_("initialize inputs:\n");
 	model->FindParam(&u_g_initial,"u_g",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
 	model->FindParam(&numberofnodes,"numberofnodes");
-	model->FindParam(&qmu_analysis,"qmu_analysis");
 
 	inputs=new ParameterInputs;
@@ -119,5 +122,4 @@
 
 	_printf_("write lock file:\n");
-	model->FindParam(&waitonlock,"waitonlock");
 	if (waitonlock){
 		WriteLockFile(lockname);
Index: /issm/trunk/src/c/parallel/prognostic.cpp
===================================================================
--- /issm/trunk/src/c/parallel/prognostic.cpp	(revision 1886)
+++ /issm/trunk/src/c/parallel/prognostic.cpp	(revision 1887)
@@ -74,5 +74,10 @@
 	model->AddFormulation(fid,PrognosticAnalysisEnum());
 
-	//retrieve parameters used to fill inputs
+	/*recover parameters: */
+	model->FindParam(&waitonlock,"waitonlock");
+	model->FindParam(&qmu_analysis,"qmu_analysis");
+
+	_printf_("initialize inputs:\n");
+	
 	model->FindParam(&u_g_serial,"u_g",PrognosticAnalysisEnum());
 	model->FindParam(&h_g_initial,"h_g",PrognosticAnalysisEnum());
@@ -82,8 +87,5 @@
 	model->FindParam(&yts,"yts");
 	model->FindParam(&numberofnodes,"numberofnodes");
-	model->FindParam(&qmu_analysis,"qmu_analysis");
-	model->FindParam(&waitonlock,"waitonlock");
-
-	_printf_("initialize inputs:\n");
+	
 	inputs=new ParameterInputs;
 	inputs->Add("velocity",u_g_serial,3,numberofnodes);
Index: /issm/trunk/src/c/parallel/steadystate.cpp
===================================================================
--- /issm/trunk/src/c/parallel/steadystate.cpp	(revision 1886)
+++ /issm/trunk/src/c/parallel/steadystate.cpp	(revision 1887)
@@ -89,13 +89,14 @@
 	model->AddFormulation(fid,MeltingAnalysisEnum(),SteadyAnalysisEnum());
 
+	/*recover parameters: */
+	model->FindParam(&waitonlock,"waitonlock");
+	model->FindParam(&qmu_analysis,"qmu_analysis");
+
 	_printf_("initialize inputs:\n");
-	
 	model->FindParam(&u_g_initial,"u_g",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
 	model->FindParam(&p_g_initial,"p_g",ThermalAnalysisEnum());
 	model->FindParam(&dt,"dt");
 	model->FindParam(&numberofnodes,"numberofnodes");
-	model->FindParam(&waitonlock,"waitonlock");
-	model->FindParam(&qmu_analysis,"qmu_analysis");
-
+	
 
 	inputs=new ParameterInputs;
Index: /issm/trunk/src/c/parallel/thermal.cpp
===================================================================
--- /issm/trunk/src/c/parallel/thermal.cpp	(revision 1886)
+++ /issm/trunk/src/c/parallel/thermal.cpp	(revision 1887)
@@ -75,12 +75,14 @@
 	model->AddFormulation(fid,MeltingAnalysisEnum(),0);
 
+	/*recover parameters: */
+	model->FindParam(&waitonlock,"waitonlock");
+	model->FindParam(&qmu_analysis,"qmu_analysis");
+	
 	_printf_("initialize inputs:\n");
 	model->FindParam(&u_g,"u_g",ThermalAnalysisEnum(),0);
 	model->FindParam(&p_g,"p_g",ThermalAnalysisEnum(),0);
 	model->FindParam(&numberofnodes,"numberofnodes");
-	model->FindParam(&waitonlock,"waitonlock");
 	model->FindParam(&dt,"dt");
 	model->FindParam(&yts,"yts");
-	model->FindParam(&qmu_analysis,"qmu_analysis");
 
 	inputs=new ParameterInputs;
@@ -123,6 +125,4 @@
 
 	_printf_("write lock file:\n");
-	model->FindParam(&waitonlock,"waitonlock");
-
 	if (waitonlock){
 		WriteLockFile(lockname);
Index: /issm/trunk/src/c/parallel/transient.cpp
===================================================================
--- /issm/trunk/src/c/parallel/transient.cpp	(revision 1886)
+++ /issm/trunk/src/c/parallel/transient.cpp	(revision 1887)
@@ -99,6 +99,9 @@
 	}
 
+	/*recover parameters: */
+	model->FindParam(&waitonlock,"waitonlock");
+	model->FindParam(&qmu_analysis,"qmu_analysis");
+
 	_printf_("initialize inputs:\n");
-	
 	model->FindParam(&u_g,"u_g",ThermalAnalysisEnum());
 	model->FindParam(&m_g,"m_g",ThermalAnalysisEnum());
@@ -107,7 +110,5 @@
 	model->FindParam(&dt,"dt");
 	model->FindParam(&yts,"yts");
-	model->FindParam(&waitonlock,"waitonlock");
-	model->FindParam(&qmu_analysis,"qmu_analysis");
-
+	
 
 	inputs=new ParameterInputs;