Changeset 762

Timestamp:

06/04/09 11:52:05 (15 years ago)

Author:

Eric.Larour

Message:

Pug p_g on 2 dofs

File:

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

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

@@ -29 +29 @@
         double* vx_obs=NULL;
         double* vy_obs=NULL;
+        double* u_g_obs=NULL;
+        double* p_g=NULL;
 
         /*Get parameters: */
@@ -106 +108 @@
         ModelFetchData((void**)&control_parameter,NULL,NULL,model_handle,model->control_type,"Matrix","Mat");
 
-        if(vx_obs)for(i=0;i<model->numberofnodes;i++)vx_obs[i]=vx_obs[i]/model->yts;
-        if(vy_obs)for(i=0;i<model->numberofnodes;i++)vy_obs[i]=vy_obs[i]/model->yts;
+        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;
 
         count++;
-        param= new Param(count,"vx_obs",DOUBLEVEC);
-        if(vx_obs) param->SetDoubleVec(vx_obs,model->numberofnodes);
-        else param->SetDoubleVec(vx_obs,0);
+        param= new Param(count,"velocity_observed",DOUBLEVEC);
+        param->SetDoubleVec(u_g_obs,2*model->numberofnodes,2);
         parameters->AddObject(param);
+        
+        p_g=(double*)xcalloc(model->numberofnodes*2,sizeof(double));
+        for(i=0;i<model->numberofnodes;i++)p_g[2*i+0]=parameter[i];
 
         count++;
-        param= new Param(count,"vy_obs",DOUBLEVEC);
-        if(vy_obs) param->SetDoubleVec(vy_obs,model->numberofnodes);
-        else param->SetDoubleVec(vy_obs,0);
+        param= new Param(count,"parameter",DOUBLEVEC);
+        param->SetDoubleVec(p_g,model->numberofnodes,1);
         parameters->AddObject(param);
-
-        count++;
-        param= new Param(count,"control_parameter",DOUBLEVEC);
-        if(control_parameter) param->SetDoubleVec(control_parameter,model->numberofnodes);
-        else param->SetDoubleVec(control_parameter,0);
-        parameters->AddObject(param);
-
 
         xfree((void**)&vx_obs);
         xfree((void**)&vy_obs);
+        xfree((void**)&u_g_obs);
+        xfree((void**)&p_g);
         xfree((void**)&control_parameter);