Changeset 13894

Timestamp:

11/07/12 13:47:20 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: still working on matric preallocation, nothing new at this point. Temporary commit

File:

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

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

@@ -353 +353 @@
         Vector<IssmDouble> *df   = NULL;
 
+        //bool oldalloc=false;
         bool oldalloc=true;
 
@@ -413 +414 @@
         int     *next         = NULL;
         int     *count2offset = NULL;
+        int     * sidlist     = NULL;
 
         /*output*/
@@ -425 +427 @@
         int numnodes            = nodes->NumberOfNodes(analysis_type);
         int numberofdofspernode = nodes->MaxNumDofs(configuration_type,GsetEnum);
+        int N                   = nodes->NumberOfDofs(analysis_type,set2enum);
         int m                   = nodes->NumberOfDofsLocal(analysis_type,set1enum);
         int numnodesperobject   = elements->MaxNumNodes();
@@ -439 +442 @@
         k=0;
         for(i=0;i<elements->Size();i++){
-                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                for(int j=0;j<numnodesperobject;j++){
-                        index =dynamic_cast<Tria*>(element)->nodes[j]->sid;//starts at 0 for a given analysis
-                        _assert_(k>=0 && k<numnodes*elements->Size() && index>=0 && index<numnodes);
+                element = dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+                sidlist = xNew<int>(element->GetNumberOfNodes());
+                element->GetNodesSidList(sidlist);
+
+                for(j=0;j<element->GetNumberOfNodes();j++){
+                        index = sidlist[j];
+                        _assert_(index>=0 && index<numnodes);
 
                         count2offset[k]=i;
@@ -448 +454 @@
                         head[index]=k++;
                 }
+                for(j=0;j<numnodesperobject-element->GetNumberOfNodes();j++) k++;
+
+                xDelete<int>(sidlist);
         }
 
@@ -503 +512 @@
                                         d_nnz[count]=numberofdofspernode*(d_connectivity[node->Sid()] + all_connectivity_clone[node->Sid()]);
                                         o_nnz[count]=numberofdofspernode*(o_connectivity[node->Sid()] + all_connectivity_clone[node->Sid()]);
-                                        //if(d_nnz[count]>m)   d_nnz[count]=m;
-                                        //if(o_nnz[count]>fsize-m) o_nnz[count]=fsize-m;
+                                        if(d_nnz[count]>m)   d_nnz[count]=m;
+                                        if(o_nnz[count]>N-m) o_nnz[count]=N-m;
                                         count++;
                                 }
@@ -719 +728 @@
         IssmDouble          kmax;
 
-
         /*Display message*/
         if(VerboseModule()) _pprintLine_("   Generating matrices");
@@ -774 +782 @@
         //Kff->AllocationInfo();
         //Kfs->AllocationInfo();
-        //_error_("STOP");
 
         /*Assign output pointers: */