From e17d5e6499e6d2eb76719e7d4f5482195b95d9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Wed, 14 Nov 2012 15:30:25 +0100 Subject: [PATCH 1/2] Remove unneeded assert(). Function is safe to call with empty vectors. --- opm/core/transport/SinglePointUpwindTwoPhase.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/opm/core/transport/SinglePointUpwindTwoPhase.hpp b/opm/core/transport/SinglePointUpwindTwoPhase.hpp index 87ea6c2f..c73fb3da 100644 --- a/opm/core/transport/SinglePointUpwindTwoPhase.hpp +++ b/opm/core/transport/SinglePointUpwindTwoPhase.hpp @@ -312,7 +312,6 @@ namespace Opm { const std::vector& hf_faces, const std::vector& nb_faces) { - assert (! p_faces.empty()); assert (p_faces.size() == hf_faces.size()); assert (hf_faces.size() == nb_faces.size()); From 2b0e5708426d5f8507d27a61fe544f1e7b30de86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Thu, 15 Nov 2012 08:54:45 +0100 Subject: [PATCH 2/2] Make explicit intention to do nothing on empty input. --- opm/core/transport/SinglePointUpwindTwoPhase.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opm/core/transport/SinglePointUpwindTwoPhase.hpp b/opm/core/transport/SinglePointUpwindTwoPhase.hpp index c73fb3da..92d87030 100644 --- a/opm/core/transport/SinglePointUpwindTwoPhase.hpp +++ b/opm/core/transport/SinglePointUpwindTwoPhase.hpp @@ -312,6 +312,9 @@ namespace Opm { const std::vector& hf_faces, const std::vector& nb_faces) { + if (p_faces.empty()) { + return; + } assert (p_faces.size() == hf_faces.size()); assert (hf_faces.size() == nb_faces.size());