summaryrefslogtreecommitdiffstats
path: root/scilab/modules/umfpack
diff options
context:
space:
mode:
authorSerge Steer <serge.steer@scilab.org>2009-12-04 11:23:34 +0100
committerSerge Steer <serge.steer@scilab.org>2009-12-04 11:23:34 +0100
commit6b2f44b5b4c86ff9fa1da9e754ad746b7f684778 (patch)
tree40392ace5f2a626a19fd3221cdf20cfbc6487fc5 /scilab/modules/umfpack
parent86060867a3cf5fab78b9501963ce436dfa68a4e1 (diff)
parent3f8d593ea5f6ed6b53e7c6291d89de61a5dc075e (diff)
downloadscilab-6b2f44b5b4c86ff9fa1da9e754ad746b7f684778.zip
scilab-6b2f44b5b4c86ff9fa1da9e754ad746b7f684778.tar.gz
merge
Diffstat (limited to 'scilab/modules/umfpack')
-rw-r--r--scilab/modules/umfpack/src/c/taucs_scilab.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/scilab/modules/umfpack/src/c/taucs_scilab.c b/scilab/modules/umfpack/src/c/taucs_scilab.c
index e23d4d3..4bf5d38 100644
--- a/scilab/modules/umfpack/src/c/taucs_scilab.c
+++ b/scilab/modules/umfpack/src/c/taucs_scilab.c
@@ -307,7 +307,7 @@ taucs_ccs_permute_symmetrically(taucs_ccs_matrix* A, int* perm, int* invperm)
307 PAPT->flags = A->flags; 307 PAPT->flags = A->flags;
308 308
309 len = (int*) MALLOC(n * sizeof(int)); 309 len = (int*) MALLOC(n * sizeof(int));
310 colptr = (int*) MALLOC(n * sizeof(int)); 310 //colptr = (int*) MALLOC(n * sizeof(int));
311 311
312 for (j=0; j<n; j++) len[j] = 0; 312 for (j=0; j<n; j++) len[j] = 0;
313 313
@@ -361,7 +361,9 @@ taucs_ccs_permute_symmetrically(taucs_ccs_matrix* A, int* perm, int* invperm)
361 len[J] ++; 361 len[J] ++;
362 } 362 }
363 } 363 }
364 364
365 if (len) {FREE(len); len = NULL;}
366
365 return PAPT; 367 return PAPT;
366} 368}
367 369
@@ -1751,6 +1753,8 @@ taucs_ccs_symbolic_elimination(taucs_ccs_matrix* A,
1751 FREE(column_to_sn_map); 1753 FREE(column_to_sn_map);
1752 FREE(next_child); 1754 FREE(next_child);
1753 FREE(first_child); 1755 FREE(first_child);
1756 FREE(ipostorder);
1757
1754 return 0; 1758 return 0;
1755} 1759}
1756 1760
@@ -1789,7 +1793,7 @@ recursive_multifrontal_supernodal_factor_llt(int sn, /* this supernode */
1789 bitmap, 1793 bitmap,
1790 A,snL,fail); 1794 A,snL,fail);
1791 if (*fail) { 1795 if (*fail) {
1792 if (my_matrix) supernodal_frontal_free(my_matrix); 1796 if (child_matrix) supernodal_frontal_free(child_matrix);
1793 return NULL; 1797 return NULL;
1794 } 1798 }
1795 1799