OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EqualOrderOperators: cosmetics

Browse Source 
also use MxV instead of loops in WeakOps::Divergence and ResidualOps::Divergence
This commit is contained in:
Arne Morten Kvarving 2023-10-16 08:23:05 +02:00
parent 1d503ac1c8
commit 5be5c5fb1b
1 changed files with 65 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Apps/Common/EqualOrderOperators.C
View File

@ -15,13 +15,15 @@
#include "Vec3.h"
#include "Vec3Oper.h"
namespace {
//! \brief Helper for adding an element matrix to several components.
//! \param[out] EM The element matrix to add to.
//! \param[in] A The scalar element matrix to add.
//! \param[in] cmp Number of components to add matrix to
//! \param[in] nf Number of components in total matrix.
//! \param[in] scmp Index of first component to add matrix to.
static void addComponents(Matrix& EM, const Matrix& A,
void addComponents (Matrix& EM, const Matrix& A,
size_t cmp, size_t nf, size_t scmp)
{
if (cmp == 1 && nf == 1)
@ -36,7 +38,7 @@ static void addComponents(Matrix& EM, const Matrix& A,
//! \brief Helper applying a divergence (1) or a gradient (2) operation
template<int Operation>
static void DivGrad(Matrix& EM, const FiniteElement& fe,
void DivGrad (Matrix& EM, const FiniteElement& fe,
double scale, int basis, int tbasis)
{
size_t nsd = fe.grad(basis).cols();
@ -51,6 +53,8 @@ static void DivGrad(Matrix& EM, const FiniteElement& fe,
}
}
}
void EqualOrderOperators::Weak::Advection (Matrix& EM, const FiniteElement& fe,
const Vec3& AC,
@ -146,19 +150,18 @@ void EqualOrderOperators::Weak::Gradient(Matrix& EM, const FiniteElement& fe,
}
void EqualOrderOperators::Weak::Divergence(Vector& EV, const FiniteElement& fe,
const Vec3& D, double scale, int basis)
void EqualOrderOperators::Weak::Divergence (Vector& EV,
const FiniteElement& fe,
const Vec3& D,
double scale, int basis)
{
for (size_t i = 1; i <= fe.basis(basis).size(); ++i) {
double div=0.0;
for (size_t k = 1; k <= fe.grad(basis).cols(); ++k)
div += D[k-1]*fe.grad(basis)(i,k);
EV(i) += scale*div*fe.detJxW;
}
size_t nsd = fe.grad(basis).cols();
fe.grad(basis).multiply(Vector(D.ptr(),nsd),EV,scale*fe.detJxW,1.0);
}
void EqualOrderOperators::Weak::Gradient(Vector& EV, const FiniteElement& fe,
void EqualOrderOperators::Weak::Gradient (Vector& EV,
const FiniteElement& fe,
double scale, int basis)
{
size_t nsd = fe.grad(basis).cols();
@ -181,7 +184,8 @@ void EqualOrderOperators::Weak::Laplacian(Matrix& EM, const FiniteElement& fe,
for (size_t j = 1; j <= fe.basis(basis).size(); j++)
for (size_t k = 1; k <= cmp; k++)
for (size_t l = 1; l <= cmp; l++)
EM(cmp*(j-1)+k,cmp*(i-1)+l) += scale*fe.grad(basis)(i,k)*fe.grad(basis)(j,l)*fe.detJxW;
EM(cmp*(j-1)+k,cmp*(i-1)+l) += scale * fe.grad(basis)(i,k)
* fe.grad(basis)(j,l) * fe.detJxW;
}
@ -206,7 +210,8 @@ void EqualOrderOperators::Weak::Mass(Matrix& EM, const FiniteElement& fe,
}
void EqualOrderOperators::Weak::Source(Vector& EV, const FiniteElement& fe,
void EqualOrderOperators::Weak::Source (Vector& EV,
const FiniteElement& fe,
double scale, int cmp, int basis)
{
size_t ncmp = EV.size() / fe.basis(basis).size();
@ -231,7 +236,8 @@ void EqualOrderOperators::Weak::Source(Vector& EV, const FiniteElement& fe,
}
void EqualOrderOperators::Residual::Advection(Vector& EV, const FiniteElement& fe,
void EqualOrderOperators::Residual::Advection (Vector& EV,
const FiniteElement& fe,
const Vec3& AC, const Tensor& g,
double scale, int basis)
{
@ -244,10 +250,13 @@ void EqualOrderOperators::Residual::Advection(Vector& EV, const FiniteElement& f
}
void EqualOrderOperators::Residual::Convection(Vector& EV, const FiniteElement& fe,
const Vec3& U, const Tensor& dUdX,
void EqualOrderOperators::Residual::Convection (Vector& EV,
const FiniteElement& fe,
const Vec3& U,
const Tensor& dUdX,
const Vec3& UC, double scale,
WeakOperators::ConvectionForm form, int basis)
WeakOperators::ConvectionForm form,
int basis)
{
size_t cmp = EV.size() / fe.basis(basis).size();
double coef = scale * fe.detJxW;
@ -276,22 +285,20 @@ void EqualOrderOperators::Residual::Convection(Vector& EV, const FiniteElement&
}
void EqualOrderOperators::Residual::Divergence(Vector& EV, const FiniteElement& fe,
void EqualOrderOperators::Residual::Divergence (Vector& EV,
const FiniteElement& fe,
const Tensor& dUdX,
double scale, size_t basis)
{
for (size_t i = 1; i <= fe.basis(basis).size(); ++i) {
double div=0.0;
for (size_t k = 1; k <= fe.grad(basis).cols(); ++k)
div += dUdX(k,k);
EV(i) += scale*div*fe.basis(basis)(i)*fe.detJxW;
}
EV.add(fe.basis(basis),scale*dUdX.trace()*fe.detJxW);
}
void EqualOrderOperators::Residual::Laplacian(Vector& EV, const FiniteElement& fe,
const Vec3& dUdX, double scale, int basis)
void EqualOrderOperators::Residual::Laplacian (Vector& EV,
const FiniteElement& fe,
const Vec3& dUdX,
double scale, int basis)
{
size_t nsd = fe.grad(basis).cols();
fe.grad(basis).multiply(Vector(dUdX.ptr(),nsd), EV, scale*fe.detJxW, 1);
fe.grad(basis).multiply(Vector(dUdX.ptr(),nsd),EV,scale*fe.detJxW,1.0);
}