OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1373 from joakim-hove/fp-cache-valid

Browse Source 
Add internal flag to check if all FieldProps values have been set
This commit is contained in:
Joakim Hove
2019-12-23 10:54:58 +01:00
committed by GitHub
parent 5060813c4e ce49db8438
commit 99791032b3
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/opm/parser/eclipse/EclipseState/Grid/FieldProps.hpp
View File

@@ -89,13 +89,14 @@ public:
struct FieldData {
std::vector<T> data;
std::vector<value::status> value_status;
mutable bool all_set;
FieldData() = default;
FieldData(std::size_t active_size) :
data(std::vector<T>(active_size)),
value_status(active_size, value::status::uninitialized)
value_status(active_size, value::status::uninitialized),
all_set(false)
{
}
@@ -105,12 +106,14 @@ public:
}
bool valid() const {
static const std::array<value::status,2> invalid_value = {value::status::uninitialized, value::status::empty_default};
const auto& it = std::find_first_of(this->value_status.begin(), this->value_status.end(), invalid_value.begin(), invalid_value.end());
if (it == this->value_status.end())
if (this->all_set)
return true;
return false;
static const std::array<value::status,2> invalid_value = {value::status::uninitialized, value::status::empty_default};
const auto& it = std::find_first_of(this->value_status.begin(), this->value_status.end(), invalid_value.begin(), invalid_value.end());
this->all_set = (it == this->value_status.end());
return this->all_set;
}
void compress(const std::vector<bool>& active_map) {