Changeset 4670

Timestamp:

07/20/10 09:27:09 (15 years ago)

Author:

Eric.Larour

Message:

vx_obs and vy_obs not needed in parameters anymore.
took care of not writing Fit over in parameters.

File:

• issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp

@@ -203 +203 @@
                         if (strcmp(descriptor,"misfit")==0){
 
-                                /*We need the observed velocity: */
-                                IoModelFetchData(&iomodel->vx_obs,NULL,NULL,iomodel_handle,"vx_obs");
-                                IoModelFetchData(&iomodel->vy_obs,NULL,NULL,iomodel_handle,"vy_obs");
+                                /*We need the fit: */
                                 IoModelFetchData(&iomodel->fit,NULL,NULL,iomodel_handle,"fit");
-
-                                if(iomodel->vx_obs)for(i=0;i<iomodel->numberofvertices;i++)iomodel->vx_obs[2*i+0]=iomodel->vx_obs[i]/iomodel->yts;
-                                if(iomodel->vy_obs)for(i=0;i<iomodel->numberofvertices;i++)iomodel->vy_obs[2*i+1]=iomodel->vy_obs[i]/iomodel->yts;
-
-                                parameters->AddObject(new DoubleVecParam(VxObsEnum,iomodel->vx_obs,iomodel->numberofvertices));
-                                parameters->AddObject(new DoubleVecParam(VyObsEnum,iomodel->vy_obs,iomodel->numberofvertices));
-                                parameters->AddObject(new DoubleVecParam(FitEnum,iomodel->fit,iomodel->nsteps));
-
-                                xfree((void**)&iomodel->vx_obs);
-                                xfree((void**)&iomodel->vy_obs);
+                                parameters->SetParam(iomodel->fit,iomodel->nsteps,FitEnum);
                                 xfree((void**)&iomodel->fit);