From 45e0773edd39bd48664e7c0cbbb9ba48ff1abca2 Mon Sep 17 00:00:00 2001 From: Jostein Alvestad Date: Fri, 12 Apr 2019 16:48:27 +0200 Subject: [PATCH 1/3] changes to provide Summary data output of additional block variables Provide output data for: BOSAT BWKR BOKR BKRO BGKR BKRG BKRW BWPC BGPC BVWAT BWVIS BVGAS BGVIS BVOIL BOVIS --- ebos/ecloutputblackoilmodule.hh | 34 +++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh index 5dc60488e..24cdca84b 100644 --- a/ebos/ecloutputblackoilmodule.hh +++ b/ebos/ecloutputblackoilmodule.hh @@ -1,4 +1,4 @@ -// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +// -*- mode: C++; tab-width: 4dent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: /* This file is part of the Open Porous Media project (OPM). @@ -307,7 +307,7 @@ public: } if (FluidSystem::phaseIsActive(waterPhaseIdx) && rstKeywords["KRW"] > 0) { - rstKeywords["KRW"] = 0; + rstKeywords["KRW"] = 0; relativePermeability_[waterPhaseIdx].resize(bufferSize, 0.0); } if (FluidSystem::phaseIsActive(oilPhaseIdx) && rstKeywords["KRO"] > 0) { @@ -607,8 +607,38 @@ public: val.second = Opm::getValue(fs.saturation(waterPhaseIdx)); else if (key.first == "BGSAT") val.second = Opm::getValue(fs.saturation(gasPhaseIdx)); + else if (key.first == "BOSAT") + val.second = 1. - Opm::getValue(fs.saturation(gasPhaseIdx)) - Opm::getValue(fs.saturation(waterPhaseIdx)); else if (key.first == "BPR") val.second = Opm::getValue(fs.pressure(oilPhaseIdx)); + else if (key.first == "BWKR") + val.second = Opm::getValue(intQuants.relativePermeability(waterPhaseIdx)); + else if (key.first == "BKRW") + val.second = Opm::getValue(intQuants.relativePermeability(waterPhaseIdx)); + else if (key.first == "BGKR") + val.second = Opm::getValue(intQuants.relativePermeability(gasPhaseIdx)); + else if (key.first == "BKRG") + val.second = Opm::getValue(intQuants.relativePermeability(gasPhaseIdx)); + else if (key.first == "BOKR") + val.second = Opm::getValue(intQuants.relativePermeability(oilPhaseIdx)); + else if (key.first == "BKRO") + val.second = Opm::getValue(intQuants.relativePermeability(oilPhaseIdx)); + else if (key.first == "BWPC") + val.second = Opm::getValue(fs.pressure(oilPhaseIdx)) - Opm::getValue(fs.pressure(waterPhaseIdx)); + else if (key.first == "BGPC") + val.second = Opm::getValue(fs.pressure(gasPhaseIdx)) - Opm::getValue(fs.pressure(oilPhaseIdx)); + else if (key.first == "BVWAT") + val.second = Opm::getValue(fs.viscosity(waterPhaseIdx)); + else if (key.first == "BWVIS") + val.second = Opm::getValue(fs.viscosity(waterPhaseIdx)); + else if (key.first == "BVGAS") + val.second = Opm::getValue(fs.viscosity(gasPhaseIdx)); + else if (key.first == "BGVIS") + val.second = Opm::getValue(fs.viscosity(gasPhaseIdx)); + else if (key.first == "BVOIL") + val.second = Opm::getValue(fs.viscosity(oilPhaseIdx)); + else if (key.first == "BOVIS") + val.second = Opm::getValue(fs.viscosity(oilPhaseIdx)); else { std::string logstring = "Keyword '"; logstring.append(key.first); From 9d5e55180a1f5044b4653c3e5b86d83a00e8cef9 Mon Sep 17 00:00:00 2001 From: Jostein Alvestad Date: Tue, 23 Apr 2019 08:56:06 +0200 Subject: [PATCH 2/3] Added corrections to cancel unintended changes to code --- ebos/ecloutputblackoilmodule.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh index 24cdca84b..bc114678d 100644 --- a/ebos/ecloutputblackoilmodule.hh +++ b/ebos/ecloutputblackoilmodule.hh @@ -1,4 +1,4 @@ -// -*- mode: C++; tab-width: 4dent-tabs-mode: nil; c-basic-offset: 4 -*- +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: /* This file is part of the Open Porous Media project (OPM). @@ -307,7 +307,7 @@ public: } if (FluidSystem::phaseIsActive(waterPhaseIdx) && rstKeywords["KRW"] > 0) { - rstKeywords["KRW"] = 0; + rstKeywords["KRW"] = 0; relativePermeability_[waterPhaseIdx].resize(bufferSize, 0.0); } if (FluidSystem::phaseIsActive(oilPhaseIdx) && rstKeywords["KRO"] > 0) { From 38265ead52305ee3475d0e07af944c23255b2319 Mon Sep 17 00:00:00 2001 From: Jostein Alvestad Date: Wed, 24 Apr 2019 11:09:00 +0200 Subject: [PATCH 3/3] Have rerwritten the code in a more compact and logical form --- ebos/ecloutputblackoilmodule.hh | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh index bc114678d..a6684373c 100644 --- a/ebos/ecloutputblackoilmodule.hh +++ b/ebos/ecloutputblackoilmodule.hh @@ -611,33 +611,21 @@ public: val.second = 1. - Opm::getValue(fs.saturation(gasPhaseIdx)) - Opm::getValue(fs.saturation(waterPhaseIdx)); else if (key.first == "BPR") val.second = Opm::getValue(fs.pressure(oilPhaseIdx)); - else if (key.first == "BWKR") + else if (key.first == "BWKR" || key.first == "BKRW") val.second = Opm::getValue(intQuants.relativePermeability(waterPhaseIdx)); - else if (key.first == "BKRW") - val.second = Opm::getValue(intQuants.relativePermeability(waterPhaseIdx)); - else if (key.first == "BGKR") + else if (key.first == "BGKR" || key.first == "BKRG") val.second = Opm::getValue(intQuants.relativePermeability(gasPhaseIdx)); - else if (key.first == "BKRG") - val.second = Opm::getValue(intQuants.relativePermeability(gasPhaseIdx)); - else if (key.first == "BOKR") - val.second = Opm::getValue(intQuants.relativePermeability(oilPhaseIdx)); - else if (key.first == "BKRO") + else if (key.first == "BOKR" || key.first == "BKRO") val.second = Opm::getValue(intQuants.relativePermeability(oilPhaseIdx)); else if (key.first == "BWPC") val.second = Opm::getValue(fs.pressure(oilPhaseIdx)) - Opm::getValue(fs.pressure(waterPhaseIdx)); else if (key.first == "BGPC") val.second = Opm::getValue(fs.pressure(gasPhaseIdx)) - Opm::getValue(fs.pressure(oilPhaseIdx)); - else if (key.first == "BVWAT") + else if (key.first == "BVWAT" || key.first == "BWVIS") val.second = Opm::getValue(fs.viscosity(waterPhaseIdx)); - else if (key.first == "BWVIS") - val.second = Opm::getValue(fs.viscosity(waterPhaseIdx)); - else if (key.first == "BVGAS") + else if (key.first == "BVGAS" || key.first == "BGVIS") val.second = Opm::getValue(fs.viscosity(gasPhaseIdx)); - else if (key.first == "BGVIS") - val.second = Opm::getValue(fs.viscosity(gasPhaseIdx)); - else if (key.first == "BVOIL") - val.second = Opm::getValue(fs.viscosity(oilPhaseIdx)); - else if (key.first == "BOVIS") + else if (key.first == "BVOIL" || key.first == "BOVIS") val.second = Opm::getValue(fs.viscosity(oilPhaseIdx)); else { std::string logstring = "Keyword '";