Changeset 3461
- Timestamp:
- 04/08/10 08:54:19 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp
r3446 r3461 45 45 /*parameters for misfit: */ 46 46 double* u_g_obs=NULL; 47 double* vx_obs=NULL;48 double* vy_obs=NULL;49 double* fit=NULL;50 47 51 48 #ifdef _SERIAL_ … … 153 150 #endif 154 151 155 156 152 /*Ok, we have all the response descriptors. Build a parameter with it: */ 157 153 count++; … … 212 208 } 213 209 } 214 215 210 216 211 /*Deal with data needed for some responses: */ … … 268 263 269 264 /*We need the observed velocity: */ 270 IoModelFetchData(& vx_obs,NULL,NULL,iomodel_handle,"vx_obs");271 IoModelFetchData(& vy_obs,NULL,NULL,iomodel_handle,"vy_obs");265 IoModelFetchData(&iomodel->vx_obs,NULL,NULL,iomodel_handle,"vx_obs"); 266 IoModelFetchData(&iomodel->vy_obs,NULL,NULL,iomodel_handle,"vy_obs"); 272 267 273 268 /*Now, recover fit: */ … … 275 270 276 271 u_g_obs=(double*)xcalloc(iomodel->numberofvertices*2,sizeof(double)); 277 if( vx_obs)for(i=0;i<iomodel->numberofvertices;i++)u_g_obs[2*i+0]=vx_obs[i]/iomodel->yts;278 if( vy_obs)for(i=0;i<iomodel->numberofvertices;i++)u_g_obs[2*i+1]=vy_obs[i]/iomodel->yts;272 if(iomodel->vx_obs)for(i=0;i<iomodel->numberofvertices;i++)u_g_obs[2*i+0]=iomodel->vx_obs[i]/iomodel->yts; 273 if(iomodel->vy_obs)for(i=0;i<iomodel->numberofvertices;i++)u_g_obs[2*i+1]=iomodel->vy_obs[i]/iomodel->yts; 279 274 280 275 count++; … … 288 283 parameters->AddObject(param); 289 284 285 xfree((void**)&iomodel->vx_obs); 286 xfree((void**)&iomodel->vy_obs); 287 xfree((void**)&iomodel->fit); 290 288 xfree((void**)&u_g_obs); 291 xfree((void**)&vx_obs); 292 xfree((void**)&vy_obs); 293 xfree((void**)&fit); 289 294 290 } 295 291 }
Note:
See TracChangeset
for help on using the changeset viewer.