Changeset 14875 for issm/trunk-jpl/src/c/classes/objects/Bucket.h

Timestamp:

05/03/13 15:56:49 (12 years ago)

Author:

Eric.Larour

Message:

CHG: new NORM_FROBENIUS for matrices.
Also fixed a lot of bugs in the norm routines of vectors and matrices in our issm toolkit.
Took out the Assemble2, along with Bucket.h iSend and Recv routiens.

File:

• issm/trunk-jpl/src/c/classes/objects/Bucket.h (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/objects/Bucket.h

@@ -151 +151 @@
                 };
                 /*}}}*/
-                void SetLocalMatrixValues(double* local_matrix,int lower_row,int global_N){ /*{{{*/
-
-                        int i,j;
-                        for(i=0;i<m;i++){
-                                for(j=0;j<n;j++){
-                                        *(local_matrix+global_N*(idxm[i]-lower_row)+idxn[j])=*(values+n*i+j);
-                                }
-                        }
-
-                };
-                /*}}}*/
-                void SetLocalVectorValues(double* local_vector,int lower_row){ /*{{{*/
-
-                        int i;
-                        for(i=0;i<m;i++){
-                                local_vector[idxm[i]-lower_row]=values[i];
-                        }
-                };
-                /*}}}*/
                 int BucketType(void){ /*{{{*/
 
@@ -205 +186 @@
 
                         /*increment buffer for next Bucket who will marshall his data: */
-                        row_indices_forcpu+=m*n;
-                        col_indices_forcpu+=m*n;
-                        values_forcpu+=m*n;
-                        modes_forcpu+=m*n;
+                        row_indices_forcpu+=(m*n);
+                        col_indices_forcpu+=(m*n);
+                        values_forcpu+=(m*n);
+                        modes_forcpu+=(m*n);
 
                         /*output modified buffers: */
@@ -221 +202 @@
                         /*intermediary: */
                         int         i;
-                        int         j;
 
                         /*buffers: */
@@ -262 +242 @@
                 };
                 /*}}}*/
-#ifdef _HAVE_MPI_
-                        void Isend(int receiver_rank,MPI_Request* requests,int* pcount,MPI_Comm comm){ /*{{{*/
-                        int count=0;
-                        int int_mode;
-
-                        /*Recover pointer: */
-                        count=*pcount;
-
-                        /*Send all the information required: */
-                        MPI_Isend(&type,1,MPI_INT,receiver_rank,2,comm,requests+count); count++;
-                        MPI_Isend(&m,1,MPI_INT,receiver_rank,3,comm,requests+count); count++;
-                        if(m){ MPI_Isend(idxm,m,MPI_INT,receiver_rank,4,comm,requests+count); count++; }
-                        if(type==MATRIX_BUCKET){
-                                MPI_Isend(&n,1,MPI_INT,receiver_rank,5,comm,requests+count); count++;
-                                if(n){ MPI_Isend(idxn,n,MPI_INT,receiver_rank,6,comm,requests+count); count++; }
-                                if(m*n){ MPI_Isend(values,m*n,MPI_DOUBLE,receiver_rank,7,comm,requests+count); count++; }
-                        }
-                        else{
-                                if(m){ MPI_Isend(values,m,MPI_DOUBLE,receiver_rank,7,comm,requests+count); count++; }
-                        }
-                        int_mode=(int)mode;
-                        MPI_Isend(&int_mode,1,MPI_INT,receiver_rank,8,comm,requests+count); count++;
-
-                        /*Allocate pointers: */
-                        *pcount=count;
-
-                } /*}}}*/
-                void Recv(int sender_rank, MPI_Comm comm){ /*{{{*/
-
-                        MPI_Status status;
-                        int int_mode;
-
-                        MPI_Recv(&type,1, MPI_INT,sender_rank,2, comm, &status);
-                        MPI_Recv(&m,1, MPI_INT,sender_rank,3, comm, &status);
-                        if(m){
-                                idxm=new int[m];
-                                MPI_Recv(idxm,m, MPI_INT,sender_rank,4, comm, &status);
-                        }
-                        if(type==MATRIX_BUCKET){
-                                MPI_Recv(&n,1, MPI_INT,sender_rank,5, comm, &status);
-                                if(n){
-                                        idxn=new int[n];
-                                        MPI_Recv(idxn,n, MPI_INT,sender_rank,6, comm, &status);
-                                }
-                                if(m*n){
-                                        values=new doubletype[m*n];
-                                        MPI_Recv(values,m*n, MPI_DOUBLE,sender_rank,7, comm, &status);
-                                }
-                        }
-                        else{
-                                if(m){
-                                        values=new doubletype[m];
-                                        MPI_Recv(values,m, MPI_DOUBLE,sender_rank,7, comm, &status);
-                                }
-                        } 
-                        MPI_Recv(&int_mode,1, MPI_INT,sender_rank,8, comm, &status);
-                        mode=(InsMode)int_mode;
-
-                } /*}}}*/
-#endif
 };