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

Use struct for MULTREGTRecord, match order of variables to usage.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2018-12-10 15:50:30 +01:00
parent e27df951f6
commit 53252e6694
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp
View File

@@ -50,14 +50,11 @@ namespace Opm {
class MULTREGTRecord {
public:
MULTREGTRecord(int src, int target, double trans_mult, int directions, MULTREGT::NNCBehaviourEnum nnc_behaviour, const std::string& region_name);
struct MULTREGTRecord {
int src_value;
int target_value;
int directions;
double trans_mult;
int directions;
MULTREGT::NNCBehaviourEnum nnc_behaviour;
std::string region_name;
};

11
src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
View File

@@ -67,15 +67,6 @@ namespace Opm {
}
MULTREGTRecord::MULTREGTRecord(int src, int target, double trans_mult, int directions, MULTREGT::NNCBehaviourEnum nnc_behaviour, const std::string& region_name) :
src_value(src),
target_value(target),
directions(directions),
trans_mult(trans_mult),
nnc_behaviour(nnc_behaviour),
region_name(region_name)
{}
/*****************************************************************/
/*
@@ -194,7 +185,7 @@ namespace Opm {
for (int src_region : src_regions) {
for (int target_region : target_regions)
m_records.emplace_back(src_region, target_region, trans_mult, directions, nnc_behaviour, region_name);
m_records.push_back({src_region, target_region, trans_mult, directions, nnc_behaviour, region_name});
}
}