From bf86cd93719e5afdf7ab2db823040396e0708e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= <Bard.Skaflestad@sintef.no>
Date: Tue, 20 Mar 2012 18:46:54 +0100
Subject: [PATCH] Revert to original (fractional flow) model of perforation
 fluxes.

---
 opm/core/pressure/IncompTpfa.cpp         | 4 ++--
 opm/core/pressure/TPFAPressureSolver.hpp | 2 --
 opm/core/pressure/tpfa/ifs_tpfa.h        | 7 +++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/opm/core/pressure/IncompTpfa.cpp b/opm/core/pressure/IncompTpfa.cpp
index cda47ec9..47e4178a 100644
--- a/opm/core/pressure/IncompTpfa.cpp
+++ b/opm/core/pressure/IncompTpfa.cpp
@@ -110,7 +110,7 @@ namespace Opm
 	    }
 	}
 
-        ifs_tpfa_forces F = { NULL, NULL, 0, NULL, NULL };
+        ifs_tpfa_forces F = { NULL, NULL, NULL, NULL, NULL };
         if (! src.empty()) { F.src = &src[0]; }
         F.bc = bcs;
 
@@ -172,7 +172,7 @@ namespace Opm
 	    }
 	}
 
-        ifs_tpfa_forces F = { NULL, NULL, 0, NULL, NULL };
+        ifs_tpfa_forces F = { NULL, NULL, NULL, NULL, NULL };
         if (! src.empty()) { F.src = &src[0]; }
         F.bc = bcs;
 
diff --git a/opm/core/pressure/TPFAPressureSolver.hpp b/opm/core/pressure/TPFAPressureSolver.hpp
index 763f80de..d1988c88 100644
--- a/opm/core/pressure/TPFAPressureSolver.hpp
+++ b/opm/core/pressure/TPFAPressureSolver.hpp
@@ -148,9 +148,7 @@ public:
 
         forces_.src = &src[0];
 	forces_.bc = 0;
-        forces_.nphase = 0;     // Referenced only in models with wells.
         forces_.W = 0;
-        forces_.Wdata = 0;
 
         // Assemble the embedded linear system.
         ifs_tpfa_assemble(g, &forces_, &eff_trans_[0], &gpress_[0], data_);
diff --git a/opm/core/pressure/tpfa/ifs_tpfa.h b/opm/core/pressure/tpfa/ifs_tpfa.h
index 15e333f9..fbe5a4f6 100644
--- a/opm/core/pressure/tpfa/ifs_tpfa.h
+++ b/opm/core/pressure/tpfa/ifs_tpfa.h
@@ -30,7 +30,6 @@ struct ifs_tpfa_impl;
 struct CSRMatrix;
 struct FlowBoundaryConditions;
 struct Wells;
-struct CompletionData;
 
 struct ifs_tpfa_data {
     struct CSRMatrix     *A;
@@ -49,9 +48,9 @@ struct ifs_tpfa_forces {
     const double                        *src;
     const struct FlowBoundaryConditions *bc ;
 
-    int                          nphase; /* for Wdata->phasemob */
-    const struct Wells          *W     ;
-    const struct CompletionData *Wdata ;
+    const struct Wells *W     ;
+    const double       *totmob;
+    const double       *wdp   ;
 };