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

makefhfQPeriodic(): Use less branch'y implementation.

Browse Source
This commit is contained in:
Bård Skaflestad
2012-07-02 19:09:58 +02:00
parent 4c36b397fd
commit 02e715fe14
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
opm/core/transport/SinglePointUpwindTwoPhase.hpp
View File

@@ -306,42 +306,42 @@ namespace Opm {
std::copy(porevol.begin(), porevol.end(), store_.porevol()); std::copy(porevol.begin(), porevol.end(), store_.porevol());
} }
void makefhfQPeriodic( const std::vector<int>& p_faces,const std::vector<int>& hf_faces,
void
makefhfQPeriodic(const std::vector<int>& p_faces ,
const std::vector<int>& hf_faces,
const std::vector<int>& nb_faces) const std::vector<int>& nb_faces)
{ {
assert (! p_faces.empty());
assert (p_faces.size() == hf_faces.size());
assert (hf_faces.size() == nb_faces.size());
std::vector<int> nbhf(hf_faces.size()); std::vector<int> nbhf(hf_faces.size());
for(unsigned int i=0; i<p_faces.size(); ++i){
int nbf = nb_faces[i];
if(f2hf_[2*nbf] == -1){
nbhf[i] = f2hf_[2*nbf+1];
}else{
assert(f2hf_[2*nbf+1]==-1);
nbhf[i] = f2hf_[2*nbf];
}
}
for(unsigned int i=0; i<p_faces.size(); ++i){
int f = p_faces[i]; for (std::vector<int>::size_type i = 0; i < p_faces.size(); ++i) {
int hf = hf_faces[i]; const int nbf = nb_faces[i];
bool changed=false;
if(f2hf_[2*f] == hf){ assert (2*std::vector<int>::size_type(nbf) + 1 < f2hf_.size());
assert(f2hf_[2*f+1]==-1); assert ((f2hf_[2*nbf + 0] < 0) ^ (f2hf_[2*nbf + 1] < 0));
}else{
assert(f2hf_[2*f]==-1); const int p = (f2hf_[2*nbf + 0] < 0) ? 1 : 0; // "Self"
f2hf_[2*f]=nbhf[i]; nbhf[ i ] = f2hf_[2*nbf + p];
changed=true;
} }
if(!changed){
if(f2hf_[2*f+1]== hf){ for (std::vector<int>::size_type i = 0; i < p_faces.size(); ++i) {
assert(f2hf_[2*f]==-1); const int f = p_faces [i];
}else{ const int hf = hf_faces[i];
assert(f2hf_[2*f+1]==-1);
f2hf_[2*f+1]=nbhf[i]; assert (0 <= f);
changed=true; assert (0 <= hf);
} assert (2*std::vector<int>::size_type(f) + 1 < f2hf_.size());
}
assert(changed); assert ((f2hf_[2*f + 0] < 0 ) ^ (f2hf_[2*f + 1] < 0 ));
assert ((f2hf_[2*f + 0] == hf) ^ (f2hf_[2*f + 1] == hf));
const int p = (f2hf_[2*f + 0] == hf) ? 1 : 0; // "Other"
f2hf_[2*f + p] = nbhf[ i ];
} }
} }