OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2377 from akva2/use_compressed_numbers

Browse Source 
changed: use compressed field properties setting up numbers
This commit is contained in:
Markus Blatt 2020-03-02 11:32:22 +01:00 committed by GitHub
commit 9faf2979b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ebos/eclproblem.hh
View File

@ -2840,32 +2840,22 @@ private:
} }
} }
static bool has_int_prop(const EclipseState& eclState, const std::string& prop) {
return eclState.fieldProps().has_int(prop);
}
static std::vector<int> get_int_prop(const EclipseState& eclState, const std::string& prop) {
return eclState.fieldProps().get_global_int(prop);
}
template<class T> template<class T>
void updateNum(const std::string& name, std::vector<T>& numbers) void updateNum(const std::string& name, std::vector<T>& numbers)
{ {
const auto& simulator = this->simulator(); const auto& simulator = this->simulator();
const auto& eclState = simulator.vanguard().eclState(); const auto& eclState = simulator.vanguard().eclState();
if (!has_int_prop(eclState, name)) if (!eclState.fieldProps().has_int(name))
return; return;
const auto& numData = get_int_prop(eclState, name); const auto& numData = eclState.fieldProps().get_int(name);
const auto& vanguard = simulator.vanguard(); const auto& vanguard = simulator.vanguard();
unsigned numElems = vanguard.gridView().size(/*codim=*/0); unsigned numElems = vanguard.gridView().size(/*codim=*/0);
numbers.resize(numElems); numbers.resize(numElems);
for (unsigned elemIdx = 0; elemIdx < numElems; ++elemIdx) { for (unsigned elemIdx = 0; elemIdx < numElems; ++elemIdx) {
unsigned cartElemIdx = vanguard.cartesianIndex(elemIdx); numbers[elemIdx] = static_cast<T>(numData[elemIdx]) - 1;
numbers[elemIdx] = static_cast<T>(std::max(numData[cartElemIdx], 1) - 1);
} }
} }