Changeset 13833

Timestamp:

10/26/12 10:30:15 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added NumberofDofLocal for matrix allocation

Location:

issm/trunk-jpl/src/c/Container

Files:

• Nodes.cpp (modified) (12 diffs)
• Nodes.h (modified) (1 diff)

issm/trunk-jpl/src/c/Container/Nodes.cpp

@@ -55 +55 @@
 /*FUNCTION Nodes::DistributeDofs{{{*/
 void  Nodes::DistributeDofs(int analysis_type,int setenum){
-
-        int num_procs;
-        int my_rank;
 
         int  i;
@@ -68 +65 @@
 
         /*recover my_rank:*/
-        my_rank=IssmComm::GetRank();
-        num_procs=IssmComm::GetSize();
+        int my_rank   = IssmComm::GetRank();
+        int num_procs = IssmComm::GetSize();
 
         /*some check: */
@@ -98 +95 @@
         /* Every cpu should start its own dof count at the end of the dofcount from cpu-1*/
         dofcount=0;
-        if(my_rank!=0){
-                for(i=0;i<my_rank;i++){
-                        dofcount+=alldofcount[i];
-                }
+        for(i=0;i<my_rank;i++){
+                dofcount+=alldofcount[i];
         }
         for (i=0;i<this->Size();i++){
@@ -202 +197 @@
 
         int i;
-        int   max=0;
-        int   allmax;
-        int   numdofs=0;
+        int max=0;
+        int allmax;
+        int numdofs=0;
 
         /*Now go through all nodes, and get how many dofs they own, unless they are clone nodes: */
@@ -215 +210 @@
 
                         numdofs=node->GetNumberOfDofs(NoneApproximationEnum,setenum);
-                        if (numdofs>max)max=numdofs;
+                        if(numdofs>max)max=numdofs;
                 }
         }
@@ -221 +216 @@
         /*Grab max of all cpus: */
         #ifdef _HAVE_MPI_
-        MPI_Allreduce ( (void*)&max,(void*)&allmax,1,MPI_INT,MPI_MAX,IssmComm::GetComm());
+        MPI_Allreduce((void*)&max,(void*)&allmax,1,MPI_INT,MPI_MAX,IssmComm::GetComm());
         max=allmax;
         #endif
@@ -231 +226 @@
 int   Nodes::NumberOfDofs(int analysis_type,int setenum){
 
-        int i;
+        int   allnumdofs;
+
+        /*Get number of dofs on current cpu (excluding clones)*/
+        int numdofs=this->NumberOfDofsLocal(analysis_type,setenum);
+
+        /*Gather from all cpus: */
+        #ifdef _HAVE_MPI_
+        MPI_Allreduce ( (void*)&numdofs,(void*)&allnumdofs,1,MPI_INT,MPI_SUM,IssmComm::GetComm());
+        #else
+        allnumdofs=numdofs;
+        #endif
+        return allnumdofs;
+}
+/*}}}*/
+/*FUNCTION Nodes::NumberOfDofsLocal{{{*/
+int   Nodes::NumberOfDofsLocal(int analysis_type,int setenum){
 
         int   numdofs=0;
-        int   allnumdofs;
 
         /*Now go through all nodes, and get how many dofs they own, unless they are clone nodes: */
-        for(i=0;i<this->Size();i++){
+        for(int i=0;i<this->Size();i++){
 
                 Node* node=dynamic_cast<Node*>(this->GetObjectByOffset(i));
@@ -246 +255 @@
                         /*Ok, this object is a node, ask it to plug values into partition: */
                         if (!node->IsClone()){
-
                                 numdofs+=node->GetNumberOfDofs(NoneApproximationEnum,setenum);
-
                         }
                 }
         }
 
-        /*Gather from all cpus: */
-        #ifdef _HAVE_MPI_
-        MPI_Allreduce ( (void*)&numdofs,(void*)&allnumdofs,1,MPI_INT,MPI_SUM,IssmComm::GetComm());
-        #else
-        allnumdofs=numdofs;
-        #endif
-        return allnumdofs;
+        return numdofs;
 }
 /*}}}*/
@@ -267 +268 @@
         /*Careful! only use once all clones have been setup for all nodes!: */
 
-        int i;
-
-        int   numnodes=0;
-        int   allnumnodes=0;
+        int numnodes=0;
+        int allnumnodes=0;
 
         /*Now go through all nodes, and get how many dofs they own, unless they are clone nodes: */
-        for(i=0;i<this->Size();i++){
+        for(int i=0;i<this->Size();i++){
                 Node* node=dynamic_cast<Node*>(this->GetObjectByOffset(i));
 
@@ -333 +332 @@
 
         int my_rank;
-        int        sid;
+        int sid;
 
         /*recover my_rank:*/
@@ -358 +357 @@
         Node* node=NULL;
 
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
+        for (object=objects.begin() ; object < objects.end(); object++ ){
 
                 node=dynamic_cast<Node*>(*object);
@@ -364 +363 @@
 
         }
-
-}
-/*}}}*/
+}
+/*}}}*/

issm/trunk-jpl/src/c/Container/Nodes.h

@@ -23 +23 @@
                 int   MaxNumDofs(int analysis_type,int setenum);
                 int   NumberOfDofs(int analysis_type,int setenum);
+                int   NumberOfDofsLocal(int analysis_type,int setenum);
                 int   NumberOfNodes(int analysis_type);
                 int   NumberOfNodes(void);