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

GIT: resolved merge conflict

Browse Source
This commit is contained in:
Andrew Heather
2018-06-13 14:20:18 +01:00
parent 9258b558f4 616b91c06e
commit c909a5df25
148 changed files with 835 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,10 +265,10 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights
{
Info<< indent
<< "AMI: Patch " << patchName
<< " sum(weights) min/max/average = "
<< gMin(wghtSum) << ", "
<< gMax(wghtSum) << ", "
<< gAverage(wghtSum) << endl;
<< " sum(weights)"
<< " min = " << gMin(wghtSum)
<< " max = " << gMax(wghtSum)
<< " average = " << gAverage(wghtSum) << nl;
const label nLow = returnReduce(nLowWeight, sumOp<label>());

2
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
View File

@ -98,7 +98,7 @@ void Foam::cyclicACMIPolyPatch::resetAMI
const_cast<AMIPatchToPatchInterpolation&>(this->AMI());
// Output some stats. AMIInterpolation will have already output the
// average weights ("sum(weights) min/max/average = 1, 1, 1")
// average weights ("sum(weights) min = 1 max = 1 average = 1")
{
const scalarField& wghtsSum = AMI.srcWeightsSum();

20
src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
View File

@ -547,12 +547,12 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
if (nFace)
{
scalarField srcWghtSum(size(), 0);
scalarField srcWghtSum(size(), Zero);
forAll(srcWghtSum, faceI)
{
srcWghtSum[faceI] = sum(AMIPtr_->srcWeights()[faceI]);
}
scalarField tgtWghtSum(neighbPatch().size(), 0);
scalarField tgtWghtSum(neighbPatch().size(), Zero);
forAll(tgtWghtSum, faceI)
{
tgtWghtSum[faceI] = sum(AMIPtr_->tgtWeights()[faceI]);
@ -560,16 +560,16 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
Info<< indent
<< "AMI: Patch " << name()
<< " sum(weights) min/max/average = "
<< gMin(srcWghtSum) << ", "
<< gMax(srcWghtSum) << ", "
<< gAverage(srcWghtSum) << endl;
<< " sum(weights)"
<< " min = " << gMin(srcWghtSum)
<< " max = " << gMax(srcWghtSum)
<< " average = " << gAverage(srcWghtSum) << nl;
Info<< indent
<< "AMI: Patch " << neighbPatch().name()
<< " sum(weights) min/max/average = "
<< gMin(tgtWghtSum) << ", "
<< gMax(tgtWghtSum) << ", "
<< gAverage(tgtWghtSum) << endl;
<< " sum(weights)"
<< " min = " << gMin(tgtWghtSum)
<< " max = " << gMax(tgtWghtSum)
<< " average = " << gAverage(tgtWghtSum) << nl;
}
}
}