update
This commit is contained in:
parent
8ec63a167c
commit
a3ad89e168
4 changed files with 119 additions and 52 deletions
|
@ -38,6 +38,8 @@ Description
|
|||
#include "PstreamCombineReduceOps.H"
|
||||
#include "coordinateSystem.H"
|
||||
#include "scalarMatrices.H"
|
||||
#include "processorFaPatchFields.H"
|
||||
#include "emptyFaPatchFields.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
|
@ -261,6 +263,7 @@ void faMesh::calcMagLe() const
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void faMesh::calcAreaCentres() const
|
||||
{
|
||||
if (debug)
|
||||
|
@ -303,8 +306,6 @@ void faMesh::calcAreaCentres() const
|
|||
}
|
||||
|
||||
forAll (boundary(), patchI)
|
||||
{
|
||||
if (!boundary()[patchI].coupled())
|
||||
{
|
||||
const edgeList::subList patchEdges =
|
||||
boundary()[patchI].patchSlice(edges());
|
||||
|
@ -315,9 +316,21 @@ void faMesh::calcAreaCentres() const
|
|||
patchEdges[edgeI].centre(localPoints);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
centres.correctBoundaryConditions();
|
||||
forAll(centres.boundaryField(), patchI)
|
||||
{
|
||||
if
|
||||
(
|
||||
isA<processorFaPatchVectorField>
|
||||
(
|
||||
centres.boundaryField()[patchI]
|
||||
)
|
||||
)
|
||||
{
|
||||
centres.boundaryField()[patchI].initEvaluate();
|
||||
centres.boundaryField()[patchI].evaluate();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -468,15 +481,25 @@ void faMesh::calcFaceAreaNormals() const
|
|||
}
|
||||
|
||||
forAll (boundary(), patchI)
|
||||
{
|
||||
if (!boundary()[patchI].coupled())
|
||||
{
|
||||
faceAreaNormals.boundaryField()[patchI] =
|
||||
edgeAreaNormals().boundaryField()[patchI];
|
||||
}
|
||||
}
|
||||
|
||||
faceAreaNormals.correctBoundaryConditions();
|
||||
forAll(faceAreaNormals.boundaryField(), patchI)
|
||||
{
|
||||
if
|
||||
(
|
||||
isA<processorFaPatchVectorField>
|
||||
(
|
||||
faceAreaNormals.boundaryField()[patchI]
|
||||
)
|
||||
)
|
||||
{
|
||||
faceAreaNormals.boundaryField()[patchI].initEvaluate();
|
||||
faceAreaNormals.boundaryField()[patchI].evaluate();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -1159,31 +1182,6 @@ void faMesh::calcPointAreaNormals() const
|
|||
}
|
||||
}
|
||||
|
||||
// Boundary points correction
|
||||
forAll (boundary(), patchI)
|
||||
{
|
||||
if (correctPatchPointNormals(patchI) && !boundary()[patchI].coupled())
|
||||
{
|
||||
if (boundary()[patchI].ngbPolyPatchIndex() == -1)
|
||||
{
|
||||
FatalErrorIn
|
||||
(
|
||||
"void faMesh::calcPointAreaNormals const"
|
||||
) << "Neighbour polyPatch index is not defined "
|
||||
<< "for faPatch " << boundary()[patchI].name()
|
||||
<< abort(FatalError);
|
||||
}
|
||||
|
||||
labelList patchPoints = boundary()[patchI].pointLabels();
|
||||
vectorField N = boundary()[patchI].ngbPolyPatchPointNormals();
|
||||
|
||||
forAll (patchPoints, pointI)
|
||||
{
|
||||
result[patchPoints[pointI]]
|
||||
-= N[pointI]*(N[pointI]&result[patchPoints[pointI]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Processor patch points correction
|
||||
forAll (boundary(), patchI)
|
||||
|
@ -1249,7 +1247,6 @@ void faMesh::calcPointAreaNormals() const
|
|||
|
||||
|
||||
// Correct global points
|
||||
|
||||
if (globalData().nGlobalPoints() > 0)
|
||||
{
|
||||
const labelList& spLabels =
|
||||
|
@ -1288,6 +1285,34 @@ void faMesh::calcPointAreaNormals() const
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// Boundary points correction
|
||||
forAll (boundary(), patchI)
|
||||
{
|
||||
if (correctPatchPointNormals(patchI) && !boundary()[patchI].coupled())
|
||||
{
|
||||
if (boundary()[patchI].ngbPolyPatchIndex() == -1)
|
||||
{
|
||||
FatalErrorIn
|
||||
(
|
||||
"void faMesh::calcPointAreaNormals const"
|
||||
) << "Neighbour polyPatch index is not defined "
|
||||
<< "for faPatch " << boundary()[patchI].name()
|
||||
<< abort(FatalError);
|
||||
}
|
||||
|
||||
labelList patchPoints = boundary()[patchI].pointLabels();
|
||||
|
||||
vectorField N = boundary()[patchI].ngbPolyPatchPointNormals();
|
||||
|
||||
forAll (patchPoints, pointI)
|
||||
{
|
||||
result[patchPoints[pointI]]
|
||||
-= N[pointI]*(N[pointI]&result[patchPoints[pointI]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
result /= mag(result);
|
||||
}
|
||||
|
||||
|
|
|
@ -50,6 +50,19 @@ void symmetryFaPatch::makeCorrVecs(vectorField& cv) const
|
|||
|
||||
// * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
// Construct from components
|
||||
symmetryFaPatch::symmetryFaPatch
|
||||
(
|
||||
const word& name,
|
||||
const labelList& edgeLabels,
|
||||
const label index,
|
||||
const faBoundaryMesh& bm,
|
||||
const label ngbPolyPatchIndex
|
||||
)
|
||||
:
|
||||
faPatch(name, edgeLabels, index, bm, ngbPolyPatchIndex)
|
||||
{}
|
||||
|
||||
//- Construct from dictionary
|
||||
symmetryFaPatch::symmetryFaPatch
|
||||
(
|
||||
|
|
|
@ -69,6 +69,16 @@ public:
|
|||
|
||||
// Constructors
|
||||
|
||||
//- Construct from components
|
||||
symmetryFaPatch
|
||||
(
|
||||
const word& name,
|
||||
const labelList& edgeLabels,
|
||||
const label index,
|
||||
const faBoundaryMesh& bm,
|
||||
const label ngbPolyPatchIndex
|
||||
);
|
||||
|
||||
//- Construct from dictionary
|
||||
symmetryFaPatch
|
||||
(
|
||||
|
@ -78,6 +88,25 @@ public:
|
|||
const faBoundaryMesh& bm
|
||||
);
|
||||
|
||||
//- Construct and return a clone, resetting the edge list
|
||||
// and boundary mesh
|
||||
virtual autoPtr<faPatch> clone
|
||||
(
|
||||
const faBoundaryMesh& bm,
|
||||
const labelList& edgeLabels,
|
||||
const label index,
|
||||
const label ngbPolyPatchIndex
|
||||
) const
|
||||
{
|
||||
return autoPtr<faPatch>
|
||||
(
|
||||
new symmetryFaPatch
|
||||
(
|
||||
name(), edgeLabels, index, bm, ngbPolyPatchIndex
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~symmetryFaPatch()
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: 1.6 |
|
||||
| \\ / A nd | Web: www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
| \\ / O peration | Version: 1.5-dev |
|
||||
| \\ / A nd | Revision: 1842 |
|
||||
| \\/ M anipulation | Web: http://www.OpenFOAM.org |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
|
|
Reference in a new issue