Changeset 16438

Timestamp:

10/16/13 22:26:48 (11 years ago)

Author:

Eric.Larour

Message:

CHG: optimizing sparse mpi matrix

Location:

issm/trunk-jpl/src/c

Files:

• modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp (modified) (3 diffs)
• toolkits/issm/SparseRow.h (modified) (9 diffs)

issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp ¶

@@ -24 +24 @@
 
         bool oldalloc=false;
+        char* toolkittype=NULL;
 
         /*retrieve parameters: */
@@ -36 +37 @@
 
         numberofdofspernode=femmodel->nodes->MaxNumDofs(configuration_type,GsetEnum);
+
+        /*if our matrices are coming from issm, we don't do dynamic allocation like Petsc 
+         * does, and this routine is essentially useless. Force oldalloc in this case: */
+        toolkittype=ToolkitOptions::GetToolkitType();
+        if(strcmp(toolkittype,"issm")==0)oldalloc=true;
 
         if(oldalloc){
@@ -63 +69 @@
                 if(ppf) pf =new Vector<IssmDouble>(flocalsize,fsize);
         }
+        
+        /*Free ressources: */
+        xDelete<char>(toolkittype);
 
         /*Allocate output pointers*/

issm/trunk-jpl/src/c/toolkits/issm/SparseRow.h ¶

@@ -13 +13 @@
 class SparseRow{
 
+        private:
+                int*        buffer; //used during SetValues
+
         public:
 
@@ -19 +22 @@
                 int*        indices;
                 doubletype* values;
-
+                
                 /*SparseRow constructors, destructors*/
                 SparseRow(){ /*{{{*/
@@ -26 +29 @@
                          indices=NULL;
                          values=NULL;
+                         buffer=NULL;
                 } /*}}}*/
                 SparseRow(int in_M){/*{{{*/
@@ -33 +37 @@
                         indices=NULL;
                         values=NULL;
+
+                        buffer=xNewZeroInit<int>(M);
                 } /*}}}*/
                 ~SparseRow(){/*{{{*/
@@ -39 +45 @@
                                 xDelete<doubletype>(values);
                         }
+                        if(buffer)xDelete<int>(buffer);
                 } /*}}}*/
 
@@ -53 +60 @@
                         int count;
                         int i,j;
-                        int* buffer=NULL;
 
                         if(!M)_error_("unknow dimension for this sparse row!");
@@ -67 +73 @@
 
                         /*Figure out number of non-zero values ncols: */
-                        buffer=xNewZeroInit<int>(M);
+                        for(i=0;i<numvalues;i++)buffer[i]=0;
+                        
+                        ncols=0;
                         for(i=0;i<numvalues;i++){
+                                if(!buffer[cols[i]])ncols++;
                                 if(mods[i]==ADD_VAL){
                                         if(buffer[cols[i]]!=2)buffer[cols[i]]=1;
@@ -74 +83 @@
                                 else buffer[cols[i]]=2;
                         }
-                        ncols=0;
-                        for(i=0;i<M;i++)if(buffer[i]!=0)ncols++;
-                        _assert_(ncols);
-
 
                         /*Allocate:*/
@@ -109 +114 @@
                         }
                         if(count!=ncols)_error_("counter problem during set values operations");
-
-                        /*Free ressources: */
-                        xDelete<int>(buffer);
-
                 } /*}}}*/
                 doubletype Norm(NormMode mode){ /*{{{*/