Merge pull request #5447 from blattms/feature/hide-comp-by-dune

[refactor] Use DUNE's dot product to hide code complexity.
This commit is contained in:
Bård Skaflestad 2024-06-27 15:28:55 +02:00 committed by GitHub
commit ce7d415e4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1293,12 +1293,7 @@ computeHalfTrans_(Scalar& halfTrans,
unsigned dimIdx = faceIdx/2;
assert(dimIdx < dimWorld);
halfTrans = perm[dimIdx][dimIdx];
Scalar val = 0;
for (unsigned i = 0; i < areaNormal.size(); ++i)
val += areaNormal[i]*distance[i];
halfTrans *= std::abs(val);
halfTrans *= std::abs(Dune::dot(areaNormal, distance));
halfTrans /= distance.two_norm2();
}
@ -1310,11 +1305,7 @@ computeHalfDiffusivity_(Scalar& halfDiff,
const Scalar& poro) const
{
halfDiff = poro;
Scalar val = 0;
for (unsigned i = 0; i < areaNormal.size(); ++i)
val += areaNormal[i]*distance[i];
halfDiff *= std::abs(val);
halfDiff *= std::abs(Dune::dot(areaNormal, distance));
halfDiff /= distance.two_norm2();
}