Changeset 23502

Timestamp:

12/04/18 08:48:03 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to simplify Vertices Pid distribution, more changes to come

Location:

issm/trunk-jpl/src/c/classes

Files:

• Vertices.cpp (modified) (4 diffs)
• Vertices.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Vertices.cpp

@@ -101 +101 @@
 void  Vertices::FlagClones(int numberofobjects){/*{{{*/
 
-        int i;
-        int num_procs;
+        /*Some checks in debug mode*/
+        _assert_(numberofobjects>0);
 
-        int* ranks=NULL;
-        int* minranks=NULL;
-
-        /*recover num_procs:*/
-        num_procs=IssmComm::GetSize();
+        /*recover num_procs and rank*/
+        int num_procs = IssmComm::GetSize();
+        int my_rank   = IssmComm::GetRank();
 
         /*Allocate ranks: */
-        ranks=xNew<int>(numberofobjects);
-        minranks=xNew<int>(numberofobjects);
+        int *ranks    = xNew<int>(numberofobjects);
+        for(int i=0;i<numberofobjects;i++)ranks[i]=num_procs; //no cpu can have rank num_procs. This is the maximum limit.
 
-        for(i=0;i<numberofobjects;i++)ranks[i]=num_procs; //no cpu can have rank num_procs. This is the maximum limit.
-
-        /*Now go through all our objects and ask them to report to who they belong (which rank): */
-        Ranks(ranks);
+        /*Go through a dataset, and for each object, report it cpu: */
+        for(int i=0;i<this->Size();i++){
+                Vertex* vertex=xDynamicCast<Vertex*>(this->GetObjectByOffset(i));
+                ranks[vertex->Sid()]=my_rank; 
+        }
 
         /*We need to take the minimum rank for each vertex, and every cpu needs to get that result. That way, 
@@ -123 +122 @@
          * dealt with by another cpu. We take the minimum because we are going to manage dof assignment in increasing 
          * order of cpu rank. This is also why we initialized this array to num_procs.*/
-        ISSM_MPI_Allreduce ( (void*)ranks,(void*)minranks,numberofobjects,ISSM_MPI_INT,ISSM_MPI_MIN,IssmComm::GetComm());
+        int *minranks = xNew<int>(numberofobjects);
+        ISSM_MPI_Allreduce((void*)ranks,(void*)minranks,numberofobjects,ISSM_MPI_INT,ISSM_MPI_MIN,IssmComm::GetComm());
+        xDelete<int>(ranks); 
 
         /*Now go through all objects, and use minranks to flag which objects are cloned: */
-        for(i=0;i<this->Size();i++){
+        for(int i=0;i<this->Size();i++){
                 /*For this object, decide whether it is a clone: */
                 Vertex* vertex=xDynamicCast<Vertex*>(this->GetObjectByOffset(i));
@@ -133 +134 @@
 
         /*Free ressources: */
-        xDelete<int>(ranks); 
         xDelete<int>(minranks);
-
-}
-/*}}}*/
+}/*}}}*/
 int Vertices::NumberOfVertices(void){/*{{{*/
 
@@ -161 +159 @@
         /*return:*/
         return max_sid;
-}
-/*}}}*/
-void   Vertices::Ranks(int* ranks){/*{{{*/
-
-        int my_rank;
-        int        sid;
-
-        /*recover my_rank:*/
-        my_rank=IssmComm::GetRank();
-
-        /*Go through a dataset, and for each object, report it cpu: */
-        for(int i=0;i<this->Size();i++){
-                /*Plug rank into ranks, according to id: */
-                Vertex* vertex=xDynamicCast<Vertex*>(this->GetObjectByOffset(i));
-                sid=vertex->Sid();
-                ranks[sid]=my_rank; 
-        }
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Vertices.h

@@ -24 +24 @@
                 void  FlagClones(int numberofnodes);
                 int   NumberOfVertices(void);
-                void  Ranks(int* ranks);
-                void LatLonList(IssmDouble** lat,IssmDouble** lon);
+                void  LatLonList(IssmDouble** lat,IssmDouble** lon);
 };