Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct suffix for solution tracers #4001

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
+102 −8
Draft

Correct suffix for solution tracers #4001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3389558
Suffix "S" for solution tracers
svenn-t Apr 3, 2024
5fa3f0c
Output summary vectors for free and solution tracers
svenn-t May 16, 2024
f6bec89
Only write SWELL and XWELL for water tracers.
svenn-t May 21, 2024
f9559ad
Simplify index expression
svenn-t May 23, 2024
52fc50a
Make clear the prefix length of tracer well keywords
svenn-t May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion opm/input/eclipse/EclipseState/TracerConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,14 @@ bool TracerConfig::operator==(const TracerConfig& other) const {

std::string TracerConfig::get_unit_string(const UnitSystem& unit_system, const std::string & tracer_kw) const {
if (tracer_kw.length() > 4 ) {
std::string tracer_name = tracer_kw.substr(4);
int istart;
if (tracer_kw[4] == 'F' || tracer_kw[4] == 'S') {
istart = 5;
}
else {
istart = 4;
}
std::string tracer_name = tracer_kw.substr(istart);
for (const auto& tracer : tracers) {
if (tracer.name == tracer_name) {
std::string unit_string(tracer.unit_string);
Expand Down
9 changes: 9 additions & 0 deletions opm/input/eclipse/EclipseState/TracerConfig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ class TracerConfig {
std::string fname() const {
return this->name + "F";
}
std::string sname() const {
return this->name + "S";
}
std::string wellfname() const {
return "F" + this->name;
}
std::string wellsname() const {
return "S" + this->name;
}


TracerEntry() = default;
Expand Down
8 changes: 5 additions & 3 deletions opm/output/eclipse/AggregateWellData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,8 +1077,10 @@ namespace {
auto output_index = static_cast<std::size_t>(VI::SWell::index::TracerOffset);

for (const auto& tracer : tracers) {
sWell[output_index++] =
smry.get_well_var(wname, fmt::format("WTIC{}", tracer.name), 0.0);
if (tracer.phase == Opm::Phase::WATER) {
sWell[output_index++] =
smry.get_well_var(wname, fmt::format("WTIC{}", tracer.name), 0.0);
}
}
}

Expand Down Expand Up @@ -1332,7 +1334,7 @@ namespace {
const Opm::Well& well,
XWellArray& xWell)
{
if (tracers.empty())
if (tracers.empty() || tracer_dims.water_tracers() == 0)
return;

using Ix = ::Opm::RestartIO::Helpers::VectorItems::XWell::index;
Expand Down
84 changes: 80 additions & 4 deletions opm/output/eclipse/Summary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,8 +873,10 @@ inline quantity filtrate_well_quantities( const fn_args& args ) {
template< rt tracer, rt phase, bool injection = true >
inline quantity ratetracer( const fn_args& args ) {
double sum = 0.0;

std::string tracer_name = args.keyword_name.substr(4);

// All well-related tracer keywords, e.g. WTPCxx, WTPRxx, FTPTxx, have a 4-letter prefix length
constexpr auto prefix_len = 4;
std::string tracer_name = args.keyword_name.substr(prefix_len);

for (const auto* sched_well : args.schedule_wells) {
const auto& name = sched_well->name();
Expand Down Expand Up @@ -1995,9 +1997,21 @@ static const auto funs = std::unordered_map<std::string, ofun> {
{ "WTIR#W", ratetracer< rt::tracer, rt::wat, injector > }, // #W: Water tracers
{ "WTIR#O", ratetracer< rt::tracer, rt::oil, injector > }, // #O: Oil tracers
{ "WTIR#G", ratetracer< rt::tracer, rt::gas, injector > }, // #G: Gas tracers
{ "WTIRF#W", ratetracer< rt::tracer, rt::wat, injector > }, // #W: Water tracers
{ "WTIRF#O", ratetracer< rt::tracer, rt::oil, injector > }, // #O: Oil tracers
{ "WTIRF#G", ratetracer< rt::tracer, rt::gas, injector > }, // #G: Gas tracers
{ "WTIRS#W", ratetracer< rt::tracer, rt::wat, injector > }, // #W: Water tracers
{ "WTIRS#O", ratetracer< rt::tracer, rt::oil, injector > }, // #O: Oil tracers
{ "WTIRS#G", ratetracer< rt::tracer, rt::gas, injector > }, // #G: Gas tracers
{ "WTIC#W", div( ratetracer< rt::tracer, rt::wat, injector >, rate< rt::wat, injector >) },
{ "WTIC#O", div( ratetracer< rt::tracer, rt::oil, injector >, rate< rt::oil, injector >) },
{ "WTIC#G", div( ratetracer< rt::tracer, rt::gas, injector >, rate< rt::gas, injector >) },
{ "WTICF#W", div( ratetracer< rt::tracer, rt::wat, injector >, rate< rt::wat, injector >) },
{ "WTICF#O", div( ratetracer< rt::tracer, rt::oil, injector >, rate< rt::oil, injector >) },
{ "WTICF#G", div( ratetracer< rt::tracer, rt::gas, injector >, rate< rt::gas, injector >) },
{ "WTICS#W", div( ratetracer< rt::tracer, rt::wat, injector >, rate< rt::wat, injector >) },
{ "WTICS#O", div( ratetracer< rt::tracer, rt::oil, injector >, rate< rt::oil, injector >) },
{ "WTICS#G", div( ratetracer< rt::tracer, rt::gas, injector >, rate< rt::gas, injector >) },
{ "WVIR", sum( sum( rate< rt::reservoir_water, injector >, rate< rt::reservoir_oil, injector > ),
rate< rt::reservoir_gas, injector > ) },
{ "WGIGR", well_guiderate<injector, Opm::data::GuideRateValue::Item::Gas> },
Expand All @@ -2014,6 +2028,12 @@ static const auto funs = std::unordered_map<std::string, ofun> {
{ "WTIT#W", mul( ratetracer< rt::tracer, rt::wat, injector >, duration ) },
{ "WTIT#O", mul( ratetracer< rt::tracer, rt::oil, injector >, duration ) },
{ "WTIT#G", mul( ratetracer< rt::tracer, rt::gas, injector >, duration ) },
{ "WTITF#W", mul( ratetracer< rt::tracer, rt::wat, injector >, duration ) },
{ "WTITF#O", mul( ratetracer< rt::tracer, rt::oil, injector >, duration ) },
{ "WTITF#G", mul( ratetracer< rt::tracer, rt::gas, injector >, duration ) },
{ "WTITS#W", mul( ratetracer< rt::tracer, rt::wat, injector >, duration ) },
{ "WTITS#O", mul( ratetracer< rt::tracer, rt::oil, injector >, duration ) },
{ "WTITS#G", mul( ratetracer< rt::tracer, rt::gas, injector >, duration ) },
{ "WVIT", mul( sum( sum( rate< rt::reservoir_water, injector >, rate< rt::reservoir_oil, injector > ),
rate< rt::reservoir_gas, injector > ), duration ) },

Expand Down Expand Up @@ -2045,9 +2065,21 @@ static const auto funs = std::unordered_map<std::string, ofun> {
{ "WTPR#W", ratetracer< rt::tracer, rt::wat, producer > },
{ "WTPR#O", ratetracer< rt::tracer, rt::oil, producer > },
{ "WTPR#G", ratetracer< rt::tracer, rt::gas, producer > },
{ "WTPRF#W", ratetracer< rt::tracer, rt::wat, producer> },
{ "WTPRF#O", ratetracer< rt::tracer, rt::oil, producer> },
{ "WTPRF#G", ratetracer< rt::tracer, rt::gas, producer> },
{ "WTPRS#W", ratetracer< rt::tracer, rt::wat, producer> },
{ "WTPRS#O", ratetracer< rt::tracer, rt::oil, producer> },
{ "WTPRS#G", ratetracer< rt::tracer, rt::gas, producer> },
{ "WTPC#W", div( ratetracer< rt::tracer, rt::wat, producer >, rate< rt::wat, producer >) },
{ "WTPC#O", div( ratetracer< rt::tracer, rt::oil, producer >, rate< rt::oil, producer >) },
{ "WTPC#G", div( ratetracer< rt::tracer, rt::gas, producer >, rate< rt::gas, producer >) },
{ "WTPCF#W", div( ratetracer< rt::tracer, rt::wat, producer >, rate< rt::wat, producer >) },
{ "WTPCF#O", div( ratetracer< rt::tracer, rt::oil, producer >, rate< rt::oil, producer >) },
{ "WTPCF#G", div( ratetracer< rt::tracer, rt::gas, producer >, rate< rt::gas, producer >) },
{ "WTPCS#W", div( ratetracer< rt::tracer, rt::wat, producer >, rate< rt::wat, producer >) },
{ "WTPCS#O", div( ratetracer< rt::tracer, rt::oil, producer >, rate< rt::oil, producer >) },
{ "WTPCS#G", div( ratetracer< rt::tracer, rt::gas, producer >, rate< rt::gas, producer >) },
{ "WCPC", div( rate< rt::polymer, producer >, rate< rt::wat, producer >) },
{ "WSPC", div( rate< rt::brine, producer >, rate< rt::wat, producer >) },

Expand Down Expand Up @@ -2076,6 +2108,12 @@ static const auto funs = std::unordered_map<std::string, ofun> {
{ "WTPT#W", mul( ratetracer< rt::tracer, rt::wat, producer >, duration ) },
{ "WTPT#O", mul( ratetracer< rt::tracer, rt::oil, producer >, duration ) },
{ "WTPT#G", mul( ratetracer< rt::tracer, rt::gas, producer >, duration ) },
{ "WTPTF#W", mul( ratetracer< rt::tracer, rt::wat, producer >, duration ) },
{ "WTPTF#O", mul( ratetracer< rt::tracer, rt::oil, producer >, duration ) },
{ "WTPTF#G", mul( ratetracer< rt::tracer, rt::gas, producer >, duration ) },
{ "WTPTS#W", mul( ratetracer< rt::tracer, rt::wat, producer >, duration ) },
{ "WTPTS#O", mul( ratetracer< rt::tracer, rt::oil, producer >, duration ) },
{ "WTPTS#G", mul( ratetracer< rt::tracer, rt::gas, producer >, duration ) },
{ "WLPT", mul( sum( rate< rt::wat, producer >, rate< rt::oil, producer > ),
duration ) },
{ "WGPTS", mul( rate< rt::dissolved_gas, producer >, duration )},
Expand Down Expand Up @@ -2351,9 +2389,21 @@ static const auto funs = std::unordered_map<std::string, ofun> {
{ "FTPR#W", ratetracer< rt::tracer, rt::wat, producer > },
{ "FTPR#O", ratetracer< rt::tracer, rt::oil, producer > },
{ "FTPR#G", ratetracer< rt::tracer, rt::gas, producer > },
{ "FTPRF#W", ratetracer< rt::tracer, rt::wat, producer > },
{ "FTPRF#O", ratetracer< rt::tracer, rt::oil, producer > },
{ "FTPRF#G", ratetracer< rt::tracer, rt::gas, producer > },
{ "FTPRS#W", ratetracer< rt::tracer, rt::wat, producer > },
{ "FTPRS#O", ratetracer< rt::tracer, rt::oil, producer > },
{ "FTPRS#G", ratetracer< rt::tracer, rt::gas, producer > },
{ "FTPC#W", div( ratetracer< rt::tracer, rt::wat, producer >, rate< rt::wat, producer >) },
{ "FTPC#O", div( ratetracer< rt::tracer, rt::oil, producer >, rate< rt::oil, producer >) },
{ "FTPC#G", div( ratetracer< rt::tracer, rt::gas, producer >, rate< rt::gas, producer >) },
{ "FTPCF#W", div( ratetracer< rt::tracer, rt::wat, producer >, rate< rt::wat, producer >) },
{ "FTPCF#O", div( ratetracer< rt::tracer, rt::oil, producer >, rate< rt::oil, producer >) },
{ "FTPCF#G", div( ratetracer< rt::tracer, rt::gas, producer >, rate< rt::gas, producer >) },
{ "FTPCS#W", div( ratetracer< rt::tracer, rt::wat, producer >, rate< rt::wat, producer >) },
{ "FTPCS#O", div( ratetracer< rt::tracer, rt::oil, producer >, rate< rt::oil, producer >) },
{ "FTPCS#G", div( ratetracer< rt::tracer, rt::gas, producer >, rate< rt::gas, producer >) },
{ "FVPR", sum( sum( rate< rt::reservoir_water, producer>, rate< rt::reservoir_oil, producer >),
rate< rt::reservoir_gas, producer>)},
{ "FGPRS", rate< rt::dissolved_gas, producer > },
Expand All @@ -2373,6 +2423,12 @@ static const auto funs = std::unordered_map<std::string, ofun> {
{ "FTPT#W", mul( ratetracer< rt::tracer, rt::wat, producer >, duration ) },
{ "FTPT#O", mul( ratetracer< rt::tracer, rt::oil, producer >, duration ) },
{ "FTPT#G", mul( ratetracer< rt::tracer, rt::gas, producer >, duration ) },
{ "FTPTF#W", mul( ratetracer< rt::tracer, rt::wat, producer >, duration ) },
{ "FTPTF#O", mul( ratetracer< rt::tracer, rt::oil, producer >, duration ) },
{ "FTPTF#G", mul( ratetracer< rt::tracer, rt::gas, producer >, duration ) },
{ "FTPTS#W", mul( ratetracer< rt::tracer, rt::wat, producer >, duration ) },
{ "FTPTS#O", mul( ratetracer< rt::tracer, rt::oil, producer >, duration ) },
{ "FTPTS#G", mul( ratetracer< rt::tracer, rt::gas, producer >, duration ) },
{ "FLPT", mul( sum( rate< rt::wat, producer >, rate< rt::oil, producer > ),
duration ) },
{ "FVPT", mul(sum (sum( rate< rt::reservoir_water, producer>, rate< rt::reservoir_oil, producer >),
Expand All @@ -2395,9 +2451,21 @@ static const auto funs = std::unordered_map<std::string, ofun> {
{ "FTIR#W", ratetracer< rt::tracer, rt::wat, injector > },
{ "FTIR#O", ratetracer< rt::tracer, rt::oil, injector > },
{ "FTIR#G", ratetracer< rt::tracer, rt::gas, injector > },
{ "FTIRF#W", ratetracer< rt::tracer, rt::wat, injector > },
{ "FTIRF#O", ratetracer< rt::tracer, rt::oil, injector > },
{ "FTIRF#G", ratetracer< rt::tracer, rt::gas, injector > },
{ "FTIRS#W", ratetracer< rt::tracer, rt::wat, injector > },
{ "FTIRS#O", ratetracer< rt::tracer, rt::oil, injector > },
{ "FTIRS#G", ratetracer< rt::tracer, rt::gas, injector > },
{ "FTIC#W", div( ratetracer< rt::tracer, rt::wat, injector >, rate< rt::wat, injector >) },
{ "FTIC#O", div( ratetracer< rt::tracer, rt::oil, injector >, rate< rt::oil, injector >) },
{ "FTIC#G", div( ratetracer< rt::tracer, rt::gas, injector >, rate< rt::gas, injector >) },
{ "FTICF#W", div( ratetracer< rt::tracer, rt::wat, injector >, rate< rt::wat, injector >) },
{ "FTICF#O", div( ratetracer< rt::tracer, rt::oil, injector >, rate< rt::oil, injector >) },
{ "FTICF#G", div( ratetracer< rt::tracer, rt::gas, injector >, rate< rt::gas, injector >) },
{ "FTICS#W", div( ratetracer< rt::tracer, rt::wat, injector >, rate< rt::wat, injector >) },
{ "FTICS#O", div( ratetracer< rt::tracer, rt::oil, injector >, rate< rt::oil, injector >) },
{ "FTICS#G", div( ratetracer< rt::tracer, rt::gas, injector >, rate< rt::gas, injector >) },
{ "FVIR", sum( sum( rate< rt::reservoir_water, injector>, rate< rt::reservoir_oil, injector >),
rate< rt::reservoir_gas, injector>)},

Expand All @@ -2413,6 +2481,12 @@ static const auto funs = std::unordered_map<std::string, ofun> {
{ "FTIT#W", mul( ratetracer< rt::tracer, rt::wat, injector >, duration ) },
{ "FTIT#O", mul( ratetracer< rt::tracer, rt::oil, injector >, duration ) },
{ "FTIT#G", mul( ratetracer< rt::tracer, rt::gas, injector >, duration ) },
{ "FTITF#W", mul( ratetracer< rt::tracer, rt::wat, injector >, duration ) },
{ "FTITF#O", mul( ratetracer< rt::tracer, rt::oil, injector >, duration ) },
{ "FTITF#G", mul( ratetracer< rt::tracer, rt::gas, injector >, duration ) },
{ "FTITS#W", mul( ratetracer< rt::tracer, rt::wat, injector >, duration ) },
{ "FTITS#O", mul( ratetracer< rt::tracer, rt::oil, injector >, duration ) },
{ "FTITS#G", mul( ratetracer< rt::tracer, rt::gas, injector >, duration ) },
{ "FLIT", mul( sum( rate< rt::wat, injector >, rate< rt::oil, injector > ),
duration ) },
{ "FVIT", mul( sum( sum( rate< rt::reservoir_water, injector>, rate< rt::reservoir_oil, injector >),
Expand Down Expand Up @@ -3865,7 +3939,9 @@ namespace Evaluator {
return false;
}

const auto tracer_name = normKw.substr(4);
const auto istart = 4 + ((normKw[4] == 'F') || (normKw[4] == 'S'));

const auto tracer_name = normKw.substr(istart);

const auto& tracers = this->es_.tracer();
auto trPos = std::find_if(tracers.begin(), tracers.end(),
Expand All @@ -3878,7 +3954,7 @@ namespace Evaluator {
return false;
}

auto tracer_tag = normKw.substr(0, 4);
auto tracer_tag = normKw.substr(0, istart);
switch (trPos->phase) {
case Opm::Phase::WATER:
tracer_tag += "#W";
Expand Down