Add tentative support for pressure boundary conditions in IncompTPFA.

Not enabled in C++ glue layer (presently assumes no boundary conditions).

opm/core/pressure/IncompTpfa.cpp

@@ -107,6 +107,7 @@ namespace Opm
 
         ifs_tpfa_forces F;
         F.src = &src[0];
+        F.bc  = 0;              // No boundary conditions.
 
 	ifs_tpfa_assemble(gg, &F, &trans_[0], &gpress_omegaweighted_[0], h_);
 
@@ -115,7 +116,7 @@ namespace Opm
 	pressure.resize(grid_.number_of_cells);
 	faceflux.resize(grid_.number_of_faces);
 
-	ifs_tpfa_press_flux(gg, &trans_[0], h_,
+	ifs_tpfa_press_flux(gg, &F, &trans_[0], h_,
 			    &pressure[0],
 			    &faceflux[0]);
     }

opm/core/pressure/tpfa/ifs_tpfa.c

@@ -4,6 +4,8 @@
 #include <string.h>
 
 #include <opm/core/linalg/sparse_sys.h>
+
+#include <opm/core/pressure/flow_bc.h>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
 
 
@@ -148,6 +150,44 @@ compute_grav_term(struct UnstructuredGrid *G, const double *gpress,
 }
 
 
+/* ---------------------------------------------------------------------- */
+static int
+assemble_bc_contrib(struct UnstructuredGrid       *G    ,
+                    struct FlowBoundaryConditions *bc   ,
+                    const double                  *trans,
+                    struct ifs_tpfa_data          *h    )
+/* ---------------------------------------------------------------------- */
+{
+    int is_neumann;
+    int i, f, c1, c2;
+
+    size_t j;
+
+    is_neumann = 1;
+
+    for (i = 0; ((size_t) i) < bc->nbc; i++) {
+        if (bc->type[ i ] == BC_PRESSURE) {
+            is_neumann = 0;
+
+            f  = bc->face[ i ];
+            c1 = G->face_cells[2*f + 0];
+            c2 = G->face_cells[2*f + 1];
+
+            assert ((c1 < 0) ^ (c2 < 0)); /* BCs on ext. faces only */
+
+            c1 = (c1 >= 0) ? c1 : c2;
+            j  = csrmatrix_elm_index(c1, c1, h->A);
+
+            h->A->sa[ j ] += trans[ f ];
+            h->b    [ c1] += trans[ f ] * bc->value[ i ];
+        }
+
+        /* Other types currently not handled */
+    }
+
+    return is_neumann;
+}
+
 
 /* ======================================================================
  * Public interface below separator.
@@ -194,6 +234,8 @@ ifs_tpfa_assemble(struct UnstructuredGrid               *G,
 {
     int c1, c2, c, i, f, j1, j2;
 
+    int is_neumann;
+
     double s;
 
     csrmatrix_zero(         h->A);
@@ -228,13 +270,22 @@ ifs_tpfa_assemble(struct UnstructuredGrid               *G,
         }
     }
 
+    is_neumann = 1;
+    if ((F != NULL) && (F->bc != NULL)) {
+        is_neumann = assemble_bc_contrib(G, F->bc, trans, h);
+    }
+
+    if (is_neumann) {
+        /* Remove zero eigenvalue associated to constant pressure */
         h->A->sa[0] *= 2;
     }
+}
 
 
 /* ---------------------------------------------------------------------- */
 void
 ifs_tpfa_press_flux(struct UnstructuredGrid               *G,
+                    const struct ifs_tpfa_forces *F,
                     const double         *trans,
                     struct ifs_tpfa_data *h,
                     double               *cpress,
@@ -242,6 +293,7 @@ ifs_tpfa_press_flux(struct UnstructuredGrid               *G,
 /* ---------------------------------------------------------------------- */
 {
     int    c1, c2, f;
+    size_t i;
     double dh;
 
     /* Assign cell pressure directly from solution vector */
@@ -258,6 +310,29 @@ ifs_tpfa_press_flux(struct UnstructuredGrid               *G,
             fflux[f] = 0.0;
         }
     }
+
+    if ((F != NULL) && (F->bc != NULL)) {
+        for (i = 0; i < F->bc->nbc; i++) {
+            if (F->bc->type[ i ] == BC_PRESSURE) {
+                f  = F->bc->face[ i ];
+                c1 = G->face_cells[2*f + 0];
+                c2 = G->face_cells[2*f + 1];
+
+                assert ((c1 < 0) ^ (c2 < 0));
+
+                if (c1 < 0) {   /* Environment -> c2 */
+                    dh = F->bc->value[ i ] - cpress[c2];
+                }
+                else {          /* c1 -> environment */
+                    dh = cpress[c1] - F->bc->value[ i ];
+                }
+
+                fflux[f] = trans[f] * (dh + h->pimpl->fgrav[f]);
+            }
+
+            /* Other boundary condtions currently not handled */
+        }
+    }
 }
 
 

opm/core/pressure/tpfa/ifs_tpfa.h

@@ -28,6 +28,7 @@ extern "C" {
 
 struct ifs_tpfa_impl;
 struct CSRMatrix;
+struct FlowBoundaryConditions;
 
 struct ifs_tpfa_data {
     struct CSRMatrix     *A;
@@ -40,6 +41,7 @@ struct ifs_tpfa_data {
 
 struct ifs_tpfa_forces {
     const double *src;
+    struct FlowBoundaryConditions *bc;
 };
 
 
@@ -55,6 +57,7 @@ ifs_tpfa_assemble(struct UnstructuredGrid               *G,
 
 void
 ifs_tpfa_press_flux(struct UnstructuredGrid               *G,
+                    const struct ifs_tpfa_forces *F,
                     const double         *trans,
                     struct ifs_tpfa_data *h,
                     double               *cpress,