Revert "BUG: snappyHexMesh: attraction distance mapping. Fixes #941."

This reverts commit 708e6509.

Revert "BUG: snappyHexMesh: attraction distance mapping. Fixes #941."
This reverts commit 708e6509.
cbc3953f · mattijs · Andrew Heather · 181e0b75 · cbc3953f · cbc3953f
Commit cbc3953f authored Apr 10, 2019 by mattijs Committed by Andrew Heather Apr 10, 2019
--- a/applications/solvers/multiphase/VoF/alphaEqn.H
+++ b/applications/solvers/multiphase/VoF/alphaEqn.H
@@ -153,33 +153,6 @@

        surfaceScalarField phir(phic*mixture.nHatf());

-DebugVar(phir.oriented());
-DebugVar(phiCN().oriented());
-DebugVar(alpha1.oriented());
-DebugVar(alpha1.oldTime().oriented());
-
-tmp<surfaceScalarField> f1
-(
-    fvc::flux
-    (
-        phiCN(),
-        cnCoeff*alpha1 + (1.0 - cnCoeff)*alpha1.oldTime(),
-        alphaScheme
-    )
-);
-DebugVar(f1().oriented());
-tmp<surfaceScalarField> f2
-(
-    fvc::flux
-    (
-       -fvc::flux(-phir, alpha2, alpharScheme),
-        alpha1,
-        alpharScheme
-    )
-);
-DebugVar(f2().oriented());
-
-
        tmp<surfaceScalarField> talphaPhi1Un
        (
            fvc::flux

--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/eEqn.H
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/eEqn.H
@@ -7,8 +7,6 @@

    pDivU = dimensionedScalar("pDivU", p.dimensions()/dimTime, Zero);

-DebugVar(fvc::interpolate(rho));
-
    if (thermo->pDivU())
    {
        pDivU = (p*fvc::div(rhoPhi/fvc::interpolate(rho)));

--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
 EXE_INC = \
-    -g -O0 \
    -I../VoF \
    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
    -I$(LIB_SRC)/transportModels \

--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -308,7 +308,7 @@ void Foam::snappySnapDriver::calcNearestFace
        (
            labelList(1, zoneSurfi),
            fc,
-            sqr(scalarField(faceSnapDist, ppFaces)),// sqr of attract dist
+            sqr(faceSnapDist),// sqr of attract dist
            hitSurface,
            hitInfo,
            hitRegion,
@@ -384,7 +384,7 @@ void Foam::snappySnapDriver::calcNearestFace
    (
        unzonedSurfaces,
        fc,
-        sqr(scalarField(faceSnapDist, ppFaces)),// sqr of attract dist
+        sqr(faceSnapDist),// sqr of attract dist
        hitSurface,
        hitInfo,
        hitRegion,

--- a/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
@@ -356,13 +356,6 @@ void Foam::searchableSurfacesQueries::findNearest
 {
    // Find nearest. Return -1 or nearest point

-    if (samples.size() != nearestDistSqr.size())
-    {
-        FatalErrorInFunction << "Inconsistent sizes. samples:" << samples.size()
-            << " search-radius:" << nearestDistSqr.size()
-            << exit(FatalError);
-    }
-
    // Initialise
    nearestSurfaces.setSize(samples.size());
    nearestSurfaces = -1;
@@ -414,14 +407,6 @@ void Foam::searchableSurfacesQueries::findNearest
 {
    // Find nearest. Return -1 or nearest point

-    if (samples.size() != nearestDistSqr.size())
-    {
-        FatalErrorInFunction << "Inconsistent sizes. samples:" << samples.size()
-            << " search-radius:" << nearestDistSqr.size()
-            << exit(FatalError);
-    }
-
-
    if (regionIndices.empty())
    {
        findNearest
@@ -485,15 +470,6 @@ void Foam::searchableSurfacesQueries::findNearest
 {
    // Multi-surface findNearest

-
-    if (start.size() != distSqr.size())
-    {
-        FatalErrorInFunction << "Inconsistent sizes. samples:" << start.size()
-            << " search-radius:" << distSqr.size()
-            << exit(FatalError);
-    }
-
-
    vectorField normal;
    List<pointIndexHit> info;


--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
@@ -15,11 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-//DebugSwitches
-//{
-//    fv  2;
-//}
-
 application     sonicFoam;

 startFrom       latestTime;

--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes
@@ -41,7 +41,7 @@ divSchemes

 laplacianSchemes
 {
-    default         Gauss linear corrected; //limited corrected 1;   //0.5;
+    default         Gauss linear limited corrected 0.5;
 }

 interpolationSchemes

--- a/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/cavity/system/controlDict
@@ -23,13 +23,13 @@ startTime       0;

 stopAt          endTime;

-endTime         0.005;
+endTime         0.5;

 deltaT          0.005;

 writeControl    timeStep;

-writeInterval   1;
+writeInterval   20;

 purgeWrite      0;


--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
@@ -53,12 +53,12 @@ snGradSchemes

 oversetInterpolation
 {
-    //method          cellVolumeWeight;
+    method          cellVolumeWeight;

    // Faster but less accurate
-    method              trackingInverseDistance;
-    searchBox           (0 0 0)(0.02 0.01 0.01);
-    searchBoxDivisions  3{(64 64 1)};
+    //method              trackingInverseDistance;
+    //searchBox           (0 0 0)(0.02 0.01 0.01);
+    //searchBoxDivisions  3{(64 64 1)};
 }

 fluxRequired

--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/blockMeshDict
@@ -78,41 +78,17 @@ boundary
            (9 13 12 8)
        );
    }
-    ACMI1_couple
+    couple1
    {
-        type            cyclicACMI;
-        matchTolerance  0.0001;
-        neighbourPatch  ACMI2_couple;
-        nonOverlapPatch ACMI1_blockage;
-        transform       noOrdering;
-        faces
-        (
-            (2 6 5 1)
-        );
-    }
-    ACMI2_couple
-    {
-        type            cyclicACMI;
-        neighbourPatch  ACMI1_couple;
-        nonOverlapPatch ACMI2_blockage;
-        transform       noOrdering;
-        faces
-        (
-            (8 12 15 11)
-        );
-    }
-
-    ACMI1_blockage
-    {
-        type wall;
+        type patch;
        faces
        (
            (2 6 5 1)
        );
    }
-    ACMI2_blockage
+    couple2
    {
-        type wall;
+        type patch;
        faces
        (
            (8 12 15 11)

--- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/alpha.water
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0/alpha.water
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
+|  \\    /   O peration     | Version:  v1812                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,2287 +10,13 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 dimensions      [0 0 0 0 0 0 0];

-
-internalField   nonuniform List<scalar> 
-2268
-(
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0
-0
-0
-0
-0
-0
-0