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

changed: avoid near-duplicate code

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-01-17 14:03:50 +01:00
parent 821e4386bc
commit cfc9cb3513
1 changed files with 14 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ebos/eclproblem.hh
View File

@ -2932,80 +2932,44 @@ private:
return eclState.fieldProps().get_global_int(prop); return eclState.fieldProps().get_global_int(prop);
} }
void updatePvtnum_() template<class T>
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, "PVTNUM")) if (!has_int_prop(eclState, name))
return; return;
const auto& pvtnumData = get_int_prop(eclState, "PVTNUM"); const auto& numData = get_int_prop(eclState, 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);
pvtnum_.resize(numElems); numbers.resize(numElems);
for (unsigned elemIdx = 0; elemIdx < numElems; ++elemIdx) { for (unsigned elemIdx = 0; elemIdx < numElems; ++elemIdx) {
unsigned cartElemIdx = vanguard.cartesianIndex(elemIdx); unsigned cartElemIdx = vanguard.cartesianIndex(elemIdx);
pvtnum_[elemIdx] = pvtnumData[cartElemIdx] - 1; numbers[elemIdx] = static_cast<T>(std::max(numData[cartElemIdx], 1) - 1);
} }
} }
void updatePvtnum_()
{
updateNum("PVTNUM", pvtnum_);
}
void updateSatnum_() void updateSatnum_()
{ {
const auto& simulator = this->simulator(); updateNum("SATNUM", satnum_);
const auto& eclState = simulator.vanguard().eclState();
if (!has_int_prop(eclState, "SATNUM"))
return;
const auto& satnumData = get_int_prop(eclState, "SATNUM");
const auto& vanguard = simulator.vanguard();
unsigned numElems = vanguard.gridView().size(/*codim=*/0);
satnum_.resize(numElems);
for (unsigned elemIdx = 0; elemIdx < numElems; ++elemIdx) {
unsigned cartElemIdx = vanguard.cartesianIndex(elemIdx);
satnum_[elemIdx] = satnumData[cartElemIdx] - 1;
}
} }
void updateMiscnum_() void updateMiscnum_()
{ {
const auto& simulator = this->simulator(); updateNum("MISCNUM", miscnum_);
const auto& eclState = simulator.vanguard().eclState();
if (!has_int_prop(eclState, "MISCNUM"))
return;
const auto& miscnumData = get_int_prop(eclState, "MISCNUM");
const auto& vanguard = simulator.vanguard();
unsigned numElems = vanguard.gridView().size(/*codim=*/0);
miscnum_.resize(numElems);
for (unsigned elemIdx = 0; elemIdx < numElems; ++elemIdx) {
unsigned cartElemIdx = vanguard.cartesianIndex(elemIdx);
miscnum_[elemIdx] = miscnumData[cartElemIdx] - 1;
}
} }
void updatePlmixnum_() void updatePlmixnum_()
{ {
const auto& simulator = this->simulator(); updateNum("PLMIXNUM", plmixnum_);
const auto& eclState = simulator.vanguard().eclState();
if (!has_int_prop(eclState, "PLMIXNUM"))
return;
const auto& plmixnumData = get_int_prop(eclState, "PLMIXNUM");
const auto& vanguard = simulator.vanguard();
unsigned numElems = vanguard.gridView().size(/*codim=*/0);
plmixnum_.resize(numElems);
for (unsigned elemIdx = 0; elemIdx < numElems; ++elemIdx) {
unsigned cartElemIdx = vanguard.cartesianIndex(elemIdx);
plmixnum_[elemIdx] = plmixnumData[cartElemIdx] - 1;
}
} }
struct PffDofData_ struct PffDofData_