Changeset 16043

Timestamp:

08/30/13 11:53:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: chaining algorithm can work with lids only instead of sids

File:

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

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

@@ -444 +444 @@
         int     *next_l             = NULL;
         int     *count2offset_l     = NULL;
-        int     *sidlist            = NULL;
+        int     *lidlist            = NULL;
 
         /*output*/
@@ -469 +469 @@
          * will loop over all the elements that are connected to the node number
          * id*/
-        head_e         = xNew<int>(numnodes); for(i=0;i<numnodes;i++) head_e[i]=-1;
+        head_e         = xNew<int>(localnumnodes); for(i=0;i<localnumnodes;i++) head_e[i]=-1;
         next_e         = xNew<int>(elements->Size()*numnodesperelement);
         count2offset_e = xNew<int>(elements->Size()*numnodesperelement);
@@ -476 +476 @@
         for(i=0;i<elements->Size();i++){
                 element = dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                sidlist = xNew<int>(element->GetNumberOfNodes());
-                element->GetNodesSidList(sidlist);
+                lidlist = xNew<int>(element->GetNumberOfNodes());
+                element->GetNodesLidList(lidlist);
 
                 for(j=0;j<element->GetNumberOfNodes();j++){
-                        index = sidlist[j];
+                        index = lidlist[j];
                         _assert_(index>=0 && index<numnodes);
 
@@ -489 +489 @@
                 for(j=0;j<numnodesperelement-element->GetNumberOfNodes();j++) k++;
 
-                xDelete<int>(sidlist);
+                xDelete<int>(lidlist);
         }
 
         /*Chain for loads*/
-        head_l         = xNew<int>(numnodes); for(i=0;i<numnodes;i++) head_l[i]=-1;
+        head_l         = xNew<int>(localnumnodes); for(i=0;i<localnumnodes;i++) head_l[i]=-1;
         next_l         = xNew<int>(loads->Size(configuration_type)*numnodesperload);
         count2offset_l = xNew<int>(loads->Size(configuration_type)*numnodesperload);
@@ -500 +500 @@
                 load = dynamic_cast<Load*>(loads->GetObjectByOffset(i));
                 if(!load->InAnalysis(configuration_type)) continue;
-                sidlist = xNew<int>(load->GetNumberOfNodes());
-                load->GetNodesSidList(sidlist);
+                lidlist = xNew<int>(load->GetNumberOfNodes());
+                load->GetNodesLidList(lidlist);
 
                 for(j=0;j<load->GetNumberOfNodes();j++){
-                        index = sidlist[j];
+                        index = lidlist[j];
                         _assert_(index>=0 && index<numnodes);
 
@@ -513 +513 @@
                 for(j=0;j<numnodesperload-load->GetNumberOfNodes();j++) k++;
 
-                xDelete<int>(sidlist);
+                xDelete<int>(lidlist);
         }
 
@@ -553 +553 @@
                         //      printf("[%i] vertex %i\n",IssmComm::GetRank(),node->Lid()+1);
                         //}
-                        for(j=head_e[node->Sid()];j!=-1;j=next_e[j]){
+                        for(j=head_e[node->Lid()];j!=-1;j=next_e[j]){
                                 offset=count2offset_e[j];
                                 element=dynamic_cast<Element*>(elements->GetObjectByOffset(offset));
@@ -565 +565 @@
                                 }
                         }
-                        for(j=head_l[node->Sid()];j!=-1;j=next_l[j]){
+                        for(j=head_l[node->Lid()];j!=-1;j=next_l[j]){
                                 offset=count2offset_l[j];
                                 load=dynamic_cast<Load*>(loads->GetObjectByOffset(offset));