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

Merge remote-tracking branch 'Customer-VWG/wp3-directional-refinement' into develop

Browse Source
This commit is contained in:
mattijs
2018-10-04 13:43:33 +01:00
parent 6627515838 8855fdeb40
commit c0460d3015
45 changed files with 3200 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
View File

@ -28,6 +28,7 @@ License
#include "meshTools.H"
#include "mapDistribute.H"
#include "flipOp.H"
#include "profiling.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -100,10 +101,9 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::projectPointsToSurface
pointField& pts
) const
{
if (debug)
{
Info<< "AMI: projecting points to surface" << endl;
}
addProfiling(ami, "AMIInterpolation::projectPointsToSurface");
DebugInfo<< "AMI: projecting points to surface" << endl;
List<pointIndexHit> nearInfo;
@ -120,8 +120,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::projectPointsToSurface
}
else
{
pts[i] = pts[i];
nMiss++;
// Point remains unchanged
++nMiss;
}
}
@ -148,6 +148,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights
const scalar lowWeightTol
)
{
addProfiling(ami, "AMIInterpolation::normaliseWeights");
// Normalise the weights
wghtSum.setSize(wght.size(), 0.0);
label nLowWeight = 0;
@ -233,6 +235,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
autoPtr<mapDistribute>& tgtMap
)
{
addProfiling(ami, "AMIInterpolation::agglomerate");
label sourceCoarseSize =
(
sourceRestrictAddressing.size()
@ -329,7 +333,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
{
oldToNew[coarseElem] = newi;
newSubMap[newi] = coarseElem;
newi++;
++newi;
}
}
newSubMap.setSize(newi);
@ -407,7 +411,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
oldToNew[coarseElem] = newi;
tgtCompactMap[fineElem] = compacti;
newConstructMap[newi] = compacti++;
newi++;
++newi;
}
else
{
@ -843,6 +847,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
const TargetPatch& tgtPatch
)
{
addProfiling(ami, "AMIInterpolation::update");
label srcTotalSize = returnReduce(srcPatch.size(), sumOp<label>());
label tgtTotalSize = returnReduce(tgtPatch.size(), sumOp<label>());
@ -1057,6 +1063,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::append
const TargetPatch& tgtPatch
)
{
addProfiling(ami, "AMIInterpolation::append");
// Create a new interpolation
autoPtr<AMIInterpolation<SourcePatch, TargetPatch>> newPtr
(
@ -1283,6 +1291,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
const UList<Type>& defaultValues
) const
{
addProfiling(ami, "AMIInterpolation::interpolateToTarget");
if (fld.size() != srcAddress_.size())
{
FatalErrorInFunction
@ -1368,6 +1378,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
const UList<Type>& defaultValues
) const
{
addProfiling(ami, "AMIInterpolation::interpolateToSource");
if (fld.size() != tgtAddress_.size())
{
FatalErrorInFunction

13
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
View File

@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "faceAreaWeightAMI.H"
#include "profiling.H"
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
@ -38,6 +39,8 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calcAddressing
label tgtFacei
)
{
addProfiling(ami, "faceAreaWeightAMI::calcAddressing");
// construct weights and addressing
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -123,6 +126,8 @@ bool Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::processSourceFace
List<DynamicList<scalar>>& tgtWght
)
{
addProfiling(ami, "faceAreaWeightAMI::processSourceFace");
if (tgtStartFacei == -1)
{
return false;
@ -197,6 +202,8 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::setNextFaces
bool errorOnNotFound
) const
{
addProfiling(ami, "faceAreaWeightAMI::setNextFaces");
const labelList& srcNbrFaces = this->srcPatch_.faceFaces()[srcFacei];
// initialise tgtFacei
@ -303,6 +310,8 @@ Foam::scalar Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::interArea
const label tgtFacei
) const
{
addProfiling(ami, "faceAreaWeightAMI::interArea");
scalar area = 0;
const pointField& srcPoints = this->srcPatch_.points();
@ -444,6 +453,8 @@ restartUncoveredSourceFace
List<DynamicList<scalar>>& tgtWght
)
{
addProfiling(ami, "faceAreaWeightAMI::restartUncoveredSourceFace");
// Collect all src faces with a low weight
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -581,6 +592,8 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calculate
label tgtFacei
)
{
addProfiling(ami, "faceAreaWeightAMI::calculate");
bool ok =
this->initialise
(