Merge from upstream.

This commit is contained in:
Bård Skaflestad 2010-11-11 09:41:16 +01:00
commit 8e5105c416
2 changed files with 1 additions and 2 deletions

View File

@ -33,7 +33,7 @@ mim_ip_simple_all(int ncells, int d, int max_nconn,
double *perm, double *Binv)
/* ------------------------------------------------------------------ */
{
int i, j, c, f, nf, nconn, fpos2, lwork;
int i, j, c, f, nconn, fpos2, lwork;
double *C, *N, *A, *work, s;

View File

@ -49,7 +49,6 @@ void mim_ip_simple(int nf, int nconn, int d,
* @param ncells Number of cells in grid.
* @param d Number of space dimensions.
* @param max_ncf Maximum number of faces per cell.
* @param ncf Number of faces per cell.
* @param pconn Start indices in conn for each cell, plus end
* marker. The size of pconn is (ncells + 1), and for a
* cell i, [conn[pconn[i]], conn[pconn[i+1]]) is a