Changeset 3436 for issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp

Timestamp:

04/07/10 16:45:45 (15 years ago)

Author:

seroussi

Message:

change CreateParameters with numberofvertices

File:

• issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (2 diffs)

issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -181 +181 @@
                 count++;
                 param= new Param(count,"weights",DOUBLEVEC);
-                param->SetDoubleVec(iomodel->weights,iomodel->numberofnodes);
+                param->SetDoubleVec(iomodel->weights,iomodel->numberofvertices);
                 parameters->AddObject(param);
 
@@ -194 +194 @@
                 IoModelFetchData(&control_parameter,NULL,NULL,iomodel_handle,iomodel->control_type);
 
-                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;
+                u_g_obs=(double*)xcalloc(iomodel->numberofvertices*2,sizeof(double));
+                if(vx_obs)for(i=0;i<iomodel->numberofvertices;i++)u_g_obs[2*i+0]=vx_obs[i]/iomodel->yts;
+                if(vy_obs)for(i=0;i<iomodel->numberofvertices;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*iomodel->numberofnodes,2);
+                param->SetDoubleVec(u_g_obs,2*iomodel->numberofvertices,2);
                 parameters->AddObject(param);
                 
-                param_g=(double*)xcalloc(iomodel->numberofnodes,sizeof(double));
-                for(i=0;i<iomodel->numberofnodes;i++)param_g[i]=control_parameter[i];
+                param_g=(double*)xcalloc(iomodel->numberofvertices,sizeof(double));
+                for(i=0;i<iomodel->numberofvertices;i++)param_g[i]=control_parameter[i];
 
                 count++;
                 param= new Param(count,"param_g",DOUBLEVEC);
-                param->SetDoubleVec(param_g,iomodel->numberofnodes,1);
+                param->SetDoubleVec(param_g,iomodel->numberofvertices,1);
                 parameters->AddObject(param);