From 7fe1ad5c695fe38c5187b3126b48423298d0b9d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Thu, 10 Oct 2019 09:54:43 +0200
Subject: [PATCH] Fixed error message and reinstated dummy enthalpy update.

---
 opm/models/blackoil/blackoilenergymodules.hh    | 1 +
 opm/models/blackoil/blackoilprimaryvariables.hh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/opm/models/blackoil/blackoilenergymodules.hh b/opm/models/blackoil/blackoilenergymodules.hh
index c40d0462c..6cae6c4f3 100644
--- a/opm/models/blackoil/blackoilenergymodules.hh
+++ b/opm/models/blackoil/blackoilenergymodules.hh
@@ -376,6 +376,7 @@ public:
         // and the thermal condictivity coefficients
         for (int phaseIdx = 0; phaseIdx < numPhases; ++ phaseIdx) {
             if (!FluidSystem::phaseIsActive(phaseIdx)) {
+                fs.setEnthalpy(phaseIdx, 0.0);
                 continue;
             }
 
diff --git a/opm/models/blackoil/blackoilprimaryvariables.hh b/opm/models/blackoil/blackoilprimaryvariables.hh
index 6807d76c7..9acc4a467 100644
--- a/opm/models/blackoil/blackoilprimaryvariables.hh
+++ b/opm/models/blackoil/blackoilprimaryvariables.hh
@@ -297,7 +297,7 @@ public:
                 (*this)[waterSaturationIdx] = FsToolbox::value(fluidState.saturation(waterPhaseIdx));
                 (*this)[pressureSwitchIdx] = FsToolbox::value(fluidState.pressure(waterPhaseIdx));
             } else {
-                throw std::logic_error("Only pure ware is presently allowed");
+                throw std::logic_error("For single-phase runs, only pure water is presently allowed.");
             }
             
         }