Index: /issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp
===================================================================
--- /issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp	(revision 1836)
+++ /issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp	(revision 1837)
@@ -11,7 +11,7 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../Model.h"
+#include "../IoModel.h"
 
-void CreateParametersControl(DataSet** pparameters,Model* model,ConstDataHandle model_handle){
+void CreateParametersControl(DataSet** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){
 	
 	int i;
@@ -45,5 +45,5 @@
 	count++;
 	param= new Param(count,"control_type",STRING);
-	param->SetString(model->control_type);
+	param->SetString(iomodel->control_type);
 	parameters->AddObject(param);
 
@@ -51,7 +51,7 @@
 	count++;
 	param= new Param(count,"extrude_param",DOUBLE);
-	if (strcmp(model->control_type,"drag")==0)   param->SetDouble(0);
-	else if (strcmp(model->control_type,"B")==0) param->SetDouble(1);
-	else throw ErrorException(__FUNCT__,exprintf("control_type %s not supported yet!",model->control_type));
+	if (strcmp(iomodel->control_type,"drag")==0)   param->SetDouble(0);
+	else if (strcmp(iomodel->control_type,"B")==0) param->SetDouble(1);
+	else throw ErrorException(__FUNCT__,exprintf("control_type %s not supported yet!",iomodel->control_type));
 	parameters->AddObject(param);
 
@@ -59,5 +59,5 @@
 	count++;
 	param= new Param(count,"nsteps",INTEGER);
-	param->SetInteger(model->nsteps);
+	param->SetInteger(iomodel->nsteps);
 	parameters->AddObject(param);
 
@@ -65,5 +65,5 @@
 	count++;
 	param= new Param(count,"tolx",DOUBLE);
-	param->SetDouble(model->tolx);
+	param->SetDouble(iomodel->tolx);
 	parameters->AddObject(param);
 
@@ -71,5 +71,5 @@
 	count++;
 	param= new Param(count,"mincontrolconstraint",DOUBLE);
-	param->SetDouble(model->mincontrolconstraint);
+	param->SetDouble(iomodel->mincontrolconstraint);
 	parameters->AddObject(param);
 
@@ -77,5 +77,5 @@
 	count++;
 	param= new Param(count,"maxcontrolconstraint",DOUBLE);
-	param->SetDouble(model->maxcontrolconstraint);
+	param->SetDouble(iomodel->maxcontrolconstraint);
 	parameters->AddObject(param);
 	
@@ -83,5 +83,5 @@
 	count++;
 	param= new Param(count,"epsvel",DOUBLE);
-	param->SetDouble(model->epsvel);
+	param->SetDouble(iomodel->epsvel);
 	parameters->AddObject(param);
 	
@@ -89,64 +89,64 @@
 	count++;
 	param= new Param(count,"meanvel",DOUBLE);
-	param->SetDouble(model->meanvel);
+	param->SetDouble(iomodel->meanvel);
 	parameters->AddObject(param);
 
 	/*Now, recover fit, optscal and maxiter as vectors: */
-	ModelFetchData((void**)&model->fit,NULL,NULL,model_handle,"fit","Matrix","Mat");
-	ModelFetchData((void**)&model->optscal,NULL,NULL,model_handle,"optscal","Matrix","Mat");
-	ModelFetchData((void**)&model->maxiter,NULL,NULL,model_handle,"maxiter","Matrix","Mat");
+	IoModelFetchData((void**)&iomodel->fit,NULL,NULL,iomodel_handle,"fit","Matrix","Mat");
+	IoModelFetchData((void**)&iomodel->optscal,NULL,NULL,iomodel_handle,"optscal","Matrix","Mat");
+	IoModelFetchData((void**)&iomodel->maxiter,NULL,NULL,iomodel_handle,"maxiter","Matrix","Mat");
 
 	count++;
 	param= new Param(count,"fit",DOUBLEVEC);
-	param->SetDoubleVec(model->fit,model->nsteps);
+	param->SetDoubleVec(iomodel->fit,iomodel->nsteps);
 	parameters->AddObject(param);
 
 	count++;
 	param= new Param(count,"optscal",DOUBLEVEC);
-	param->SetDoubleVec(model->optscal,model->nsteps);
+	param->SetDoubleVec(iomodel->optscal,iomodel->nsteps);
 	parameters->AddObject(param);
 
 	count++;
 	param= new Param(count,"maxiter",DOUBLEVEC);
-	param->SetDoubleVec(model->maxiter,model->nsteps);
+	param->SetDoubleVec(iomodel->maxiter,iomodel->nsteps);
 	parameters->AddObject(param);
 
-	xfree((void**)&model->fit);
-	xfree((void**)&model->optscal);
-	xfree((void**)&model->maxiter);
+	xfree((void**)&iomodel->fit);
+	xfree((void**)&iomodel->optscal);
+	xfree((void**)&iomodel->maxiter);
 
 	/*Get vx, vx_obs, vy, vy_obs, and the parameter value: */
-	ModelFetchData((void**)&vx,NULL,NULL,model_handle,"vx","Matrix","Mat");
-	ModelFetchData((void**)&vy,NULL,NULL,model_handle,"vy","Matrix","Mat");
-	ModelFetchData((void**)&vz,NULL,NULL,model_handle,"vz","Matrix","Mat");
-	ModelFetchData((void**)&vx_obs,NULL,NULL,model_handle,"vx_obs","Matrix","Mat");
-	ModelFetchData((void**)&vy_obs,NULL,NULL,model_handle,"vy_obs","Matrix","Mat");
-	ModelFetchData((void**)&control_parameter,NULL,NULL,model_handle,model->control_type,"Matrix","Mat");
+	IoModelFetchData((void**)&vx,NULL,NULL,iomodel_handle,"vx","Matrix","Mat");
+	IoModelFetchData((void**)&vy,NULL,NULL,iomodel_handle,"vy","Matrix","Mat");
+	IoModelFetchData((void**)&vz,NULL,NULL,iomodel_handle,"vz","Matrix","Mat");
+	IoModelFetchData((void**)&vx_obs,NULL,NULL,iomodel_handle,"vx_obs","Matrix","Mat");
+	IoModelFetchData((void**)&vy_obs,NULL,NULL,iomodel_handle,"vy_obs","Matrix","Mat");
+	IoModelFetchData((void**)&control_parameter,NULL,NULL,iomodel_handle,iomodel->control_type,"Matrix","Mat");
 
-	u_g=(double*)xcalloc(model->numberofnodes*3,sizeof(double));
-	if(vx)for(i=0;i<model->numberofnodes;i++)u_g[3*i+0]=vx[i]/model->yts;
-	if(vy)for(i=0;i<model->numberofnodes;i++)u_g[3*i+1]=vy[i]/model->yts;
-	if(vz)for(i=0;i<model->numberofnodes;i++)u_g[3*i+2]=vz[i]/model->yts;
+	u_g=(double*)xcalloc(iomodel->numberofnodes*3,sizeof(double));
+	if(vx)for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+0]=vx[i]/iomodel->yts;
+	if(vy)for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+1]=vy[i]/iomodel->yts;
+	if(vz)for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+2]=vz[i]/iomodel->yts;
 
 	count++;
 	param= new Param(count,"u_g",DOUBLEVEC);
-	param->SetDoubleVec(u_g,3*model->numberofnodes,3);
+	param->SetDoubleVec(u_g,3*iomodel->numberofnodes,3);
 	parameters->AddObject(param);
 
-	u_g_obs=(double*)xcalloc(model->numberofnodes*2,sizeof(double));
-	if(vx_obs)for(i=0;i<model->numberofnodes;i++)u_g_obs[2*i+0]=vx_obs[i]/model->yts;
-	if(vy_obs)for(i=0;i<model->numberofnodes;i++)u_g_obs[2*i+1]=vy_obs[i]/model->yts;
+	u_g_obs=(double*)xcalloc(iomodel->numberofnodes*2,sizeof(double));
+	if(vx_obs)for(i=0;i<iomodel->numberofnodes;i++)u_g_obs[2*i+0]=vx_obs[i]/iomodel->yts;
+	if(vy_obs)for(i=0;i<iomodel->numberofnodes;i++)u_g_obs[2*i+1]=vy_obs[i]/iomodel->yts;
 
 	count++;
 	param= new Param(count,"u_g_obs",DOUBLEVEC);
-	param->SetDoubleVec(u_g_obs,2*model->numberofnodes,2);
+	param->SetDoubleVec(u_g_obs,2*iomodel->numberofnodes,2);
 	parameters->AddObject(param);
 	
-	param_g=(double*)xcalloc(model->numberofnodes,sizeof(double));
-	for(i=0;i<model->numberofnodes;i++)param_g[i]=control_parameter[i];
+	param_g=(double*)xcalloc(iomodel->numberofnodes,sizeof(double));
+	for(i=0;i<iomodel->numberofnodes;i++)param_g[i]=control_parameter[i];
 
 	count++;
 	param= new Param(count,"param_g",DOUBLEVEC);
-	param->SetDoubleVec(param_g,model->numberofnodes,1);
+	param->SetDoubleVec(param_g,iomodel->numberofnodes,1);
 	parameters->AddObject(param);