Changeset 16042 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

08/30/13 11:44:43 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: speeding up matrix preallocation process again, by keeping track of flags to revert

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (5 diffs)

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

@@ -518 +518 @@
         /*OK now count number of dofs and flag each nodes for each node i*/
         bool *flags                  = xNew<bool>(localnumnodes);
+        int  *flagsindices           = xNew<int>(localnumnodes);
         int  *d_connectivity         = xNewZeroInit<int>(numnodes);
         int  *o_connectivity         = xNewZeroInit<int>(numnodes);
@@ -523 +524 @@
         int  *all_connectivity_clone = xNewZeroInit<int>(numnodes);
 
+        /*Resetting flags to false at eahc iteration takes a lot of time, so we keep track of the flags
+         * to reset in flagsindices, initialized with -1*/
+        for(i = 0;i<localnumnodes;i++) flags[i]        = false;
+        for(i = 0;i<localnumnodes;i++) flagsindices[i] = -1;
+
         /*Create connectivity vector*/
         for(i=0;i<nodes->Size();i++){
@@ -528 +534 @@
                 if(node->InAnalysis(configuration_type)){
 
-                        /*Reinitialize flags to 0*/
-                        for(j=0;j<localnumnodes;j++) flags[j]=false;
+                        /*Reinitialize flags to false*/
+                        j=0;
+                        while(true){
+                                if(flagsindices[j]>=0){
+                                        flags[flagsindices[j]] = false;
+                                        flagsindices[j]        = -1;
+                                        j++;
+                                }
+                                else{
+                                        break;
+                                }
+                        }
+
+                        //for(j=0;j<localnumnodes;j++) flags[j]=false;
 
                         /*Loop over elements that hold node number i*/
-                        //if(head_e[node->Sid()]==-1 && head_l[node->Sid()]==-1){
-                        //      printf("[%i] vertex %i\n",IssmComm::GetRank(),node->Sid()+1);
+                        //if(head_e[node->Lid()]==-1 && head_l[node->Lid()]==-1){
+                        //      printf("[%i] vertex %i\n",IssmComm::GetRank(),node->Lid()+1);
                         //}
                         for(j=head_e[node->Sid()];j!=-1;j=next_e[j]){
                                 offset=count2offset_e[j];
                                 element=dynamic_cast<Element*>(elements->GetObjectByOffset(offset));
-                                element->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,set1enum,set2enum);
+                                element->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,flagsindices,set1enum,set2enum);
                                 if(node->IsClone()){
                                         connectivity_clone[node->Sid()]+=d_nz+o_nz;
@@ -550 +568 @@
                                 offset=count2offset_l[j];
                                 load=dynamic_cast<Load*>(loads->GetObjectByOffset(offset));
-                                load->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,set1enum,set2enum);
+                                load->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,flagsindices,set1enum,set2enum);
                                 if(node->IsClone()){
                                         connectivity_clone[node->Sid()]+=d_nz+o_nz;
@@ -562 +580 @@
         }
         xDelete<bool>(flags);
+        xDelete<int>(flagsindices);
         xDelete<int>(count2offset_e);
         xDelete<int>(head_e);