mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-09 06:55:56 -06:00
Update flow diagnostics from upstream master
This commit is contained in:
parent
4d49302e82
commit
4bd76a78ad
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
Module: opm-flowdiagnostics-applications
|
Module: opm-flowdiagnostics-applications
|
||||||
Description: flow diagnostics applications and examples
|
Description: flow diagnostics applications and examples
|
||||||
Version: 2019.10-pre
|
Version: 2020.04-pre
|
||||||
Label: 2019.10-pre
|
Label: 2020.04-pre
|
||||||
Maintainer: bard.skaflestad@sintef.no
|
Maintainer: bard.skaflestad@sintef.no
|
||||||
MaintainerName: Bård Skaflestad
|
MaintainerName: Bård Skaflestad
|
||||||
Url: http://opm-project.org
|
Url: http://opm-project.org
|
||||||
|
@ -71,8 +71,6 @@ namespace {
|
|||||||
inline std::string
|
inline std::string
|
||||||
firstBlockKeyword(const ecl_file_view_type* block)
|
firstBlockKeyword(const ecl_file_view_type* block)
|
||||||
{
|
{
|
||||||
if (!block) return "";
|
|
||||||
|
|
||||||
return ecl_kw_get_header(ecl_file_view_iget_kw(block, 0));
|
return ecl_kw_get_header(ecl_file_view_iget_kw(block, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -775,17 +773,23 @@ ECLImpl::InitFileSections::InitFileSections(const ecl_file_type* init)
|
|||||||
// Note: ecl_file_get_global_view() does not modify input arg
|
// Note: ecl_file_get_global_view() does not modify input arg
|
||||||
: init_(ecl_file_get_global_view(const_cast<ecl_file_type*>(init)))
|
: init_(ecl_file_get_global_view(const_cast<ecl_file_type*>(init)))
|
||||||
{
|
{
|
||||||
const auto* endLGR_kw = "LGRSGONE";
|
if (! ecl_file_view_has_kw(this->init_, LGR_KW)) {
|
||||||
const auto nEndLGR =
|
|
||||||
ecl_file_view_get_num_named_kw(this->init_, endLGR_kw);
|
|
||||||
|
|
||||||
if (nEndLGR == 0) {
|
|
||||||
// No LGRs in model. INIT file consists of global section only,
|
// No LGRs in model. INIT file consists of global section only,
|
||||||
// meaning that the only available section is equal to the global
|
// meaning that the only available section is equal to the global
|
||||||
// view (i.e., this->init_).
|
// view (i.e., this->init_).
|
||||||
|
//
|
||||||
|
// Note that it is possible (e.g., tNav--see ResInsight Issue 4966,
|
||||||
|
// https://github.com/OPM/ResInsight/issues/4966) for a case to have
|
||||||
|
// LGRSGONE without having any LGRs or associate LGR data.
|
||||||
this->sect_.push_back(Section{ this->init_ });
|
this->sect_.push_back(Section{ this->init_ });
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
// INIT file has LGRs. Determine number of LGR data sections and
|
||||||
|
// derive sectioning structure for later lookup() operations.
|
||||||
|
const auto* endLGR_kw = "LGRSGONE";
|
||||||
|
const auto nEndLGR =
|
||||||
|
ecl_file_view_get_num_named_kw(this->init_, endLGR_kw);
|
||||||
|
|
||||||
const auto* start_kw = INTEHEAD_KW;
|
const auto* start_kw = INTEHEAD_KW;
|
||||||
const auto* end_kw = endLGR_kw;
|
const auto* end_kw = endLGR_kw;
|
||||||
|
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
Module: opm-flowdiagnostics
|
Module: opm-flowdiagnostics
|
||||||
Description: Open Porous Media Initiative flow diagnostics
|
Description: Open Porous Media Initiative flow diagnostics
|
||||||
Version: 2019.10-pre
|
Version: 2020.04-pre
|
||||||
Label: 2019.10-pre
|
Label: 2020.04-pre
|
||||||
Maintainer: opm@opm-project.org
|
Maintainer: opm@opm-project.org
|
||||||
MaintainerName: OPM community
|
MaintainerName: OPM community
|
||||||
Url: http://opm-project.org
|
Url: http://opm-project.org
|
||||||
|
Loading…
Reference in New Issue
Block a user