exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Version of donorBasedOverlapFringe that compiles

Browse source 
Note: still not tested
This commit is contained in:
Vuko Vukcevic 2019-04-11 13:20:08 +02:00
parent 6a5117ed51
commit ba114c1b5d
4 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/overset/oversetMesh/Make/files
View file

@ -4,6 +4,7 @@ oversetFringe/oversetFringe/oversetFringe.C
oversetFringe/oversetFringe/newOversetFringe.C
oversetFringe/manualFringe/manualFringe.C
oversetFringe/faceCellsFringe/faceCellsFringe.C
oversetFringe/donorBasedLayeredOverlapFringe/donorBasedLayeredOverlapFringe.C
oversetFringe/overlapFringe/overlapFringe/overlapFringe.C
oversetFringe/overlapFringe/layeredOverlapFringe/layeredOverlapFringe.C
oversetFringe/overlapFringe/adaptiveOverlapFringe/adaptiveOverlapFringe.C

6
src/overset/oversetMesh/Make/options
View file

@ -3,11 +3,13 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lsurfMesh \
-lsampling \
-ldynamicMesh
-ldynamicMesh \
-ldynamicFvMesh

44
src/overset/oversetMesh/oversetFringe/donorBasedLayeredOverlapFringe/donorBasedLayeredOverlap.C → src/overset/oversetMesh/oversetFringe/donorBasedLayeredOverlapFringe/donorBasedLayeredOverlapFringe.C
View file

@ -24,10 +24,13 @@ License
\*---------------------------------------------------------------------------*/
#include "donorBasedLayeredOverlapFringe.H"
#include "oversetMesh.H"
#include "oversetRegion.H"
#include "faceCellsFringe.H"
#include "oversetRegion.H"
#include "addToRunTimeSelectionTable.H"
#include "syncTools.H"
#include "dynamicFvMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -46,7 +49,7 @@ namespace Foam
const Foam::debug::tolerancesSwitch
Foam::donorBasedLayeredOverlapFringe::distTol_
(
"donorBasedLayeredOverlapDistanceTolerance"
"donorBasedLayeredOverlapDistanceTolerance",
0.0
);
@ -97,7 +100,7 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
<< " with faceCells fringe as a connected region fringe."
<< nl
<< "Connected overset region " << region.name()
<< " has " << fringe.type() " fringe type. "
<< " has " << fringe.type() << " fringe type. "
<< nl
<< "Proceed with care!"
<< endl;
@ -109,6 +112,7 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
}
// Sets containing all acceptors and all holes for all connected regions
const polyMesh& mesh = this->mesh();
labelHashSet allAcceptors(0.02*mesh.nCells());
labelHashSet allFringeHoles(0.02*mesh.nCells());
@ -175,9 +179,9 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
}
// Loop through extended donor cells
donorAcceptor::DynamicLabelList& extDonors =
const donorAcceptor::DynamicLabelList& extDonors =
daPair.extendedDonorCells();
donorAcceptor::DynamicPointList& extDonorPoints =
const donorAcceptor::DynamicPointList& extDonorPoints =
daPair.extendedDonorPoints();
forAll (extDonors, i)
@ -210,7 +214,8 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
// User did not specify centre points and the centre point holds
// the sum of all the points. Reduce the data
reduce(centrePoint, sumOp<vector>());
nUniqueDonors = returnReduce(donors.size(), sumOp<label>());
const label nUniqueDonors =
returnReduce(donors.size(), sumOp<label>());
// Calculate the final centre point by finding the arithmetic mean
centrePoint /= nUniqueDonors;
@ -221,7 +226,6 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
labelHashSet acceptors(donors.size()); // Reasonable size estimate
// Get necessary mesh data (from polyMesh/primitiveMesh)
const polyMesh& mesh = this->mesh();
const vectorField& cc = mesh.cellCentres();
const vectorField& fc = mesh.faceCentres();
const cellList& meshCells = mesh.cells();
@ -247,7 +251,7 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
{
// Get the cell index and the cell
const label& cellI = iter.key();
const label& cell = meshCells[cellI];
const cell& cFaces = meshCells[cellI];
// Get cell centre of this donor and calculate distance to
// centre point
@ -382,7 +386,7 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
{
// Get the cell index and the cell
const label& cellI = iter.key();
const label& cell = meshCells[cellI];
const cell& cFaces = meshCells[cellI];
// Note: there's no need to check for the distance here
// because there's always at least one "buffer" layer
@ -496,7 +500,7 @@ void Foam::donorBasedLayeredOverlapFringe::calcAddressing() const
// and holes, which will be deleted when asked for again from the
// iterative procedure (see candidateAcceptors() and fringeHoles())
acceptorsPtr_ = new labelList(0);
holesPtr_ = new labelList(0);
fringeHolesPtr_ = new labelList(0);
}
}
@ -523,7 +527,11 @@ Foam::donorBasedLayeredOverlapFringe::donorBasedLayeredOverlapFringe
connectedRegionIDs_(),
regionCentrePoints_
(
dict.lookupOrDefault<pointList>("regionCentrePoints", pointList(0))
dict.lookupOrDefault<List<point> >
(
"regionCentrePoints",
List<point>(0)
)
),
nLayers_(readLabel(dict.lookup("nLayers"))),
fringeHolesPtr_(nullptr),
@ -543,7 +551,7 @@ Foam::donorBasedLayeredOverlapFringe::donorBasedLayeredOverlapFringe
" const dictionary& dict\n"
")",
dict
) << "Invalid number of layers specified, nLayers = " nLayers_
) << "Invalid number of layers specified, nLayers = " << nLayers_
<< nl
<< "The number should be greater than 0."
<< abort(FatalError);
@ -573,7 +581,7 @@ Foam::donorBasedLayeredOverlapFringe::donorBasedLayeredOverlapFringe
const word& crName = connectedRegionNames[crI];
// Find this region in the list of all regions
const label regionID = findIndex(allRegions, crName);
const label regionID = findIndex(allRegionNames, crName);
if (regionID == -1)
{
@ -732,7 +740,7 @@ bool Foam::donorBasedLayeredOverlapFringe::updateIteration
// Set the flag to true and return
updateSuitableOverlapFlag(true);
return foundSuitablaOverlap();
return foundSuitableOverlap();
}
@ -803,16 +811,14 @@ Foam::donorAcceptorList& Foam::donorBasedLayeredOverlapFringe::finalDonorAccepto
void Foam::donorBasedLayeredOverlapFringe::update() const
{
if (updateFringe_)
{
Info<< "donorBasedLayeredOverlapFringe::update() const" << endl;
Info<< "donorBasedLayeredOverlapFringe::update() const" << endl;
// Clear out
clearAddressing();
}
// Clear out
clearAddressing();
// Set flag to false and clear final donor/acceptors only
deleteDemandDrivenData(finalDonorAcceptorsPtr_);
updateSuitableOverlapFlag(false);
}

5
src/overset/oversetMesh/oversetFringe/donorBasedLayeredOverlapFringe/donorBasedLayeredOverlap.H → src/overset/oversetMesh/oversetFringe/donorBasedLayeredOverlapFringe/donorBasedLayeredOverlapFringe.H
View file

@ -49,7 +49,6 @@ SourceFiles
#define donorBasedLayeredOverlapFringe_H
#include "oversetFringe.H"
#include "pointList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -68,13 +67,13 @@ class donorBasedLayeredOverlapFringe
//- Regions IDs from which the donors will be collected as a starting
// point
labelList connectedRegionsIDs_;
labelList connectedRegionIDs_;
//- Optional list of points representing a rough estimate of the centre
// for each underlying connected region. If these are not provided, the
// centre is calculated as the centre of all donors for a given
// connected region
pointList regionCentrePoints_;
List<point> regionCentrePoints_;
//- How many layers to move away from connected region donors to define
// acceptor (and holes)