Merge from upstream.

src/HybridPressureSolver.hpp

@@ -104,7 +104,7 @@ public:
         grid_t* g = grid_.c_grid();
         mim_ip_simple_all(g->number_of_cells, g->dimensions,
                           data_->max_ngconn,
-                          &ncf_[0], g->cell_facepos, g->cell_faces,
+                          g->cell_facepos, g->cell_faces,
                           g->face_cells, g->face_centroids,
                           g->face_normals, g->face_areas,
                           g->cell_centroids, g->cell_volumes,

src/mimetic.c

@@ -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;
 

src/mimetic.h

@@ -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