Merge branch 'integration-interTrackFoam' into 'develop'

Integration inter track foam

See merge request !310

applications/utilities/finiteArea/checkFaMesh/Make/options

@@ -6,4 +6,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteArea \
     -lfiniteVolume \
-    -lmeshTools \
+    -lmeshTools

src/Allwmake

@@ -98,6 +98,8 @@ wmake $targetType waveModels
 wmake $targetType engine
 
 conversion/Allwmake $targetType $*
+
+phaseSystemModels/Allwmake $targetType $*
 functionObjects/Allwmake $targetType $*
 
 wmake $targetType lumpedPointMotion
@@ -109,7 +111,10 @@ wmake $targetType semiPermeableBaffle
 wmake $targetType atmosphericModels
 wmake $targetType optimisation/adjointOptimisation/adjoint
 
-phaseSystemModels/Allwmake $targetType $*
+
+# interfaceTracking libs
+dynamicFaMesh/Allwmake $targetType $*
+
 
 # Needs access to Turbulence
 

src/dynamicFaMesh/Allwmake

+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+
+#------------------------------------------------------------------------------
+
+wmake $targetType interfaceTrackingFvMesh
+
+#------------------------------------------------------------------------------

src/dynamicFaMesh/interfaceTrackingFvMesh/Make/files

+interfaceTrackingFvMesh.C
+freeSurfacePointDisplacement.C
+fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C
+fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.C
+
+functionObjects/pointHistory/pointHistory.C
+functionObjects/writeFreeSurface/writeFreeSurface.C
+
+LIB = $(FOAM_LIBBIN)/libinterfaceTrackingFvMesh

src/dynamicFaMesh/interfaceTrackingFvMesh/Make/options

+EXE_INC = \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/finiteArea/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/fvMotionSolver/lnInclude
+
+
+LIB_LIBS = \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lincompressibleTransportModels \
+    -lfiniteVolume \
+    -lfiniteArea \
+    -lmeshTools \
+    -ldynamicFvMesh \
+    -lfvMotionSolvers \
+    -ldynamicMesh

src/dynamicFaMesh/interfaceTrackingFvMesh/boundaryProcessorFaPatchPoints.H

+// Boundary processor patch points
+{
+    const labelList& curPointEdges = pointEdges[curPoint];
+
+    label patchID = -1;
+    label edgeID = -1;
+
+    for (const label curEdgei : curPointEdges)
+    {
+        if (edgeFaces[curEdgei].size() == 1)
+        {
+            forAll(aMesh().boundary(), patchI)
+            {
+                const labelList& curEdges = aMesh().boundary()[patchI];
+
+                label index = curEdges.find(curEdgei);
+
+                if (index != -1)
+                {
+                    if
+                    (
+                        aMesh().boundary()[patchI].type()
+                     != processorFaPatch::typeName
+                    )
+                    {
+                        patchID = patchI;
+                        edgeID = index;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    if (patchID != -1)
+    {
+        vector mirrorCtrlPoint =
+            patchMirrorPoints[patchID][edgeID];
+
+        lsPoints[curPatchPoint].setSize(lsPoints[curPatchPoint].size() + 1);
+        lsPoints[curPatchPoint][lsPoints[curPatchPoint].size() - 1] =
+            mirrorCtrlPoint;
+    }
+}

src/dynamicFaMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C

+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2019 Zeljko Tukovic, FSB Zagreb.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "interfaceTrackingFvMesh.H"
+#include "primitivePatchInterpolation.H"
+#include "emptyFaPatch.H"
+#include "wedgeFaPatch.H"
+#include "wallFvPatch.H"
+#include "PstreamCombineReduceOps.H"
+#include "coordinateSystem.H"
+#include "unitConversion.H"
+#include "scalarMatrices.H"
+#include "tensor2D.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::tmp<Foam::vectorField>
+Foam::interfaceTrackingFvMesh::pointDisplacement()
+{
+    const pointField& points = aMesh().patch().localPoints();
+    const labelListList& pointFaces = aMesh().patch().pointFaces();
+
+    auto tdisplacement = tmp<vectorField>::New(points.size(), Zero);
+    auto& displacement = tdisplacement.ref();
+
+    // Calculate displacement of internal points
+    const vectorField& pointNormals = aMesh().pointAreaNormals();
+    const edgeList& edges = aMesh().patch().edges();
+    labelList internalPoints = aMesh().internalPoints();
+
+    for (const label curPoint : internalPoints)
+    {
+        const labelList& curPointFaces = pointFaces[curPoint];
+
+        vectorField lsPoints(curPointFaces.size(), Zero);
+
+        for (label i=0; i<curPointFaces.size(); i++)
+        {
+            label curFace = curPointFaces[i];
+
+            lsPoints[i] = controlPoints()[curFace];
+        }
+
+        vectorField pointAndNormal
+        (
+            lsPlanePointAndNormal
+            (
+                lsPoints,
+                points[curPoint],
+                pointNormals[curPoint]
+            )
+        );
+
+        vector& P = pointAndNormal[0];
+        vector& N = pointAndNormal[1];
+
+        displacement[curPoint] =
+            pointsDisplacementDir()[curPoint]
+           *((P - points[curPoint])&N)
+           /(pointsDisplacementDir()[curPoint]&N);
+    }
+
+    // Mirror control points
+    FieldField<Field, vector> patchMirrorPoints(aMesh().boundary().size());
+
+    // Old faMesh points
+    vectorField oldPoints(aMesh().nPoints(), Zero);
+    const labelList& meshPoints = aMesh().patch().meshPoints();
+    forAll(oldPoints, pI)
+    {
+        oldPoints[pI] =
+            mesh().oldPoints()[meshPoints[pI]];
+    }
+
+    forAll(patchMirrorPoints, patchI)
+    {
+        patchMirrorPoints.set
+        (
+            patchI,
+            new vectorField
+            (
+                aMesh().boundary()[patchI].faPatch::size(),
+                Zero
+            )
+        );
+
+        vectorField N
+        (
+            aMesh().boundary()[patchI].ngbPolyPatchFaceNormals()
+        );
+
+        const labelList& eFaces =
+            aMesh().boundary()[patchI].edgeFaces();
+
+        // Correct N according to specified contact angle
+        if (contactAnglePtr_)
+        {
+            label ngbPolyPatchID =
+                aMesh().boundary()[patchI].ngbPolyPatchIndex();
+
+            if (ngbPolyPatchID != -1)
+            {
+                if
+                (
+                    mesh().boundary()[ngbPolyPatchID].type()
+                 == wallFvPatch::typeName
+                )
+                {
+                    // Info<< aMesh().boundary()[patchI].name() << endl;
+
+                    scalar rotAngle = degToRad
+                    (
+                        gAverage
+                        (
+                            90
+                          - contactAnglePtr_->boundaryField()[patchI]
+                        )
+                    );
+
+                    const vectorField& pEdgN =
+                        aMesh().edgeAreaNormals().boundaryField()[patchI];
+
+                    vectorField rotationAxis( N^pEdgN );
+
+                    const edgeList::subList patchEdges =
+                        aMesh().boundary()[patchI].patchSlice(aMesh().edges());
+
+                    forAll(rotationAxis, edgeI)
+                    {
+                        vector e = patchEdges[edgeI].vec(oldPoints);
+                        //  vector e = patchEdges[edgeI].vec(aMesh().points());
+
+                        // Adjust direction
+                        rotationAxis[edgeI] =
+                            e*(e&rotationAxis[edgeI])
+                           /mag((e&rotationAxis[edgeI]));
+                    }
+                    rotationAxis /= mag(rotationAxis) + SMALL;
+
+                    vectorField rotationAxis2 = rotationAxis;
+                    forAll(rotationAxis2, edgeI)
+                    {
+                        rotationAxis2[edgeI] =
+                            (N[edgeI]^facesDisplacementDir()[eFaces[edgeI]]);
+
+                        // Adjust direction
+                        rotationAxis2[edgeI] =
+                            rotationAxis2[edgeI]
+                           *(rotationAxis2[edgeI]&rotationAxis[edgeI])
+                           /(
+                                mag((rotationAxis2[edgeI]&rotationAxis[edgeI]))
+                              + SMALL
+                            );
+                    }
+                    rotationAxis2 /= mag(rotationAxis2) + SMALL;
+
+                    // Rodrigues' rotation formula
+                    N = N*cos(rotAngle)
+                      + rotationAxis*(rotationAxis & N)*(1 - cos(rotAngle))
+                      + (rotationAxis^N)*sin(rotAngle);
+
+                    N /= mag(N) + SMALL;
+
+                    N = (rotationAxis^N);
+
+                    N = (N^rotationAxis2);
+
+                    N /= mag(N) + SMALL;
+
+                    // Info<< N << endl;
+                }
+            }
+        }
+
+        const labelList peFaces =
+            labelList::subList
+            (
+                aMesh().edgeOwner(),
+                aMesh().boundary()[patchI].faPatch::size(),
+                aMesh().boundary()[patchI].start()
+            );
+
+        const labelList& pEdges = aMesh().boundary()[patchI];
+
+        vectorField peCentres(pEdges.size(), Zero);
+        forAll(peCentres, edgeI)
+        {
+            peCentres[edgeI] =
+                edges[pEdges[edgeI]].centre(points);
+        }
+
+        vectorField delta
+        (
+            vectorField(controlPoints(), peFaces)
+          - peCentres
+        );
+
+        // Info<< aMesh().boundary()[patchI].name() << endl;
+        // Info<< vectorField(controlPoints(), peFaces) << endl;
+
+        patchMirrorPoints[patchI] =
+            peCentres + ((I - 2*N*N)&delta);
+
+        // Info<< patchMirrorPoints[patchI] << endl;
+    }
+
+    // Calculate displacement of boundary points
+    labelList boundaryPoints = aMesh().boundaryPoints();
+
+    const labelListList& edgeFaces = aMesh().patch().edgeFaces();
+    const labelListList& pointEdges = aMesh().patch().pointEdges();
+
+    for (const label curPoint : boundaryPoints)
+    {
+        if (motionPointsMask()[curPoint] == 1)
+        {
+            // Calculating mirror points
+            const labelList& curPointEdges = pointEdges[curPoint];
+
+            vectorField mirrorPoints(2, Zero);
+
+            label counter = -1;
+
+            forAll(curPointEdges, edgeI)
+            {
+                label curEdge = curPointEdges[edgeI];
+
+                if(edgeFaces[curEdge].size() == 1)
+                {
+                    label patchID = -1;
+                    label edgeID = -1;
+                    forAll(aMesh().boundary(), patchI)
+                    {
+                        const labelList& pEdges =
+                            aMesh().boundary()[patchI];
+                        label index = pEdges.find(curEdge);
+                        if (index != -1)
+                        {
+                            patchID = patchI;
+                            edgeID = index;
+                            break;
+                        }
+                    }
+
+                    mirrorPoints[++counter] =
+                        patchMirrorPoints[patchID][edgeID];
+                }
+            }
+
+            // Calculating LS plane fit
+            const labelList& curPointFaces = pointFaces[curPoint];
+
+            vectorField lsPoints
+            (
+                curPointFaces.size() + mirrorPoints.size(),
+                Zero
+            );
+
+            counter = -1;
+
+            for (label i=0; i<curPointFaces.size(); i++)
+            {
+                label curFace = curPointFaces[i];
+
+                lsPoints[++counter] = controlPoints()[curFace];
+            }
+
+            for (label i=0; i<mirrorPoints.size(); i++)
+            {
+                lsPoints[++counter] = mirrorPoints[i];
+            }
+
+            vectorField pointAndNormal
+            (
+                lsPlanePointAndNormal
+                (
+                    lsPoints,
+                    points[curPoint],
+                    pointNormals[curPoint]
+                )
+            );
+
+            vector& P = pointAndNormal[0];
+            vector& N = pointAndNormal[1];
+
+            displacement[curPoint] =
+                pointsDisplacementDir()[curPoint]
+               *((P - points[curPoint])&N)
+               /(pointsDisplacementDir()[curPoint]&N);
+        }
+    }
+
+    // Calculate displacement of processor patch points
+    forAll (aMesh().boundary(), patchI)
+    {
+        if
+        (
+            aMesh().boundary()[patchI].type()
+         == processorFaPatch::typeName
+        )
+        {
+            const processorFaPatch& procPatch =
+                refCast<const processorFaPatch>(aMesh().boundary()[patchI]);
+
+            const labelList& patchPointLabels =
+                procPatch.pointLabels();
+
+            FieldField<Field, vector> lsPoints(patchPointLabels.size());
+            forAll(lsPoints, pointI)
+            {
+                lsPoints.set(pointI, new vectorField(0, Zero));
+            }
+
+            const labelList& nonGlobalPatchPoints =
+                procPatch.nonGlobalPatchPoints();
+
+            forAll(nonGlobalPatchPoints, pointI)
+            {
+                label curPatchPoint =
+                    nonGlobalPatchPoints[pointI];
+
+                label curPoint =
+                    patchPointLabels[curPatchPoint];
+
+                const labelList& curPointFaces = pointFaces[curPoint];
+
+                lsPoints[curPatchPoint].setSize(curPointFaces.size());
+
+                forAll(curPointFaces, faceI)
+                {
+                    label curFace = curPointFaces[faceI];
+
+                    lsPoints[curPatchPoint][faceI] = controlPoints()[curFace];
+                }
+
+            #include "boundaryProcessorFaPatchPoints.H"
+            }
+
+            // Parallel data exchange
+            {
+                OPstream toNeighbProc
+                (
+                    Pstream::commsTypes::blocking,
+                    procPatch.neighbProcNo()
+                );
+
+                toNeighbProc << lsPoints;
+            }
+
+            FieldField<Field, vector> ngbLsPoints(patchPointLabels.size());
+            {
+                IPstream fromNeighbProc
+                (
+                    Pstream::commsTypes::blocking,
+                    procPatch.neighbProcNo()
+                );
+
+                fromNeighbProc >> ngbLsPoints;
+            }
+
+            forAll(nonGlobalPatchPoints, pointI)
+            {
+                label curPatchPoint =
+                    nonGlobalPatchPoints[pointI];
+
+                label curPoint =
+                    patchPointLabels[curPatchPoint];
+
+                label curNgbPoint = procPatch.neighbPoints()[curPatchPoint];
+
+                vectorField allLsPoints
+                (
+                    lsPoints[curPatchPoint].size()
+                  + ngbLsPoints[curNgbPoint].size(),
+                    Zero
+                );
+
+                label counter = -1;
+                forAll(lsPoints[curPatchPoint], pointI)
+                {
+                    allLsPoints[++counter] = lsPoints[curPatchPoint][pointI];
+                }
+                forAll(ngbLsPoints[curNgbPoint], pointI)
+                {
+                    allLsPoints[++counter] = ngbLsPoints[curNgbPoint][pointI];
+                }
+
+                vectorField pointAndNormal
+                (
+                    lsPlanePointAndNormal
+                    (
+                        allLsPoints,
+                        points[curPoint],
+                        pointNormals[curPoint]
+                    )
+                );
+
+                vector& P = pointAndNormal[0];
+                vector& N = pointAndNormal[1];
+
+                if (motionPointsMask()[curPoint] != 0)
+                {
+                    displacement[curPoint] =
+                        pointsDisplacementDir()[curPoint]
+                       *((P - points[curPoint])&N)
+                       /(pointsDisplacementDir()[curPoint]&N);
+                }
+            }
+        }
+    }
+
+
+    // Calculate displacement of global processor patch points
+    if (aMesh().globalData().nGlobalPoints() > 0)
+    {
+        const labelList& spLabels =
+            aMesh().globalData().sharedPointLabels();
+
+        const labelList& addr = aMesh().globalData().sharedPointAddr();
+
+        for (label k=0; k<aMesh().globalData().nGlobalPoints(); k++)
+        {
+            List<List<vector> > procLsPoints(Pstream::nProcs());
+
+            label curSharedPointIndex = addr.find(k);
+
+            if (curSharedPointIndex != -1)
+            {
+                label curPoint = spLabels[curSharedPointIndex];
+
+                const labelList& curPointFaces = pointFaces[curPoint];
+
+                procLsPoints[Pstream::myProcNo()] =
+                    List<vector>(curPointFaces.size());
+
+                forAll(curPointFaces, faceI)
+                {
+                    label curFace = curPointFaces[faceI];
+
+                    procLsPoints[Pstream::myProcNo()][faceI] =
+                        controlPoints()[curFace];
+                }
+            }
+
+            Pstream::gatherList(procLsPoints);
+            Pstream::scatterList(procLsPoints);
+
+            if (curSharedPointIndex != -1)
+            {
+                label curPoint = spLabels[curSharedPointIndex];