From cb99938c62db1d43c994ed42a615d8f134beba26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Wed, 5 Feb 2014 13:05:33 +0100 Subject: [PATCH 1/2] Fix initialisation warning. --- opm/core/linalg/LinearSolverUmfpack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/core/linalg/LinearSolverUmfpack.cpp b/opm/core/linalg/LinearSolverUmfpack.cpp index 1139e9c9d..8980d4b19 100644 --- a/opm/core/linalg/LinearSolverUmfpack.cpp +++ b/opm/core/linalg/LinearSolverUmfpack.cpp @@ -56,7 +56,7 @@ namespace Opm const_cast(sa) }; call_UMFPACK(&A, rhs, solution); - LinearSolverReport rep = {0}; + LinearSolverReport rep = {}; rep.converged = true; return rep; } From 6632630269a5cffb01b3d747a4dc95aad28f8c1b Mon Sep 17 00:00:00 2001 From: Kristian Flikka Date: Thu, 6 Feb 2014 21:17:36 +0100 Subject: [PATCH 2/2] Initializing do_hyst_ to false, this caused random segfaults in sim_fibo_ad --- opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp index b2b9fd47a..c30069934 100644 --- a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp +++ b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp @@ -100,8 +100,9 @@ namespace Opm } // Saturation table scaling - do_eps_ = false; - do_3pt_ = false; + do_hyst_ = false; + do_eps_ = false; + do_3pt_ = false; if (deck.hasField("ENDSCALE")) { //if (!phase_usage_.phase_used[Aqua] || !phase_usage_.phase_used[Liquid] || phase_usage_.phase_used[Vapour]) { // OPM_THROW(std::runtime_error, "Currently endpoint-scaling limited to oil-water systems without gas.");