Changeset 13902

Timestamp:

11/07/12 16:26:44 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed issue in matrix preallocation, number of non zeros must be constrained by the number of columns, not the number of lines (for Kfs)

File:

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

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

@@ -427 +427 @@
         int numnodes            = nodes->NumberOfNodes(analysis_type);
         int numberofdofspernode = nodes->MaxNumDofs(configuration_type,GsetEnum);
+        int M                   = nodes->NumberOfDofs(analysis_type,set1enum);
         int N                   = nodes->NumberOfDofs(analysis_type,set2enum);
         int m                   = nodes->NumberOfDofsLocal(analysis_type,set1enum);
+        int n                   = nodes->NumberOfDofsLocal(analysis_type,set2enum);
         int numnodesperobject   = elements->MaxNumNodes();
 
@@ -512 +514 @@
                                         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]>N-m) o_nnz[count]=N-m;
+                                        if(d_nnz[count]>n)   d_nnz[count]=n;
+                                        if(o_nnz[count]>N-n) o_nnz[count]=N-n;
                                         count++;
                                 }
@@ -747 +749 @@
         }
 
-
         /*Fill right hand side vector, from elements and loads */
         for (i=0;i<this->elements->Size();i++){