zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: use vector removeCollinear/normalise in NVDscheme

Browse Source
This commit is contained in:
Mark Olesen
2022-06-10 13:45:12 +02:00
parent 10d8761026
commit 63cfb77fa5
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd
Copyright (C) 2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -94,20 +95,18 @@ Foam::tmp<Foam::edgeScalarField> Foam::faNVDscheme<Type,NVDweight>::weights
forAll(weights, edge)
{
vector d(Zero);
vector d(c[neighbour[edge]] - c[owner[edge]]);
if (edgeFlux_[edge] > 0)
{
d = c[neighbour[edge]] - c[owner[edge]];
d -= n[owner[edge]]*(n[owner[edge]]&d);
d /= mag(d)/mesh.edgeInterpolation::lPN().internalField()[edge];
d.removeCollinear(n[owner[edge]]);
}
else
{
d = c[neighbour[edge]] - c[owner[edge]];
d -= n[neighbour[edge]]*(n[neighbour[edge]]&d);
d /= mag(d)/mesh.edgeInterpolation::lPN().internalField()[edge];
d.removeCollinear(n[neighbour[edge]]);
}
d.normalise();
d *= mesh.edgeInterpolation::lPN().internalField()[edge];
weights[edge] =
this->weight
@ -177,20 +176,18 @@ Foam::tmp<Foam::edgeScalarField> Foam::faNVDscheme<Type,NVDweight>::weights
forAll(pWeights, edgeI)
{
vector d(Zero);
vector d(CN[edgeI] - CP[edgeI]);
if (pEdgeFlux[edgeI] > 0)
{
d = CN[edgeI] - CP[edgeI];
d -= nP[edgeI]*(nP[edgeI]&d);
d /= mag(d)/pLPN[edgeI];
d.removeCollinear(nP[edgeI]);
}
else
{
d = CN[edgeI] - CP[edgeI];
d -= nN[edgeI]*(nN[edgeI]&d);
d /= mag(d)/pLPN[edgeI];
d.removeCollinear(nN[edgeI]);
}
d.normalise();
d *= pLPN[edgeI];
pWeights[edgeI] =
this->weight

12
src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H
View File

@ -46,8 +46,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef faNVDscheme_H
#define faNVDscheme_H
#ifndef Foam_faNVDscheme_H
#define Foam_faNVDscheme_H
#include "edgeInterpolationScheme.H"
@ -66,17 +66,13 @@ class faNVDscheme
public edgeInterpolationScheme<Type>,
public NVDweight
{
protected:
// Protected data
// Protected Data
const edgeScalarField& edgeFlux_;
private:
// Private Member Functions
// Protected Member Functions
//- No copy construct
faNVDscheme(const faNVDscheme&) = delete;