Changeset 12864

Timestamp:

08/01/12 20:26:36 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: use SeqMat and not PETScMat for interpolation module

Location:

issm/trunk-jpl/src/c/modules/InterpFromMesh2dx

Files:

• InterpFromMesh2dx.cpp (modified) (2 diffs)
• InterpFromMesh2dxt.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp

@@ -12 +12 @@
 int InterpFromMesh2dx( Vector** pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime,
                 double* default_values,int num_default_values,Contour** contours,int numcontours){
-
         
         /*Output*/
@@ -72 +71 @@
 
         /*Initialize output*/
-        data_prime=new Vector(nods_prime);
+        data_prime=new Vector(nods_prime,false,SeqVecType);
         if(num_default_values){
                 if(num_default_values==1)for (i=0;i<nods_prime;i++) data_prime->SetValue(i,default_values[0],INS_VAL);

issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp

@@ -8 +8 @@
 void* InterpFromMesh2dxt(void* vpthread_handle){
 
-        /*gate variables :*/
-        InterpFromMesh2dxThreadStruct* gate=NULL;
-        pthread_handle* handle=NULL;
-        int     my_thread;
-        int     num_threads;
-        
-        int interpolation_type;
-        bool debug;
-        int  nels_data;
-        double *index_data         = NULL;
-        double *x_data             = NULL;
-        double *y_data             = NULL;
-        double *data               = NULL;
-        double  xmin                 ,xmax;
-        double  ymin                 ,ymax;
-        int     nods_prime;
-        Vector *data_prime         = NULL;
-        double *x_prime            = NULL;
-        double *y_prime            = NULL;
-        double *default_values     = NULL;
-        int     num_default_values;
-        double *incontour          = NULL;
-
         /*intermediary: */
-        int     i0;
-        int     i1;
-        int     i,j;
-        double  area;
-        double  area_1,area_2,area_3;
+        int     i0,i1,i,j;
+        double  area,area_1,area_2,area_3;
         double  data_value;
 
         /*recover handle and gate: */
-        handle=(pthread_handle*)vpthread_handle;
-        gate=(InterpFromMesh2dxThreadStruct*)handle->gate;
-        my_thread=handle->id;
-        num_threads=handle->num;
+        pthread_handle                *handle      = (pthread_handle*)vpthread_handle;
+        InterpFromMesh2dxThreadStruct *gate        = (InterpFromMesh2dxThreadStruct*)handle->gate;
+        int                            my_thread   = handle->id;
+        int                            num_threads = handle->num;
         
         /*recover parameters :*/
-        interpolation_type = gate->interpolation_type;
-        debug              = gate->debug;
-        nels_data          = gate->nels_data;
-        index_data         = gate->index_data;
-        x_data             = gate->x_data;
-        y_data             = gate->y_data;
-        data               = gate->data;
-        xmin               = gate->xmin;
-        xmax               = gate->xmax;
-        ymin               = gate->ymin;
-        ymax               = gate->ymax;
-        nods_prime         = gate->nods_prime;
-        data_prime         = gate->data_prime;
-        x_prime            = gate->x_prime;
-        y_prime            = gate->y_prime;
-        default_values     = gate->default_values;
-        num_default_values = gate->num_default_values;
-        incontour          = gate->incontour;
+        int     interpolation_type = gate->interpolation_type;
+        bool    debug              = gate->debug;
+        int     nels_data          = gate->nels_data;
+        double *index_data         = gate->index_data;
+        double *x_data             = gate->x_data;
+        double *y_data             = gate->y_data;
+        double *data               = gate->data;
+        double  xmin               = gate->xmin;
+        double  xmax               = gate->xmax;
+        double  ymin               = gate->ymin;
+        double  ymax               = gate->ymax;
+        int     nods_prime         = gate->nods_prime;
+        Vector *data_prime         = gate->data_prime;
+        double *x_prime            = gate->x_prime;
+        double *y_prime            = gate->y_prime;
+        double *default_values     = gate->default_values;
+        int     num_default_values = gate->num_default_values;
+        double *incontour          = gate->incontour;
 
         /*partition loop across threads: */
@@ -69 +43 @@
 
         /*Loop over the elements*/
-        for (i=i0;i<i1;i++){
+        for(i=i0;i<i1;i++){
 
                 /*display current iteration*/