Merge pull request #551 from atgeirr/re-add-bhp-eclipsewriter

Re-add the bhp reports to the summary output.

opm/core/io/eclipse/EclipseWriter.cpp

@@ -1168,6 +1168,22 @@ struct EclipseWellBhp : public EclipseWellReport {
                              "Pascal")
     { }
 
+    EclipseWellBhp   (const EclipseSummary& summary,
+                      Opm::DeckConstPtr newParserDeck,
+                      int whichWell,
+                      PhaseUsage uses,
+                      BlackoilPhases::PhaseIndex phase,
+                      WellType type)
+        : EclipseWellReport (summary,
+                             newParserDeck,
+                             whichWell,
+                             uses,
+                             phase,
+                             type,
+                             'B',
+                             "Pascal")
+    { }
+
     virtual double update (const SimulatorTimer& /*timer*/,
                            const WellState& wellState)
     {
@@ -1296,6 +1312,27 @@ EclipseSummary::addWells (Opm::DeckConstPtr newParserDeck,
             }
         }
     }
+
+    // Add BHP monitors
+    for (int whichWell = 0; whichWell != numWells; ++whichWell) {
+        // In the call below: uses, phase and the well type arguments
+        // are not used, except to set up an index that stores the
+        // well indirectly. For details see the implementation of the
+        // EclipseWellReport constructor, and the method
+        // EclipseWellReport::bhp().
+        BlackoilPhases::PhaseIndex phase = BlackoilPhases::Liquid;
+        if (!uses.phase_used[BlackoilPhases::Liquid]) {
+            phase = BlackoilPhases::Vapour;
+        }
+        add (std::unique_ptr <EclipseWellReport> (
+                        new EclipseWellBhp (*this,
+                                            newParserDeck,
+                                            whichWell,
+                                            uses,
+                                            phase,
+                                            WELL_TYPES[0])));
+    }
+
 }
 
 namespace Opm {