diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/packingLimiter.H b/applications/solvers/multiphase/multiphaseEulerFoam/packingLimiter.H deleted file mode 100644 index 3790bf9bb9..0000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/packingLimiter.H +++ /dev/null @@ -1,36 +0,0 @@ - if (packingLimiter) - { - // Calculating exceeding volume fractions - volScalarField alphaEx(max(alpha1 - alphaMax, scalar(0))); - - // Finding neighbouring cells of the whole domain - labelListList neighbour = mesh.cellCells(); - scalarField cellVolumes(mesh.cellVolumes()); - - forAll (alphaEx, celli) - { - // Finding the labels of the neighbouring cells - labelList neighbourCell = neighbour[celli]; - - // Initializing neighbouring cells contribution - scalar neighboursEx = 0.0; - - forAll (neighbourCell, cellj) - { - labelList neighboursNeighbour = neighbour[neighbourCell[cellj]]; - scalar neighboursNeighbourCellVolumes = 0.0; - - forAll (neighboursNeighbour, cellk) - { - neighboursNeighbourCellVolumes += - cellVolumes[neighboursNeighbour[cellk]]; - } - - neighboursEx += - alphaEx[neighbourCell[cellj]]*cellVolumes[celli] - /neighboursNeighbourCellVolumes; - } - - alpha1[celli] += neighboursEx - alphaEx[celli]; - } - } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/readPPProperties.H b/applications/solvers/multiphase/multiphaseEulerFoam/readPPProperties.H deleted file mode 100644 index 3acbf758d0..0000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/readPPProperties.H +++ /dev/null @@ -1,36 +0,0 @@ - IOdictionary ppProperties - ( - IOobject - ( - "ppProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - scalar preAlphaExp - ( - readScalar(ppProperties.lookup("preAlphaExp")) - ); - - scalar alphaMax - ( - readScalar(ppProperties.lookup("alphaMax")) - ); - - scalar expMax - ( - readScalar(ppProperties.lookup("expMax")) - ); - - dimensionedScalar g0 - ( - ppProperties.lookup("g0") - ); - - Switch packingLimiter - ( - ppProperties.lookup("packingLimiter") - ); diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C index 01dee2c5e4..05720e178f 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C @@ -505,7 +505,7 @@ void Foam::cyclicPolyPatch::getCentresAndAnchors } default: { - // Assumes that cyclic is planar. This is also the initial + // Assumes that cyclic is rotational. This is also the initial // condition for patches without faces. // Determine the face with max area on both halves. These diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C index fa333246f8..b8284d438e 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C +++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C @@ -187,7 +187,7 @@ void Foam::cyclicAMIPolyPatch::calcTransforms } scalar areaError = - max(errorPos, errorNeg)/(mag(area1) + ROOTVSMALL); + min(errorPos, errorNeg)/(mag(area1) + ROOTVSMALL); if (areaError > matchTolerance()) {