Changeset 2339

Timestamp:

09/28/09 09:58:10 (15 years ago)

Author:

Eric.Larour

Message:

Took out duplicate parameters.

Location:

issm/trunk/src/c/ModelProcessorx

Files:

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

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

@@ -37 +37 @@
         double* vy=NULL;
         double* vz=NULL;
-        double* u_g=NULL;
 
         /*Get parameters: */
@@ -157 +156 @@
                 IoModelFetchData(&control_parameter,NULL,NULL,iomodel_handle,iomodel->control_type);
 
-                u_g=(double*)xcalloc(iomodel->numberofnodes*3,sizeof(double));
-                if(vx)for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+0]=vx[i]/iomodel->yts;
-                if(vy)for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+1]=vy[i]/iomodel->yts;
-                if(vz)for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+2]=vz[i]/iomodel->yts;
-
-                count++;
-                param= new Param(count,"u_g",DOUBLEVEC);
-                param->SetDoubleVec(u_g,3*iomodel->numberofnodes,3);
-                parameters->AddObject(param);
-
                 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;
@@ -187 +176 @@
                 xfree((void**)&vy);
                 xfree((void**)&vz);
-                xfree((void**)&u_g);
                 xfree((void**)&vx_obs);
                 xfree((void**)&vy_obs);

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

@@ -170 +170 @@
         parameters->AddObject(param);
 
-        /*meanvel: */
-        count++;
-        param= new Param(count,"meanvel",DOUBLE);
-        param->SetDouble(iomodel->meanvel);
-        parameters->AddObject(param);
-        
         /*artdiff: */
         count++;
@@ -182 +176 @@
         parameters->AddObject(param);
         
-        /*epsvel: */
-        count++;
-        param= new Param(count,"epsvel",DOUBLE);
-        param->SetDouble(iomodel->epsvel);
-        parameters->AddObject(param);
-
         /*penalty_melting: */
         count++;
@@ -216 +204 @@
         param= new Param(count,"viscosity_overshoot",DOUBLE);
         param->SetDouble(iomodel->viscosity_overshoot);
-        parameters->AddObject(param);
-
-        /*cm_noisedampening: */
-        count++;
-        param= new Param(count,"cm_noisedampening",DOUBLE);
-        param->SetDouble(iomodel->cm_noisedampening);
         parameters->AddObject(param);