From 51d71c122fa2f6b9f15be5f688cc09182033f5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Wed, 18 Jan 2012 18:36:20 +0100 Subject: [PATCH] Added sanity checking for number of phases in property classes. --- opm/core/fluid/BlackoilPropertiesBasic.cpp | 4 ++++ opm/core/fluid/BlackoilPropertiesFromDeck.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/opm/core/fluid/BlackoilPropertiesBasic.cpp b/opm/core/fluid/BlackoilPropertiesBasic.cpp index 7a70d2c6d..768991e62 100644 --- a/opm/core/fluid/BlackoilPropertiesBasic.cpp +++ b/opm/core/fluid/BlackoilPropertiesBasic.cpp @@ -36,6 +36,10 @@ namespace Opm rock_.init(dim, num_cells, poro, perm); pvt_.init(param); satprops_.init(param); + if (pvt_.numPhases() != satprops_.numPhases()) { + THROW("BlackoilPropertiesBasic::BlackoilPropertiesBasic() - Inconsistent number of phases in pvt data (" + << pvt_.numPhases() << ") and saturation-dependent function data (" << satprops_.numPhases() << ")."); + } } BlackoilPropertiesBasic::~BlackoilPropertiesBasic() diff --git a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp index a66c5f57a..6e6fbdbf4 100644 --- a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp +++ b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp @@ -28,6 +28,10 @@ namespace Opm rock_.init(deck, global_cell); pvt_.init(deck); satprops_.init(deck); + if (pvt_.numPhases() != satprops_.numPhases()) { + THROW("BlackoilPropertiesBasic::BlackoilPropertiesBasic() - Inconsistent number of phases in pvt data (" + << pvt_.numPhases() << ") and saturation-dependent function data (" << satprops_.numPhases() << ")."); + } } BlackoilPropertiesFromDeck::~BlackoilPropertiesFromDeck()