Simplify the boundaryCondition() method.

This commit is contained in:
Atgeirr Flø Rasmussen 2022-09-22 09:31:54 +02:00
parent 5e08a9fc12
commit bc13f57e95

View File

@ -2063,39 +2063,25 @@ public:
std::pair<bool, RateVector> boundaryCondition(const unsigned int globalSpaceIdx, const int directionId) std::pair<bool, RateVector> boundaryCondition(const unsigned int globalSpaceIdx, const int directionId)
{ {
if (!nonTrivialBoundaryConditions_ || directionId == -1) { if (!nonTrivialBoundaryConditions_) {
return std::make_pair(false, RateVector(0.0)); return { false, RateVector(0.0) };
} }
const std::vector<bool>* flag = nullptr;
const std::vector<RateVector>* massrate = nullptr;
switch (directionId) { switch (directionId) {
case 0: case 0:
flag = &freebcXMinus_; return { freebcXMinus_[globalSpaceIdx], massratebcXMinus_[globalSpaceIdx] };
massrate = &massratebcXMinus_;
break;
case 1: case 1:
flag = &freebcX_; return { freebcX_[globalSpaceIdx], massratebcX_[globalSpaceIdx] };
massrate = &massratebcX_;
break;
case 2: case 2:
flag = &freebcYMinus_; return { freebcYMinus_[globalSpaceIdx], massratebcYMinus_[globalSpaceIdx] };
massrate = &massratebcYMinus_;
break;
case 3: case 3:
flag = &freebcY_; return { freebcY_[globalSpaceIdx], massratebcY_[globalSpaceIdx] };
massrate = &massratebcY_;
break;
case 4: case 4:
flag = &freebcZMinus_; return { freebcZMinus_[globalSpaceIdx], massratebcZMinus_[globalSpaceIdx] };
massrate = &massratebcZMinus_;
break;
case 5: case 5:
flag = &freebcZ_; return { freebcZ_[globalSpaceIdx], massratebcZ_[globalSpaceIdx] };
massrate = &massratebcZ_; default:
break; return { false, RateVector(0.0) };
} }
const bool free = (*flag)[globalSpaceIdx];
return { free, (*massrate)[globalSpaceIdx] };
} }
private: private: