Changeset 25336

Timestamp:

08/01/20 20:45:26 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better initialization of vector and some cosmetics to issm toolkits

Location:

issm/trunk-jpl/src/c

Files:

• modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (modified) (1 diff)
• toolkits/gsl/DenseGslSolve.cpp (modified) (2 diffs)
• toolkits/issm/IssmMpiVec.h (modified) (6 diffs)
• toolkits/mumps/MumpsSolve.cpp (modified) (2 diffs)

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

@@ -62 +62 @@
         int numvertices=femmodel->vertices->NumberOfVertices();
         if(numvertices==0)  return;
-        Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvertices);
+        int numvertices_local=femmodel->vertices->NumberOfVerticesLocal();
+        Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvertices,numvertices_local);
 
         /*Fill vector with values: */

issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp

@@ -319 +319 @@
   xDelete(valueX);
   xDelete(indexX);
+ 
+  delete data;
 }
 /*}}}*/
@@ -374 +376 @@
 
     tape.pushExternalFunctionHandle(&SolverxSeq_codi_b, dataHandler, &SolverxSeq_codi_delete);
-  } else {
+  }
+  else{
     // if the tape is active valueX is stored in the dataHandler and deleted in the reverse sweep
     xDelete(valueX);

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h

@@ -36 +36 @@
         public:
 
+                bool isassembled;
                 int M; //global size
                 int m; //local number of rows
@@ -46 +47 @@
                         this->M=0;
                         this->m=0;
+                        this->isassembled=false;
                         this->vector=NULL;
                         this->buckets=new DataSet();
@@ -102 +104 @@
 
                         this->buckets=new DataSet();
+                        this->isassembled=false;
 
                         if(fromlocalsize){
@@ -137 +140 @@
                 void Echo(void){/*{{{*/
 
-                        int i,j;
-
                         /*Do a synchronized dump across all the rows: */
-                        for(i=0;i<IssmComm::GetSize();i++){
+                        int my_rank=IssmComm::GetRank();
+                        for(int i=0;i<IssmComm::GetSize();i++){
+                                if(my_rank==i){
+                                        if(i==0) _printf_("Vector of global size M="<<this->M<<"\n");
+                                        _printf_("cpu " << i << " #rows: " << this->m << "\n");
+                                        if(this->isassembled){
+                                                for(int j=0;j<this->m;j++){
+                                                        _printf_("row " << j << ": "<<this->vector[j]);
+                                                        _printf_("\n");
+                                                }
+                                        }
+                                        else{
+                                                this->buckets->DeepEcho();
+                                        }
+                                }
                                 ISSM_MPI_Barrier(IssmComm::GetComm());
                         }
@@ -236 +251 @@
                         count=0;
                         for(i=0;i<num_procs;i++){
-                                sendcnts[i]=numvalues_forcpu[i];
-                                displs[i]=count;
-                                count+=numvalues_forcpu[i];
+                                sendcnts[i] = numvalues_forcpu[i];
+                                displs[i]   = count;
+                                count      += numvalues_forcpu[i];
                         }
 
@@ -262 +277 @@
                         }
                         /*}}}*/
+                        this->isassembled=true;
 
                         /*Free ressources:{{{*/

issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp

@@ -576 +576 @@
   xDelete(valueX);
   xDelete(indexX);
+
+  delete data;
 }
 /*}}}*/
@@ -638 +640 @@
          //tape.pushExternalFunction(&MumpsSolve_codi_b, dataHandler, &MumpsSolve_codi_delete);
     tape.pushExternalFunctionHandle(&MumpsSolve_codi_b,(void*)dataHandler, &MumpsSolve_codi_delete);
-  } else {
+  }
+  else{
     // if the tape is active valueB is stored in the dataHandler and deleted in the reverse sweep
     xDelete(valueB);