Skip to content

BUG: heightFunction implementation gives wrong results in parallel #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gkoukou wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −34
Open

BUG: heightFunction implementation gives wrong results in parallel #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 58 additions & 34 deletions ...Forces/surfaceTensionForceModels/surfaceTensionForceModel/heightFunction/heightFunction.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ void Foam::heightFunction::computeColumns
return;
}

scalar avgColVal = 0.5;
DynamicField<scalar > alphaValues(100); // should be big enough avoids resizing

for (label i = HFCol.status[orientation].iterI;i<7;i++) // move four times in both direction
Expand Down Expand Up @@ -132,6 +131,10 @@ void Foam::heightFunction::computeColumns
);
}
}
else
{
return;
}

if (fullColumn(HFCol.status[orientation].avgColVal,columnHeightTol) )
{
Expand Down Expand Up @@ -319,7 +322,6 @@ void Foam::heightFunction::correct()
deltaFunctionModel_->correct();

const fvMesh& mesh = alpha1_.mesh();
const surfaceVectorField& Sf = mesh.Sf();

reconstructionSchemes& surf =
mesh.lookupObjectRef<reconstructionSchemes>("reconstructionScheme");
Expand All @@ -334,8 +336,6 @@ void Foam::heightFunction::correct()

boolList nextToInterface(mesh.nCells(),false);

scalar deltaX = mag(mesh_.delta())().average().value();

volScalarField cellDistField
(
IOobject
Expand Down Expand Up @@ -414,10 +414,22 @@ void Foam::heightFunction::correct()
dimensionedScalar("scalar", dimless, 0),
"calculated" //alpha1.boundaryField().types()
);
label test = twoDim_ ? 2 : 3;
Vector<label> geomDir = mesh_.geometricD();
label dirs = twoDim_ ? 2 : 3;

scalar thickness = 1.0;
if (twoDim_)
{
forAll(geomDir, iDir)
{
if (geomDir[iDir] == -1)
{
thickness = mesh.bounds().span()[iDir];
break;
}
}
}

twoDimStencilMap parallelStencil;
List<List<twoDimFDStencil>> sendStencil(Pstream::nProcs());

Expand All @@ -443,7 +455,6 @@ void Foam::heightFunction::correct()
sortedDirs.reverseSort();
foundHeightField[celli] = 0;

bool success = false;
for (int dirI=0;dirI<dirs;dirI++)
{
label direction = sortedDirs.indices()[dirI];
Expand Down Expand Up @@ -475,8 +486,9 @@ void Foam::heightFunction::correct()
if (cols.foundHeight())
{
foundHeightField[celli] = 1;
scalar deltaX = twoDim_? sqrt(mesh.V()[celli]/thickness) : cbrt(mesh.V()[celli]);
K_[celli] = cols.calcCurvature(deltaX);
success = true;

break;
}

Expand All @@ -489,6 +501,8 @@ void Foam::heightFunction::correct()
);
label procI = globalIdx.whichProcID(cols.status[0].gblIdx);
sendStencil[procI].append(cols);

break;
}
if (!globalIdx.isLocal(cols.status[1].gblIdx))
{
Expand All @@ -499,6 +513,8 @@ void Foam::heightFunction::correct()
);
label procI = globalIdx.whichProcID(cols.status[1].gblIdx);
sendStencil[procI].append(cols);

break;
}

}
Expand Down Expand Up @@ -532,20 +548,23 @@ void Foam::heightFunction::correct()
const label localIdx = globalIdx.toLocal(HFcols.status[0].gblIdx);
HFcols.status[1].gblIdx = -1;

computeColumns
(
HFcols.direction(),
MapAlpha,
localIdx,
HFStencil::orientation::pos,
HFcols
);
getStencilValues(MapAlpha,stencil[localIdx],alphaValues);
HFcols.status[0].avgColVal = HFcols.addColumnHeight(alphaValues);

if
(
HFcols.status[0].avgColVal < 1e-6
|| HFcols.status[0].avgColVal > 1-1e-6
)
if (!fullColumn(HFcols.status[0].avgColVal, 1e-6))
{
// moves straight to nextPos.
computeColumns
(
HFcols.direction(),
MapAlpha,
localIdx,
HFStencil::orientation::pos,
HFcols
);
}

if (fullColumn(HFcols.status[0].avgColVal, 1e-6))
{
label origProc = globalIdx.whichProcID(HFcols.gblcelli());
sendStencil[origProc].append(HFcols);
Expand All @@ -557,20 +576,22 @@ void Foam::heightFunction::correct()
const label localIdx = globalIdx.toLocal(HFcols.status[1].gblIdx);
HFcols.status[0].gblIdx = -1;

computeColumns
(
HFcols.direction(),
MapAlpha,
localIdx,
HFStencil::orientation::neg,
HFcols
);
getStencilValues(MapAlpha,stencil[localIdx],alphaValues);
HFcols.status[1].avgColVal = HFcols.addColumnHeight(alphaValues);

if
(
HFcols.status[0].avgColVal < 1e-6
|| HFcols.status[0].avgColVal > 1-1e-6
)
if (!fullColumn(HFcols.status[1].avgColVal, 1e-6))
{
computeColumns
(
HFcols.direction(),
MapAlpha,
localIdx,
HFStencil::orientation::neg,
HFcols
);
}

if (fullColumn(HFcols.status[1].avgColVal, 1e-6))
{
label origProc = globalIdx.whichProcID(HFcols.gblcelli());
sendStencil[origProc].append(HFcols);
Expand Down Expand Up @@ -614,6 +635,8 @@ void Foam::heightFunction::correct()
{
label celli = globalIdx.toLocal(iter().gblcelli());
foundHeightField[celli] = 1;

scalar deltaX = twoDim_? sqrt(mesh.V()[celli]/thickness) : cbrt(mesh.V()[celli]);
K_[celli] = iter().calcCurvature(deltaX);
}

Expand Down Expand Up @@ -708,7 +731,7 @@ void Foam::heightFunction::correct()
Field < vector> centreField = mapCentres[celli];
forAll(centreField,i)
{
if (centreField[i] != vector::zero)
if (centreField[i] != vector::zero && i > 0)
{
scalar dist = mag(cc-centreField[i]);
if (smallDist > dist)
Expand All @@ -721,6 +744,7 @@ void Foam::heightFunction::correct()
K_[celli] = mapCurv[celli][smallestDistIdx];
}
}
K_.correctBoundaryConditions();

Kf_ = fvc::interpolate(K_);

Expand Down