Merge pull request #3 from pzimbrod/marangoni-bugfix

include interfaceProperties

Allwclean

@@ -3,6 +3,7 @@ cd "${0%/*}" || exit    # Run from this directory
 #------------------------------------------------------------------------------
 
 wclean libso laserDTRM
+wclean libso interfaceProperties
 wclean libso phasesSystem
 ./WENOEXT/Allwclean
 wclean

Allwmake

@@ -7,6 +7,7 @@ echo "Building external libraries"
 ./WENOEXT/Allwmake
 
 echo "Building application"
+wmake $targetType interfaceProperties
 wmake $targetType laserDTRM
 wmake $targetType phasesSystem
 wmake $targetType

Make/options

@@ -11,7 +11,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I./interfaceProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \

UEqn.H

@@ -27,7 +27,7 @@ if (pimple.momentumPredictor())
             ) * mesh.magSf()
         )
         -
-        fluid.divCapillaryStress()
+        fluid.divCapillaryStress(T)
     );
 
     fvOptions.correct(U);

createFields.H

@@ -166,3 +166,17 @@
 
     Info<< "Creating field kinetic energy K\n" << endl;
     volScalarField K("K", 0.5*magSqr(U));
+
+    Info<< "Creating field divCapillaryStress\n" <<endl;
+    volVectorField divCapillaryStress
+    (
+        IOobject
+        (
+            "divCapillaryStress",
+            runTime.timeName(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        fluid.divCapillaryStress(T)
+    );

interfaceProperties/Make/files

@@ -0,0 +1,11 @@
+interfaceProperties.C
+interfaceCompression/interfaceCompression.C
+
+alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
+
+surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
+surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
+surfaceTensionModels/constant/constantSurfaceTension.C
+surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
+
+LIB = $(FOAM_LIBBIN)/libinterfaceProperties

interfaceProperties/Make/options

@@ -0,0 +1,8 @@
+EXE_INC = \
+    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
+    -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+LIB_LIBS = \
+    -ltwoPhaseMixture \
+    -lfiniteVolume

interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C

@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2019 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+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 "alphaContactAngleTwoPhaseFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "volMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+const Foam::Enum
+<
+    Foam::alphaContactAngleTwoPhaseFvPatchScalarField::limitControls
+>
+Foam::alphaContactAngleTwoPhaseFvPatchScalarField::limitControlNames_
+({
+    { limitControls::lcNone, "none" },
+    { limitControls::lcGradient, "gradient" },
+    { limitControls::lcZeroGradient, "zeroGradient" },
+    { limitControls::lcAlpha, "alpha" },
+});
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
+alphaContactAngleTwoPhaseFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(p, iF),
+    limit_(lcZeroGradient)
+{}
+
+
+Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
+alphaContactAngleTwoPhaseFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedGradientFvPatchScalarField(p, iF),
+    limit_(limitControlNames_.get("limit", dict))
+{
+    if (dict.found("gradient"))
+    {
+        gradient() = scalarField("gradient", dict, p.size());
+        fixedGradientFvPatchScalarField::updateCoeffs();
+        fixedGradientFvPatchScalarField::evaluate();
+    }
+    else
+    {
+        fvPatchField<scalar>::operator=(patchInternalField());
+        gradient() = 0.0;
+    }
+}
+
+
+Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
+alphaContactAngleTwoPhaseFvPatchScalarField
+(
+    const alphaContactAngleTwoPhaseFvPatchScalarField& acpsf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedGradientFvPatchScalarField(acpsf, p, iF, mapper),
+    limit_(acpsf.limit_)
+{}
+
+
+Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
+alphaContactAngleTwoPhaseFvPatchScalarField
+(
+    const alphaContactAngleTwoPhaseFvPatchScalarField& acpsf
+)
+:
+    fixedGradientFvPatchScalarField(acpsf),
+    limit_(acpsf.limit_)
+{}
+
+
+Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
+alphaContactAngleTwoPhaseFvPatchScalarField
+(
+    const alphaContactAngleTwoPhaseFvPatchScalarField& acpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(acpsf, iF),
+    limit_(acpsf.limit_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (limit_ == lcGradient)
+    {
+        gradient() =
+        patch().deltaCoeffs()
+       *(
+           max(min
+           (
+               *this + gradient()/patch().deltaCoeffs(),
+               scalar(1)), scalar(0)
+           ) - *this
+       );
+    }
+    else if (limit_ == lcZeroGradient)
+    {
+        gradient() = 0.0;
+    }
+
+    fixedGradientFvPatchScalarField::evaluate();
+
+    if (limit_ == lcAlpha)
+    {
+        scalarField::operator=(max(min(*this, scalar(1)), scalar(0)));
+    }
+}
+
+
+void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fixedGradientFvPatchScalarField::write(os);
+    os.writeEntry("limit", limitControlNames_[limit_]);
+}
+
+
+// ************************************************************************* //