Changeset 3457

Timestamp:

04/08/10 08:42:47 (15 years ago)

Author:

Mathieu Morlighem

Message:

put all loaded variables in iomodel

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• Control/CreateParametersControl.cpp (modified) (3 diffs)
• CreateParameters.cpp (modified) (4 diffs)

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

@@ -19 +19 @@
         int      count;
 
-        double* fit=NULL;
-        double* weights=NULL;
-        double* cm_jump=NULL;
-        double* optscal=NULL;
-        double* maxiter=NULL; 
+        double* param_g=NULL;
+        double* u_g_obs=NULL;
         double* control_parameter=NULL;
-        double* param_g=NULL;
-
-        double* vx_obs=NULL;
-        double* vy_obs=NULL;
-        double* u_g_obs=NULL;
-
-        double* vx=NULL;
-        double* vy=NULL;
-        double* vz=NULL;
 
         /*Get parameters: */
@@ -187 +175 @@
 
                 /*Get vx, vx_obs, vy, vy_obs, and the parameter value: */
-                IoModelFetchData(&vx,NULL,NULL,iomodel_handle,"vx");
-                IoModelFetchData(&vy,NULL,NULL,iomodel_handle,"vy");
-                IoModelFetchData(&vz,NULL,NULL,iomodel_handle,"vz");
-                IoModelFetchData(&vx_obs,NULL,NULL,iomodel_handle,"vx_obs");
-                IoModelFetchData(&vy_obs,NULL,NULL,iomodel_handle,"vy_obs");
+                IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
+                IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
+                IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,"vz");
+                IoModelFetchData(&iomodel->vx_obs,NULL,NULL,iomodel_handle,"vx_obs");
+                IoModelFetchData(&iomodel->vy_obs,NULL,NULL,iomodel_handle,"vy_obs");
                 IoModelFetchData(&control_parameter,NULL,NULL,iomodel_handle,iomodel->control_type);
 
                 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;
+                if(iomodel->vx_obs)for(i=0;i<iomodel->numberofvertices;i++)u_g_obs[2*i+0]=iomodel->vx_obs[i]/iomodel->yts;
+                if(iomodel->vy_obs)for(i=0;i<iomodel->numberofvertices;i++)u_g_obs[2*i+1]=iomodel->vy_obs[i]/iomodel->yts;
 
                 count++;
@@ -211 +199 @@
                 parameters->AddObject(param);
 
-                xfree((void**)&vx);
-                xfree((void**)&vy);
-                xfree((void**)&vz);
-                xfree((void**)&vx_obs);
-                xfree((void**)&vy_obs);
+                xfree((void**)&iomodel->vx);
+                xfree((void**)&iomodel->vy);
+                xfree((void**)&iomodel->vz);
+                xfree((void**)&iomodel->vx_obs);
+                xfree((void**)&iomodel->vy_obs);
                 xfree((void**)&u_g_obs);
                 xfree((void**)&param_g);

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -43 +43 @@
         parameters->AddObject(param);
 
-
         //analysis and subanalysis
         count++;
@@ -76 +75 @@
         parameters->AddObject(param);
 
-
         count++;
         param= new Param(count,"isstokes",DOUBLE);
@@ -253 +251 @@
         /*Deal with numberofdofspernode: */
         DistributeNumDofs(&numberofdofspernode,iomodel->analysis_type,iomodel->sub_analysis_type);
-
         count++;
         param= new Param(count,"numberofdofspernode",DOUBLE);
         param->SetDouble(numberofdofspernode);
-        parameters->AddObject(param)
-                ;
+        parameters->AddObject(param);
+
         /*numrifts: */
         IoModelFetchData(&iomodel->riftinfo,&iomodel->numrifts,NULL,iomodel_handle,"riftinfo");
@@ -311 +308 @@
         xfree((void**)&parameteroutput);
 
-
         /*Assign output pointer: */
         *pparameters=parameters;