From 12083ccfd0d5cd36cf8eeae3c2ce62fed4370b7a Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Mon, 9 Jan 2017 12:08:29 +0100
Subject: [PATCH] BlackoilPropsAdFromDeck: don't rely on undefined behaviour
 when initializing the fluid system

in C++ references may be assumed to be non-null. thanks to
[at]atgeirr for pointing this out.
---
 opm/autodiff/BlackoilPropsAdFromDeck.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opm/autodiff/BlackoilPropsAdFromDeck.cpp b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
index f71ee42fc..f0b3e9e62 100644
--- a/opm/autodiff/BlackoilPropsAdFromDeck.cpp
+++ b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
@@ -158,7 +158,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
 
         phase_usage_ = phaseUsageFromDeck(deck);
 
-        if (! (&FluidSystem::oilPvt()) ) {
+        if (!FluidSystem::isInitialized()) {
             // make sure that we don't initialize the fluid system twice
             FluidSystem::initFromDeck(deck, eclState);
         }