Changeset 16035

Timestamp:

08/30/13 10:31:20 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: use nodes Lid to allocate stiffness matrix (divides allocation time by 10)

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (5 diffs)
• Loads/Numericalflux.cpp (modified) (1 diff)
• Loads/Pengrid.cpp (modified) (1 diff)
• Loads/Penpair.cpp (modified) (1 diff)
• Loads/Riftfront.cpp (modified) (1 diff)

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

@@ -455 +455 @@
         /*Get vector size and number of nodes*/
         int numnodes            = nodes->NumberOfNodes(configuration_type);
+        int localnumnodes       = nodes->Size();
         int numberofdofspernode = nodes->MaxNumDofs(configuration_type,GsetEnum);
         int M                   = nodes->NumberOfDofs(configuration_type,set1enum);
@@ -516 +517 @@
 
         /*OK now count number of dofs and flag each nodes for each node i*/
-        bool *flags                  = xNew<bool>(numnodes);
+        bool *flags                  = xNew<bool>(localnumnodes);
         int  *d_connectivity         = xNewZeroInit<int>(numnodes);
         int  *o_connectivity         = xNewZeroInit<int>(numnodes);
@@ -523 +524 @@
 
         /*Create connectivity vector*/
+        MPI_Barrier(MPI_COMM_WORLD); double start_core2=MPI_Wtime( );
         for(i=0;i<nodes->Size();i++){
                 Node* node=dynamic_cast<Node*>(nodes->GetObjectByOffset(i));
@@ -528 +530 @@
 
                         /*Reinitialize flags to 0*/
-                        for(j=0;j<numnodes;j++) flags[j]=false;
+                        for(j=0;j<localnumnodes;j++) flags[j]=false;
 
                         /*Loop over elements that hold node number i*/
@@ -567 +569 @@
         xDelete<int>(head_l);
         xDelete<int>(next_l);
+        MPI_Barrier(MPI_COMM_WORLD); double finish_core2=MPI_Wtime( );
+        _printf0_("\nTotal ellapsed time "<<finish_core2-start_core2<<" seconds  \n");
 
         /*sum over all cpus*/

issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp

@@ -379 +379 @@
         for(int i=0;i<this->GetNumberOfNodes();i++){
 
-                if(!flags[this->nodes[i]->Sid()]){
+                if(!flags[this->nodes[i]->Lid()]){
 
                         /*flag current node so that no other element processes it*/
-                        flags[this->nodes[i]->Sid()]=true;
+                        flags[this->nodes[i]->Lid()]=true;
 
                         /*if node is clone, we have an off-diagonal non-zero, else it is a diagonal non-zero*/

issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp

@@ -298 +298 @@
         int o_nz = 0;
 
-        if(!flags[this->node->Sid()]){
+        if(!flags[this->node->Lid()]){
 
                 /*flag current node so that no other element processes it*/
-                flags[this->node->Sid()]=true;
+                flags[this->node->Lid()]=true;
 
                 /*if node is clone, we have an off-diagonal non-zero, else it is a diagonal non-zero*/

issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp

@@ -217 +217 @@
         for(int i=0;i<NUMVERTICES;i++){
 
-                if(!flags[this->nodes[i]->Sid()]){
+                if(!flags[this->nodes[i]->Lid()]){
 
                         /*flag current node so that no other element processes it*/
-                        flags[this->nodes[i]->Sid()]=true;
+                        flags[this->nodes[i]->Lid()]=true;
 
                         /*if node is clone, we have an off-diagonal non-zero, else it is a diagonal non-zero*/

issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp

@@ -394 +394 @@
         for(int i=0;i<NUMVERTICES;i++){
 
-                if(!flags[this->nodes[i]->Sid()]){
+                if(!flags[this->nodes[i]->Lid()]){
 
                         /*flag current node so that no other element processes it*/
-                        flags[this->nodes[i]->Sid()]=true;
+                        flags[this->nodes[i]->Lid()]=true;
 
                         /*if node is clone, we have an off-diagonal non-zero, else it is a diagonal non-zero*/