mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
This commit is contained in:
andy
@ -39,8 +39,6 @@ Description
|
||||
+ massSource.SuTot()
|
||||
);
|
||||
|
||||
rhoEqn.relax();
|
||||
|
||||
rhoEqn.solve();
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -453,6 +453,7 @@ void Foam::createShellMesh::setRefinement
|
||||
label region0 = pointRegions_[eFaces[0]][fp0];
|
||||
label region1 = pointRegions_[eFaces[0]][fp1];
|
||||
|
||||
// Pick up points with correct normal
|
||||
if (layerI == 0)
|
||||
{
|
||||
newF[0] = f[fp0];
|
||||
@ -468,6 +469,22 @@ void Foam::createShellMesh::setRefinement
|
||||
newF[3] = addedPoints[nLayers*region0+layerI];
|
||||
}
|
||||
|
||||
// Optionally rotate so e[0] is always 0th vertex. Note that
|
||||
// this normally is automatically done by coupled face ordering
|
||||
// but with NOORDERING we have to do it ourselves.
|
||||
if (f[fp0] != e[0])
|
||||
{
|
||||
// rotate one back to get newF[1] (originating from e[0])
|
||||
// into newF[0]
|
||||
label v0 = newF[0];
|
||||
for (label i = 0; i < newF.size()-1; i++)
|
||||
{
|
||||
newF[i] = newF[newF.fcIndex(i)];
|
||||
}
|
||||
newF.last() = v0;
|
||||
}
|
||||
|
||||
|
||||
label minCellI = addedCells[nLayers*eFaces[0]+layerI];
|
||||
label maxCellI;
|
||||
label patchI;
|
||||
@ -569,6 +586,21 @@ void Foam::createShellMesh::setRefinement
|
||||
newF[3] = addedPoints[nLayers*region0+layerI];
|
||||
}
|
||||
|
||||
|
||||
// Optionally rotate so e[0] is always 0th vertex. Note that
|
||||
// this normally is automatically done by coupled face
|
||||
// ordering but with NOORDERING we have to do it ourselves.
|
||||
if (f[fp0] != e[0])
|
||||
{
|
||||
// rotate one back to get newF[1] (originating
|
||||
// from e[0]) into newF[0].
|
||||
label v0 = newF[0];
|
||||
for (label i = 0; i < newF.size()-1; i++)
|
||||
{
|
||||
newF[i] = newF[newF.fcIndex(i)];
|
||||
}
|
||||
newF.last() = v0;
|
||||
}
|
||||
////if (ePatches.size() == 0)
|
||||
//{
|
||||
// Pout<< "Adding from MULTI face:"
|
||||
|
||||
@ -492,6 +492,7 @@ DebugSwitches
|
||||
geomCellLooper 0;
|
||||
geometricSurfacePatch 0;
|
||||
global 0;
|
||||
globalIndexAndTransform 0;
|
||||
globalMeshData 0;
|
||||
globalPoints 0;
|
||||
gnuplot 0;
|
||||
|
||||
@ -2282,7 +2282,7 @@ void Foam::indexedOctree<Type>::writeOBJ
|
||||
{
|
||||
subBb = nodes_[getNode(index)].bb_;
|
||||
}
|
||||
else if (isContent(index))
|
||||
else if (isContent(index) || isEmpty(index))
|
||||
{
|
||||
subBb = nodes_[nodeI].bb_.subBbox(octant);
|
||||
}
|
||||
@ -2290,17 +2290,21 @@ void Foam::indexedOctree<Type>::writeOBJ
|
||||
Pout<< "dumpContentNode : writing node:" << nodeI << " octant:" << octant
|
||||
<< " to " << str.name() << endl;
|
||||
|
||||
label vertI = 0;
|
||||
|
||||
// Dump bounding box
|
||||
pointField bbPoints(subBb.points());
|
||||
|
||||
label pointVertI = vertI;
|
||||
forAll(bbPoints, i)
|
||||
{
|
||||
const point& pt = bbPoints[i];
|
||||
|
||||
str<< "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
|
||||
}
|
||||
|
||||
forAll(treeBoundBox::edges, i)
|
||||
{
|
||||
const edge& e = treeBoundBox::edges[i];
|
||||
|
||||
str<< "l " << e[0]+pointVertI+1 << ' ' << e[1]+pointVertI+1 << nl;
|
||||
str<< "l " << e[0] + 1 << ' ' << e[1] + 1 << nl;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2852,6 +2856,11 @@ void Foam::indexedOctree<Type>::print
|
||||
{
|
||||
const labelList& indices = contents_[getContent(index)];
|
||||
|
||||
if (debug)
|
||||
{
|
||||
writeOBJ(nodeI, octant);
|
||||
}
|
||||
|
||||
os << "octant:" << octant
|
||||
<< " content: n:" << indices.size()
|
||||
<< " bb:" << subBb;
|
||||
@ -2868,6 +2877,11 @@ void Foam::indexedOctree<Type>::print
|
||||
}
|
||||
else
|
||||
{
|
||||
if (debug)
|
||||
{
|
||||
writeOBJ(nodeI, octant);
|
||||
}
|
||||
|
||||
os << "octant:" << octant << " empty:" << subBb << endl;
|
||||
}
|
||||
}
|
||||
|
||||
@ -499,7 +499,7 @@ Foam::point Foam::face::centre(const pointField& points) const
|
||||
const label nPoints = size();
|
||||
|
||||
// If the face is a triangle, do a direct calculation
|
||||
if (nPoints)
|
||||
if (nPoints == 3)
|
||||
{
|
||||
return
|
||||
(1.0/3.0)
|
||||
|
||||
@ -24,11 +24,12 @@ License
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "globalIndexAndTransform.H"
|
||||
#include "coupledPolyPatch.H"
|
||||
#include "cyclicPolyPatch.H"
|
||||
|
||||
// * * * * * * * * * * * * Private Static Data Members * * * * * * * * * * * //
|
||||
|
||||
defineTypeNameAndDebug(Foam::globalIndexAndTransform, 0);
|
||||
|
||||
const Foam::label Foam::globalIndexAndTransform::base_ = 32;
|
||||
|
||||
|
||||
@ -478,6 +479,41 @@ Foam::globalIndexAndTransform::globalIndexAndTransform
|
||||
determineTransformPermutations();
|
||||
|
||||
determinePatchTransformSign();
|
||||
|
||||
if (debug && transforms_.size() > 1)
|
||||
{
|
||||
Info<< "Determined global transforms :" << endl;
|
||||
Info<< "\t\ttranslation\trotation" << endl;
|
||||
forAll(transforms_, i)
|
||||
{
|
||||
Info<< '\t' << i << '\t';
|
||||
if (transforms_[i].hasR())
|
||||
{
|
||||
Info<< transforms_[i].t() << '\t' << transforms_[i].R();
|
||||
}
|
||||
else
|
||||
{
|
||||
Info<< transforms_[i].t() << '\t' << "---";
|
||||
}
|
||||
Info<< endl;
|
||||
}
|
||||
Info<< endl;
|
||||
|
||||
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
|
||||
|
||||
Info<< "\tpatch\ttransform\tsign" << endl;
|
||||
forAll(patchTransformSign_, patchI)
|
||||
{
|
||||
if (patchTransformSign_[patchI].first() != -1)
|
||||
{
|
||||
Info<< '\t' << patches[patchI].name()
|
||||
<< '\t' << patchTransformSign_[patchI].first()
|
||||
<< '\t' << patchTransformSign_[patchI].second()
|
||||
<< endl;
|
||||
}
|
||||
}
|
||||
Info<< endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -164,6 +164,10 @@ public:
|
||||
friend class globalPoints;
|
||||
|
||||
|
||||
// Declare name of the class and its debug switch
|
||||
ClassName("globalIndexAndTransform");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from components
|
||||
|
||||
@ -344,6 +344,11 @@ public:
|
||||
|
||||
// Access
|
||||
|
||||
const polyMesh& mesh() const
|
||||
{
|
||||
return mesh_;
|
||||
}
|
||||
|
||||
const labelIOList& cellLevel() const
|
||||
{
|
||||
return cellLevel_;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -690,9 +690,9 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
|
||||
// Remove unreferenced history.
|
||||
compact();
|
||||
|
||||
Pout<< nl << "--BEFORE:" << endl;
|
||||
writeDebug();
|
||||
Pout<< "---------" << nl << endl;
|
||||
//Pout<< nl << "--BEFORE:" << endl;
|
||||
//writeDebug();
|
||||
//Pout<< "---------" << nl << endl;
|
||||
|
||||
|
||||
// Distribution is only partially functional.
|
||||
@ -746,18 +746,18 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
|
||||
}
|
||||
}
|
||||
|
||||
Pout<< "refinementHistory::distribute :"
|
||||
<< " splitCellProc:" << splitCellProc << endl;
|
||||
|
||||
Pout<< "refinementHistory::distribute :"
|
||||
<< " splitCellNum:" << splitCellNum << endl;
|
||||
//Pout<< "refinementHistory::distribute :"
|
||||
// << " splitCellProc:" << splitCellProc << endl;
|
||||
//
|
||||
//Pout<< "refinementHistory::distribute :"
|
||||
// << " splitCellNum:" << splitCellNum << endl;
|
||||
|
||||
|
||||
// Create subsetted refinement tree consisting of all parents that
|
||||
// move in their whole to other processor.
|
||||
for (label procI = 0; procI < Pstream::nProcs(); procI++)
|
||||
{
|
||||
Pout<< "-- Subetting for processor " << procI << endl;
|
||||
//Pout<< "-- Subetting for processor " << procI << endl;
|
||||
|
||||
// From uncompacted to compacted splitCells.
|
||||
labelList oldToNew(splitCells_.size(), -1);
|
||||
@ -781,10 +781,10 @@ Pout<< "refinementHistory::distribute :"
|
||||
oldToNew[index] = newSplitCells.size();
|
||||
newSplitCells.append(splitCells_[index]);
|
||||
|
||||
Pout<< "Added oldCell " << index
|
||||
<< " info " << newSplitCells.last()
|
||||
<< " at position " << newSplitCells.size()-1
|
||||
<< endl;
|
||||
//Pout<< "Added oldCell " << index
|
||||
// << " info " << newSplitCells.last()
|
||||
// << " at position " << newSplitCells.size()-1
|
||||
// << endl;
|
||||
}
|
||||
}
|
||||
|
||||
@ -797,9 +797,9 @@ Pout<< "refinementHistory::distribute :"
|
||||
{
|
||||
label parent = splitCells_[index].parent_;
|
||||
|
||||
Pout<< "Adding refined cell " << cellI
|
||||
<< " since moves to "
|
||||
<< procI << " old parent:" << parent << endl;
|
||||
//Pout<< "Adding refined cell " << cellI
|
||||
// << " since moves to "
|
||||
// << procI << " old parent:" << parent << endl;
|
||||
|
||||
// Create new splitCell with parent
|
||||
oldToNew[index] = newSplitCells.size();
|
||||
@ -891,8 +891,8 @@ Pout<< "refinementHistory::distribute :"
|
||||
// renumbering can be done here.
|
||||
label offset = splitCells_.size();
|
||||
|
||||
Pout<< "**Renumbering data from proc " << procI << " with offset "
|
||||
<< offset << endl;
|
||||
//Pout<< "**Renumbering data from proc " << procI << " with offset "
|
||||
// << offset << endl;
|
||||
|
||||
forAll(newSplitCells, index)
|
||||
{
|
||||
@ -929,9 +929,9 @@ Pout<< "refinementHistory::distribute :"
|
||||
}
|
||||
splitCells_.shrink();
|
||||
|
||||
Pout<< nl << "--AFTER:" << endl;
|
||||
writeDebug();
|
||||
Pout<< "---------" << nl << endl;
|
||||
//Pout<< nl << "--AFTER:" << endl;
|
||||
//writeDebug();
|
||||
//Pout<< "---------" << nl << endl;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -204,8 +204,8 @@ $(interpolation)/interpolationCellPoint/makeInterpolationCellPoint.C
|
||||
$(interpolation)/interpolationCellPointFace/makeInterpolationCellPointFace.C
|
||||
$(interpolation)/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
|
||||
$(interpolation)/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
|
||||
$(interpolation)/interpolationPoint/pointMVCWeight.C
|
||||
$(interpolation)/interpolationPoint/makeInterpolationPoint.C
|
||||
$(interpolation)/interpolationPointMVC/pointMVCWeight.C
|
||||
$(interpolation)/interpolationPointMVC/makeInterpolationPointMVC.C
|
||||
|
||||
volPointInterpolation = interpolation/volPointInterpolation
|
||||
$(volPointInterpolation)/volPointInterpolation.C
|
||||
|
||||
@ -42,16 +42,6 @@ SourceFiles
|
||||
fvMesh.C
|
||||
fvMeshGeometry.C
|
||||
|
||||
See Also
|
||||
hmm
|
||||
|
||||
Usage
|
||||
oeuoeuoeu
|
||||
|
||||
ToDo
|
||||
oeuoeuoeu
|
||||
oeueouoeu
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef fvMesh_H
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -23,13 +23,13 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "interpolationPoint.H"
|
||||
#include "interpolationPointMVC.H"
|
||||
#include "volPointInterpolation.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
|
||||
|
||||
template<class Type>
|
||||
Foam::interpolationPoint<Type>::interpolationPoint
|
||||
Foam::interpolationPointMVC<Type>::interpolationPointMVC
|
||||
(
|
||||
const GeometricField<Type, fvPatchField, volMesh>& psi
|
||||
)
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -22,7 +22,7 @@ License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Class
|
||||
Foam::interpolationPoint
|
||||
Foam::interpolationPointMVC
|
||||
|
||||
Description
|
||||
Given cell centre values interpolates to vertices and uses these to
|
||||
@ -30,8 +30,8 @@ Description
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef interpolationPoint_H
|
||||
#define interpolationPoint_H
|
||||
#ifndef interpolationPointMVC_H
|
||||
#define interpolationPointMVC_H
|
||||
|
||||
#include "interpolation.H"
|
||||
#include "pointMVCWeight.H"
|
||||
@ -42,11 +42,11 @@ namespace Foam
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class interpolationPoint Declaration
|
||||
Class interpolationPointMVC Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
template<class Type>
|
||||
class interpolationPoint
|
||||
class interpolationPointMVC
|
||||
:
|
||||
public interpolation<Type>
|
||||
{
|
||||
@ -57,16 +57,17 @@ protected:
|
||||
//- Interpolated volfield
|
||||
const GeometricField<Type, pointPatchField, pointMesh> psip_;
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("point");
|
||||
TypeName("pointMVC");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from components
|
||||
interpolationPoint
|
||||
interpolationPointMVC
|
||||
(
|
||||
const GeometricField<Type, fvPatchField, volMesh>& psi
|
||||
);
|
||||
@ -93,12 +94,12 @@ public:
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#include "interpolationPointI.H"
|
||||
#include "interpolationPointMVCI.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#ifdef NoRepository
|
||||
# include "interpolationPoint.C"
|
||||
# include "interpolationPointMVC.C"
|
||||
#endif
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -26,7 +26,7 @@ License
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
template<class Type>
|
||||
inline Type Foam::interpolationPoint<Type>::interpolate
|
||||
inline Type Foam::interpolationPointMVC<Type>::interpolate
|
||||
(
|
||||
const pointMVCWeight& cpw
|
||||
) const
|
||||
@ -36,7 +36,7 @@ inline Type Foam::interpolationPoint<Type>::interpolate
|
||||
|
||||
|
||||
template<class Type>
|
||||
inline Type Foam::interpolationPoint<Type>::interpolate
|
||||
inline Type Foam::interpolationPointMVC<Type>::interpolate
|
||||
(
|
||||
const vector& position,
|
||||
const label cellI,
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -23,13 +23,13 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "interpolationPoint.H"
|
||||
#include "interpolationPointMVC.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
makeInterpolation(interpolationPoint);
|
||||
makeInterpolation(interpolationPointMVC);
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -56,7 +56,7 @@ void Foam::pointMVCWeight::calcWeights
|
||||
forAll(f, j)
|
||||
{
|
||||
label jPlus1 = f.fcIndex(j);
|
||||
scalar l = mag(u[j]-u[jPlus1]);
|
||||
scalar l = mag(u[j] - u[jPlus1]);
|
||||
theta[j] = 2.0*Foam::asin(l/2.0);
|
||||
}
|
||||
|
||||
@ -68,7 +68,7 @@ void Foam::pointMVCWeight::calcWeights
|
||||
weights[pid] =
|
||||
1.0
|
||||
/ dist[pid]
|
||||
* (Foam::tan(theta[jMin1]/2.0)+Foam::tan(theta[j]/2.0));
|
||||
* (Foam::tan(theta[jMin1]/2.0) + Foam::tan(theta[j]/2.0));
|
||||
sumWeight += weights[pid];
|
||||
}
|
||||
|
||||
@ -132,11 +132,10 @@ void Foam::pointMVCWeight::calcWeights
|
||||
//Pout<< " uj:" << u[j] << " ujPlus1:" << u[jPlus1]
|
||||
// << " temp:" << temp << endl;
|
||||
|
||||
scalar l = mag(u[j]-u[jPlus1]);
|
||||
scalar l = min(mag(u[j] - u[jPlus1]), 2.0);
|
||||
scalar angle = 2.0*Foam::asin(l/2.0);
|
||||
|
||||
//Pout<< " j:" << j << " l:" << l
|
||||
// << " angle:" << angle << endl;
|
||||
//Pout<< " j:" << j << " l:" << l << " angle:" << angle << endl;
|
||||
|
||||
v += 0.5*angle*temp;
|
||||
}
|
||||
@ -145,14 +144,14 @@ void Foam::pointMVCWeight::calcWeights
|
||||
v /= vNorm;
|
||||
|
||||
// Make sure v points towards the polygon
|
||||
//if (((v&u[0]) < 0) != (mesh.faceOwner()[faceI] != cellIndex_))
|
||||
//{
|
||||
// FatalErrorIn("pointMVCWeight::calcWeights(..)")
|
||||
// << "v:" << v << " u[0]:" << u[0]
|
||||
// << exit(FatalError);
|
||||
//}
|
||||
//if (((v&u[0]) < 0) != (mesh.faceOwner()[faceI] != cellIndex_))
|
||||
//{
|
||||
// FatalErrorIn("pointMVCWeight::calcWeights(..)")
|
||||
// << "v:" << v << " u[0]:" << u[0]
|
||||
// << exit(FatalError);
|
||||
//}
|
||||
|
||||
if ((v&u[0]) < 0)
|
||||
if ((v & u[0]) < 0)
|
||||
{
|
||||
v = -v;
|
||||
}
|
||||
@ -165,22 +164,22 @@ void Foam::pointMVCWeight::calcWeights
|
||||
label jPlus1 = f.fcIndex(j);
|
||||
//Pout<< " uj:" << u[j] << " ujPlus1:" << u[jPlus1] << endl;
|
||||
|
||||
vector n0 = u[j] ^ v;
|
||||
vector n0 = u[j]^v;
|
||||
n0 /= mag(n0);
|
||||
vector n1 = u[jPlus1] ^ v;
|
||||
vector n1 = u[jPlus1]^v;
|
||||
n1 /= mag(n1);
|
||||
|
||||
scalar l = mag(n0-n1);
|
||||
scalar l = min(mag(n0 - n1), 2.0);
|
||||
//Pout<< " l:" << l << endl;
|
||||
alpha(j) = 2.0*Foam::asin(l/2.0);
|
||||
|
||||
vector temp = n0 ^ n1;
|
||||
vector temp = n0^n1;
|
||||
if ((temp&v) < 0.0)
|
||||
{
|
||||
alpha[j] = -alpha[j];
|
||||
}
|
||||
|
||||
l = mag(u[j]-v);
|
||||
l = min(mag(u[j] - v), 2.0);
|
||||
//Pout<< " l:" << l << endl;
|
||||
theta(j) = 2.0*Foam::asin(l/2.0);
|
||||
}
|
||||
@ -211,7 +210,7 @@ void Foam::pointMVCWeight::calcWeights
|
||||
sum +=
|
||||
1.0
|
||||
/ Foam::tan(theta[j])
|
||||
* (Foam::tan(alpha[j]/2.0)+Foam::tan(alpha[jMin1]/2.0));
|
||||
* (Foam::tan(alpha[j]/2.0) + Foam::tan(alpha[jMin1]/2.0));
|
||||
}
|
||||
|
||||
// The special case when x lies on the polygon, handle it using 2D mvc.
|
||||
@ -234,7 +233,7 @@ void Foam::pointMVCWeight::calcWeights
|
||||
/ sum
|
||||
/ dist[pid]
|
||||
/ Foam::sin(theta[j])
|
||||
* (Foam::tan(alpha[j]/2.0)+Foam::tan(alpha[jMin1]/2.0));
|
||||
* (Foam::tan(alpha[j]/2.0) + Foam::tan(alpha[jMin1]/2.0));
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -89,12 +89,12 @@ Foam::CloudFunctionObjectList<CloudType>::CloudFunctionObjectList
|
||||
template<class CloudType>
|
||||
Foam::CloudFunctionObjectList<CloudType>::CloudFunctionObjectList
|
||||
(
|
||||
const CloudFunctionObjectList& ppm
|
||||
const CloudFunctionObjectList& cfol
|
||||
)
|
||||
:
|
||||
PtrList<CloudFunctionObject<CloudType> >(ppm),
|
||||
owner_(ppm.owner_),
|
||||
dict_(ppm.dict_)
|
||||
PtrList<CloudFunctionObject<CloudType> >(cfol),
|
||||
owner_(cfol.owner_),
|
||||
dict_(cfol.dict_)
|
||||
{}
|
||||
|
||||
|
||||
|
||||
@ -66,10 +66,9 @@ void Foam::FacePostProcessing<CloudType>::write()
|
||||
const label procI = Pstream::myProcNo();
|
||||
|
||||
scalarListList allProcMass(Pstream::nProcs());
|
||||
allProcMass[procI].setSize(massTotal_.size());
|
||||
allProcMass[procI] = massTotal_;
|
||||
Pstream::gatherList(allProcMass);
|
||||
scalarList allMass
|
||||
scalarField allMass
|
||||
(
|
||||
ListListOps::combine<scalarList>
|
||||
(
|
||||
@ -78,10 +77,9 @@ void Foam::FacePostProcessing<CloudType>::write()
|
||||
);
|
||||
|
||||
scalarListList allProcMassFlux(Pstream::nProcs());
|
||||
allProcMassFlux[procI].setSize(massFlux_.size());
|
||||
allProcMassFlux[procI] = massFlux_;
|
||||
Pstream::gatherList(allProcMassFlux);
|
||||
scalarList allMassFlux
|
||||
scalarField allMassFlux
|
||||
(
|
||||
ListListOps::combine<scalarList>
|
||||
(
|
||||
@ -109,9 +107,20 @@ void Foam::FacePostProcessing<CloudType>::write()
|
||||
|
||||
pointField uniquePoints(mesh.points(), uniqueMeshPointLabels);
|
||||
List<pointField> allProcPoints(Pstream::nProcs());
|
||||
allProcPoints[procI].setSize(uniquePoints.size());
|
||||
allProcPoints[procI] = uniquePoints;
|
||||
Pstream::gatherList(allProcPoints);
|
||||
|
||||
faceList faces(fZone_().localFaces());
|
||||
forAll(faces, i)
|
||||
{
|
||||
inplaceRenumber(pointToGlobal, faces[i]);
|
||||
}
|
||||
List<faceList> allProcFaces(Pstream::nProcs());
|
||||
allProcFaces[procI] = faces;
|
||||
Pstream::gatherList(allProcFaces);
|
||||
|
||||
if (Pstream::master())
|
||||
{
|
||||
pointField allPoints
|
||||
(
|
||||
ListListOps::combine<pointField>
|
||||
@ -120,15 +129,6 @@ void Foam::FacePostProcessing<CloudType>::write()
|
||||
)
|
||||
);
|
||||
|
||||
faceList faces(fZone_().localFaces());
|
||||
forAll(faces, i)
|
||||
{
|
||||
inplaceRenumber(pointToGlobal, faces[i]);
|
||||
}
|
||||
List<faceList> allProcFaces(Pstream::nProcs());
|
||||
allProcFaces[procI].setSize(faces.size());
|
||||
allProcFaces[procI] = faces;
|
||||
Pstream::gatherList(allProcFaces);
|
||||
faceList allFaces
|
||||
(
|
||||
ListListOps::combine<faceList>
|
||||
@ -137,9 +137,6 @@ void Foam::FacePostProcessing<CloudType>::write()
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
if (Pstream::master())
|
||||
{
|
||||
fileName outputDir = mesh.time().path();
|
||||
|
||||
if (Pstream::parRun())
|
||||
@ -165,7 +162,7 @@ void Foam::FacePostProcessing<CloudType>::write()
|
||||
allPoints,
|
||||
allFaces,
|
||||
"massTotal",
|
||||
massTotal_,
|
||||
allMass,
|
||||
false
|
||||
);
|
||||
writer->write
|
||||
@ -175,7 +172,7 @@ void Foam::FacePostProcessing<CloudType>::write()
|
||||
allPoints,
|
||||
allFaces,
|
||||
"massFlux",
|
||||
massFlux_,
|
||||
allMassFlux,
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
@ -307,7 +307,7 @@ getVolumeType
|
||||
|
||||
forAll(eFaces, i)
|
||||
{
|
||||
edgeNormal += patch_.faceNormal()[eFaces[i]];
|
||||
edgeNormal += patch_.faceNormals()[eFaces[i]];
|
||||
}
|
||||
|
||||
if (debug & 2)
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -149,6 +149,7 @@ Foam::octree<Type>::octree
|
||||
// - has some guaranteed maximum size (maxShapeRatio)
|
||||
|
||||
label oldNLeaves = -1; // make test below pass first time.
|
||||
label oldNNodes = -1;
|
||||
deepestLevel_ = 1;
|
||||
while
|
||||
(
|
||||
@ -169,11 +170,11 @@ Foam::octree<Type>::octree
|
||||
break;
|
||||
}
|
||||
|
||||
if (oldNLeaves == nLeaves())
|
||||
if ((oldNLeaves == nLeaves()) && (oldNNodes == nNodes()))
|
||||
{
|
||||
if (debug & 1)
|
||||
{
|
||||
Pout<< "octree : exiting since nLeaves does not change"
|
||||
Pout<< "octree : exiting since nLeaves and nNodes do not change"
|
||||
<< endl;
|
||||
}
|
||||
break;
|
||||
@ -185,6 +186,7 @@ Foam::octree<Type>::octree
|
||||
}
|
||||
|
||||
oldNLeaves = nLeaves();
|
||||
oldNNodes = nNodes();
|
||||
|
||||
topNode_->redistribute
|
||||
(
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
partialWrite/partialWrite.C
|
||||
partialWrite/partialWriteFunctionObject.C
|
||||
|
||||
writeRegisteredObject/writeRegisteredObject.C
|
||||
writeRegisteredObject/writeRegisteredObjectFunctionObject.C
|
||||
|
||||
|
||||
88
src/postProcessing/functionObjects/IO/controlDict
Normal file
88
src/postProcessing/functionObjects/IO/controlDict
Normal file
@ -0,0 +1,88 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: 1.7.1 |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
location "system";
|
||||
object controlDict;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
application icoFoam;
|
||||
|
||||
startFrom startTime;
|
||||
|
||||
startTime 0;
|
||||
|
||||
stopAt endTime;
|
||||
|
||||
endTime 0.5;
|
||||
|
||||
deltaT 0.005;
|
||||
|
||||
writeControl timeStep;
|
||||
|
||||
writeInterval 20;
|
||||
|
||||
purgeWrite 0;
|
||||
|
||||
writeFormat ascii;
|
||||
|
||||
writePrecision 6;
|
||||
|
||||
writeCompression uncompressed;
|
||||
|
||||
timeFormat general;
|
||||
|
||||
timePrecision 6;
|
||||
|
||||
runTimeModifiable yes;
|
||||
|
||||
functions
|
||||
{
|
||||
partialWrite
|
||||
{
|
||||
// Write some registered objects more often than others.
|
||||
// Above writeControl determines most frequent dump.
|
||||
|
||||
type partialWrite;
|
||||
|
||||
// Where to load it from
|
||||
functionObjectLibs ("libIOFunctionObjects.so");
|
||||
|
||||
// Execute upon outputTime
|
||||
outputControl outputTime;
|
||||
|
||||
// Objects to write every outputTime
|
||||
objectNames (p);
|
||||
// Write as normal every writeInterval'th outputTime.
|
||||
writeInterval 3;
|
||||
}
|
||||
|
||||
dumpObjects
|
||||
{
|
||||
// Forcibly write registered objects. E.g. fields that have been
|
||||
// created with NO_READ.
|
||||
|
||||
type writeRegisteredObject;
|
||||
|
||||
// Where to load it from
|
||||
functionObjectLibs ("libIOFunctionObjects.so");
|
||||
|
||||
// Execute upon outputTime
|
||||
outputControl outputTime;
|
||||
|
||||
// Objects to write
|
||||
objectNames ();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,49 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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/>.
|
||||
|
||||
Typedef
|
||||
Foam::IOpartialWrite
|
||||
|
||||
Description
|
||||
Instance of the generic IOOutputFilter for partialWrite.
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef IOpartialWrite_H
|
||||
#define IOpartialWrite_H
|
||||
|
||||
#include "partialWrite.H"
|
||||
#include "IOOutputFilter.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
typedef IOOutputFilter<partialWrite> IOpartialWrite;
|
||||
}
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,142 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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 "partialWrite.H"
|
||||
#include "dictionary.H"
|
||||
#include "Time.H"
|
||||
#include "IOobjectList.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
defineTypeNameAndDebug(partialWrite, 0);
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::partialWrite::partialWrite
|
||||
(
|
||||
const word& name,
|
||||
const objectRegistry& obr,
|
||||
const dictionary& dict,
|
||||
const bool loadFromFiles
|
||||
)
|
||||
:
|
||||
name_(name),
|
||||
obr_(obr)
|
||||
{
|
||||
read(dict);
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::partialWrite::~partialWrite()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
void Foam::partialWrite::read(const dictionary& dict)
|
||||
{
|
||||
dict.lookup("objectNames") >> objectNames_;
|
||||
dict.lookup("writeInterval") >> writeInterval_;
|
||||
writeInstance_ = 0;
|
||||
|
||||
Info<< type() << " " << name() << ":" << nl
|
||||
<< " dumping every outputTime :";
|
||||
forAllConstIter(HashSet<word>, objectNames_, iter)
|
||||
{
|
||||
Info<< ' ' << iter.key();
|
||||
}
|
||||
Info<< nl
|
||||
<< " dumping all other fields every "
|
||||
<< writeInterval_ << "th outputTime" << nl
|
||||
<< endl;
|
||||
|
||||
if (writeInterval_ < 1)
|
||||
{
|
||||
FatalIOErrorIn("partialWrite::read(const dictionary&)", dict)
|
||||
<< "Illegal value for writeInterval " << writeInterval_
|
||||
<< ". It should be >= 1."
|
||||
<< exit(FatalIOError);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Foam::partialWrite::execute()
|
||||
{
|
||||
//Pout<< "execute at time " << obr_.time().timeName()
|
||||
// << " index:" << obr_.time().timeIndex() << endl;
|
||||
}
|
||||
|
||||
|
||||
void Foam::partialWrite::end()
|
||||
{
|
||||
//Pout<< "end at time " << obr_.time().timeName() << endl;
|
||||
// Do nothing - only valid on write
|
||||
}
|
||||
|
||||
|
||||
void Foam::partialWrite::write()
|
||||
{
|
||||
//Pout<< "write at time " << obr_.time().timeName() << endl;
|
||||
if (obr_.time().outputTime())
|
||||
{
|
||||
// Above check so it can be used both with
|
||||
// outputControl timeStep;
|
||||
// outputInterval 1;
|
||||
// or with
|
||||
// outputControl outputTime;
|
||||
|
||||
writeInstance_++;
|
||||
|
||||
if (writeInstance_ == writeInterval_)
|
||||
{
|
||||
// Normal dump
|
||||
writeInstance_ = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Delete all but marked objects
|
||||
IOobjectList objects(obr_, obr_.time().timeName());
|
||||
|
||||
forAllConstIter(HashPtrTable<IOobject>, objects, iter)
|
||||
{
|
||||
if (!objectNames_.found(iter()->name()))
|
||||
{
|
||||
const fileName f = obr_.time().timePath()/iter()->name();
|
||||
//Pout<< " rm " << f << endl;
|
||||
rm(f);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,156 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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/>.
|
||||
|
||||
Class
|
||||
Foam::partialWrite
|
||||
|
||||
Description
|
||||
Allows some fields/registered objects to be written more often than others.
|
||||
|
||||
Works in the opposite way: deletes at intermediate times all
|
||||
but selected fields.
|
||||
|
||||
SourceFiles
|
||||
partialWrite.C
|
||||
IOpartialWrite.H
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef partialWrite_H
|
||||
#define partialWrite_H
|
||||
|
||||
#include "pointFieldFwd.H"
|
||||
#include "HashSet.H"
|
||||
#include "DynamicList.H"
|
||||
#include "runTimeSelectionTables.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
// Forward declaration of classes
|
||||
class objectRegistry;
|
||||
class dictionary;
|
||||
class mapPolyMesh;
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class partialWrite Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class partialWrite
|
||||
{
|
||||
protected:
|
||||
|
||||
// Private data
|
||||
|
||||
//- Name of this set of partialWrite
|
||||
word name_;
|
||||
|
||||
const objectRegistry& obr_;
|
||||
|
||||
|
||||
// Read from dictionary
|
||||
|
||||
//- Names of objects to dump always
|
||||
HashSet<word> objectNames_;
|
||||
|
||||
//- Write interval for restart dump
|
||||
label writeInterval_;
|
||||
|
||||
|
||||
//- Current dump instance. If reaches writeInterval do a full write.
|
||||
label writeInstance_;
|
||||
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
partialWrite(const partialWrite&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const partialWrite&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("partialWrite");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct for given objectRegistry and dictionary.
|
||||
// Allow the possibility to load fields from files
|
||||
partialWrite
|
||||
(
|
||||
const word& name,
|
||||
const objectRegistry&,
|
||||
const dictionary&,
|
||||
const bool loadFromFiles = false
|
||||
);
|
||||
|
||||
|
||||
//- Destructor
|
||||
virtual ~partialWrite();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
//- Return name of the partialWrite
|
||||
virtual const word& name() const
|
||||
{
|
||||
return name_;
|
||||
}
|
||||
|
||||
//- Read the partialWrite data
|
||||
virtual void read(const dictionary&);
|
||||
|
||||
//- Execute, currently does nothing
|
||||
virtual void execute();
|
||||
|
||||
//- Execute at the final time-loop, currently does nothing
|
||||
virtual void end();
|
||||
|
||||
//- Write the partialWrite
|
||||
virtual void write();
|
||||
|
||||
//- Update for changes of mesh
|
||||
virtual void updateMesh(const mapPolyMesh&)
|
||||
{}
|
||||
|
||||
//- Update for changes of mesh
|
||||
virtual void movePoints(const pointField&)
|
||||
{}
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,46 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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 "partialWriteFunctionObject.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
defineNamedTemplateTypeNameAndDebug
|
||||
(
|
||||
partialWriteFunctionObject,
|
||||
0
|
||||
);
|
||||
|
||||
addToRunTimeSelectionTable
|
||||
(
|
||||
functionObject,
|
||||
partialWriteFunctionObject,
|
||||
dictionary
|
||||
);
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,54 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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/>.
|
||||
|
||||
Typedef
|
||||
Foam::partialWriteFunctionObject
|
||||
|
||||
Description
|
||||
FunctionObject wrapper around partialWrite to allow them to be
|
||||
created via the functions list within controlDict.
|
||||
|
||||
SourceFiles
|
||||
partialWriteFunctionObject.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef partialWriteFunctionObject_H
|
||||
#define partialWriteFunctionObject_H
|
||||
|
||||
#include "partialWrite.H"
|
||||
#include "OutputFilterFunctionObject.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
typedef OutputFilterFunctionObject<partialWrite>
|
||||
partialWriteFunctionObject;
|
||||
}
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -44,7 +44,6 @@ Foam::writeRegisteredObject::writeRegisteredObject
|
||||
:
|
||||
name_(name),
|
||||
obr_(obr),
|
||||
active_(true),
|
||||
objectNames_()
|
||||
{
|
||||
read(dict);
|
||||
@ -61,10 +60,7 @@ Foam::writeRegisteredObject::~writeRegisteredObject()
|
||||
|
||||
void Foam::writeRegisteredObject::read(const dictionary& dict)
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
dict.lookup("objectNames") >> objectNames_;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -82,8 +78,6 @@ void Foam::writeRegisteredObject::end()
|
||||
|
||||
void Foam::writeRegisteredObject::write()
|
||||
{
|
||||
if (active_)
|
||||
{
|
||||
forAll(objectNames_, i)
|
||||
{
|
||||
if (obr_.foundObject<regIOobject>(objectNames_[i]))
|
||||
@ -108,7 +102,6 @@ void Foam::writeRegisteredObject::write()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -65,10 +65,6 @@ protected:
|
||||
|
||||
const objectRegistry& obr_;
|
||||
|
||||
//- On/off switch
|
||||
bool active_;
|
||||
|
||||
|
||||
// Read from dictionary
|
||||
|
||||
//- Names of objects to control
|
||||
|
||||
@ -10,6 +10,13 @@ thermoSingleLayer/thermoSingleLayer.C
|
||||
submodels/subModelBase.C
|
||||
|
||||
KINEMATICMODELS=submodels/kinematic
|
||||
$(KINEMATICMODELS)/force/force/force.C
|
||||
$(KINEMATICMODELS)/force/force/forceNew.C
|
||||
$(KINEMATICMODELS)/force/forceList/forceList.C
|
||||
$(KINEMATICMODELS)/force/contactAngleForce/contactAngleForce.C
|
||||
$(KINEMATICMODELS)/force/surfaceShearForce/surfaceShearForce.C
|
||||
$(KINEMATICMODELS)/force/thermocapillaryForce/thermocapillaryForce.C
|
||||
|
||||
$(KINEMATICMODELS)/injectionModel/injectionModel/injectionModel.C
|
||||
$(KINEMATICMODELS)/injectionModel/injectionModel/injectionModelNew.C
|
||||
$(KINEMATICMODELS)/injectionModel/injectionModelList/injectionModelList.C
|
||||
|
||||
@ -34,6 +34,10 @@ License
|
||||
#include "directMappedWallPolyPatch.H"
|
||||
#include "mapDistribute.H"
|
||||
|
||||
#include "cachedRandom.H"
|
||||
#include "normal.H"
|
||||
#include "mathematicalConstants.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
@ -61,8 +65,6 @@ bool kinematicSingleLayer::read()
|
||||
solution.lookup("nCorr") >> nCorr_;
|
||||
solution.lookup("nNonOrthCorr") >> nNonOrthCorr_;
|
||||
|
||||
coeffs_.lookup("Cf") >> Cf_;
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@ -76,9 +78,10 @@ void kinematicSingleLayer::correctThermoFields()
|
||||
{
|
||||
if (thermoModel_ == tmConstant)
|
||||
{
|
||||
rho_ == dimensionedScalar(coeffs_.lookup("rho0"));
|
||||
mu_ == dimensionedScalar(coeffs_.lookup("mu0"));
|
||||
sigma_ == dimensionedScalar(coeffs_.lookup("sigma0"));
|
||||
const dictionary& constDict(coeffs_.subDict("constantThermoCoeffs"));
|
||||
rho_ == dimensionedScalar(constDict.lookup("rho0"));
|
||||
mu_ == dimensionedScalar(constDict.lookup("mu0"));
|
||||
sigma_ == dimensionedScalar(constDict.lookup("sigma0"));
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -273,25 +276,6 @@ void kinematicSingleLayer::updateSurfaceVelocities()
|
||||
}
|
||||
|
||||
|
||||
tmp<fvVectorMatrix> kinematicSingleLayer::tau(volVectorField& U) const
|
||||
{
|
||||
// Calculate shear stress
|
||||
volScalarField Cs("Cs", rho_*Cf_*mag(Us_ - U));
|
||||
volScalarField Cw
|
||||
(
|
||||
"Cw",
|
||||
mu_/(0.3333*(delta_ + dimensionedScalar("SMALL", dimLength, SMALL)))
|
||||
);
|
||||
Cw.min(1.0e+06);
|
||||
|
||||
return
|
||||
(
|
||||
- fvm::Sp(Cs, U) + Cs*Us_ // surface contribution
|
||||
- fvm::Sp(Cw, U) + Cw*Uw_ // wall contribution
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
tmp<Foam::fvVectorMatrix> kinematicSingleLayer::solveMomentum
|
||||
(
|
||||
const volScalarField& pu,
|
||||
@ -312,9 +296,8 @@ tmp<Foam::fvVectorMatrix> kinematicSingleLayer::solveMomentum
|
||||
+ fvm::div(phi_, U_)
|
||||
==
|
||||
- USp_
|
||||
+ tau(U_)
|
||||
+ fvc::grad(sigma_)
|
||||
- fvm::SuSp(rhoSp_, U_)
|
||||
+ forces_.correct(U_)
|
||||
);
|
||||
|
||||
fvVectorMatrix& UEqn = tUEqn();
|
||||
@ -459,8 +442,6 @@ kinematicSingleLayer::kinematicSingleLayer
|
||||
|
||||
cumulativeContErr_(0.0),
|
||||
|
||||
Cf_(readScalar(coeffs().lookup("Cf"))),
|
||||
|
||||
rho_
|
||||
(
|
||||
IOobject
|
||||
@ -773,6 +754,8 @@ kinematicSingleLayer::kinematicSingleLayer
|
||||
|
||||
injection_(*this, coeffs_),
|
||||
|
||||
forces_(*this, coeffs_),
|
||||
|
||||
addedMassTotal_(0.0)
|
||||
{
|
||||
if (readFields)
|
||||
|
||||
@ -42,6 +42,7 @@ SourceFiles
|
||||
#include "fvMatrices.H"
|
||||
|
||||
#include "injectionModelList.H"
|
||||
#include "forceList.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -93,12 +94,6 @@ protected:
|
||||
scalar cumulativeContErr_;
|
||||
|
||||
|
||||
// Model parameters
|
||||
|
||||
//- Skin frition coefficient for film/primary region interface
|
||||
scalar Cf_;
|
||||
|
||||
|
||||
// Thermo properties
|
||||
|
||||
// Fields
|
||||
@ -199,6 +194,9 @@ protected:
|
||||
//- Cloud injection
|
||||
injectionModelList injection_;
|
||||
|
||||
//- List of film forces
|
||||
forceList forces_;
|
||||
|
||||
|
||||
// Checks
|
||||
|
||||
@ -238,9 +236,6 @@ protected:
|
||||
//- Update film surface velocities
|
||||
virtual void updateSurfaceVelocities();
|
||||
|
||||
//- Return the stress term for the momentum equation
|
||||
virtual tmp<fvVectorMatrix> tau(volVectorField& dU) const;
|
||||
|
||||
//- Constrain a film region master/slave boundaries of a field to a
|
||||
// given value
|
||||
template<class Type>
|
||||
@ -314,12 +309,6 @@ public:
|
||||
inline label nNonOrthCorr() const;
|
||||
|
||||
|
||||
// Model parameters
|
||||
|
||||
//- Return the skin friction coefficient
|
||||
inline scalar Cf() const;
|
||||
|
||||
|
||||
// Thermo properties
|
||||
|
||||
//- Return const access to the dynamic viscosity / [Pa.s]
|
||||
|
||||
@ -61,12 +61,6 @@ inline label kinematicSingleLayer::nNonOrthCorr() const
|
||||
}
|
||||
|
||||
|
||||
inline scalar kinematicSingleLayer::Cf() const
|
||||
{
|
||||
return Cf_;
|
||||
}
|
||||
|
||||
|
||||
inline const volScalarField& kinematicSingleLayer::mu() const
|
||||
{
|
||||
return mu_;
|
||||
|
||||
@ -0,0 +1,164 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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 "contactAngleForce.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "fvcGrad.H"
|
||||
#include "unitConversion.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
defineTypeNameAndDebug(contactAngleForce, 0);
|
||||
addToRunTimeSelectionTable(force, contactAngleForce, dictionary);
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
contactAngleForce::contactAngleForce
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
force(typeName, owner, dict),
|
||||
deltaWet_(readScalar(coeffs_.lookup("deltaWet"))),
|
||||
Ccf_(readScalar(coeffs_.lookup("Ccf"))),
|
||||
rndGen_(label(0), -1),
|
||||
distribution_
|
||||
(
|
||||
distributionModels::distributionModel::New
|
||||
(
|
||||
coeffs_.subDict("contactAngleDistribution"),
|
||||
rndGen_
|
||||
)
|
||||
)
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
||||
|
||||
contactAngleForce::~contactAngleForce()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
|
||||
|
||||
tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
|
||||
{
|
||||
tmp<volVectorField> tForce
|
||||
(
|
||||
new volVectorField
|
||||
(
|
||||
IOobject
|
||||
(
|
||||
"contactForce",
|
||||
owner_.time().timeName(),
|
||||
owner_.regionMesh(),
|
||||
IOobject::NO_READ,
|
||||
IOobject::NO_WRITE
|
||||
),
|
||||
owner_.regionMesh(),
|
||||
dimensionedVector("zero", dimForce/dimArea, vector::zero)
|
||||
)
|
||||
);
|
||||
|
||||
vectorField& force = tForce().internalField();
|
||||
|
||||
const labelUList& own = owner_.regionMesh().owner();
|
||||
const labelUList& nbr = owner_.regionMesh().neighbour();
|
||||
|
||||
const scalarField& magSf = owner_.magSf();
|
||||
|
||||
const volScalarField& delta = owner_.delta();
|
||||
const volScalarField& sigma = owner_.sigma();
|
||||
|
||||
volScalarField alpha
|
||||
(
|
||||
"alpha",
|
||||
pos(delta - dimensionedScalar("deltaWet", dimLength, deltaWet_))
|
||||
);
|
||||
volVectorField gradAlpha(fvc::grad(alpha));
|
||||
|
||||
scalarField nHits(force.size(), 0.0);
|
||||
|
||||
forAll(nbr, faceI)
|
||||
{
|
||||
const label cellO = own[faceI];
|
||||
const label cellN = nbr[faceI];
|
||||
|
||||
label cellI = -1;
|
||||
if ((delta[cellO] > deltaWet_) && (delta[cellN] < deltaWet_))
|
||||
{
|
||||
cellI = cellO;
|
||||
}
|
||||
else if ((delta[cellO] < deltaWet_) && (delta[cellN] > deltaWet_))
|
||||
{
|
||||
cellI = cellN;
|
||||
}
|
||||
|
||||
if (cellI != -1)
|
||||
{
|
||||
// const scalar dx = Foam::sqrt(magSf[cellI]);
|
||||
const scalar dx = owner_.regionMesh().deltaCoeffs()[faceI];
|
||||
const vector n =
|
||||
gradAlpha[cellI]/(mag(gradAlpha[cellI]) + ROOTVSMALL);
|
||||
scalar theta = cos(degToRad(distribution_->sample()));
|
||||
force[cellI] += Ccf_*n*sigma[cellI]*(1.0 - theta)/dx;
|
||||
nHits[cellI]++;
|
||||
}
|
||||
}
|
||||
|
||||
nHits = max(nHits, 1.0);
|
||||
force /= (nHits*magSf);
|
||||
|
||||
if (owner_.regionMesh().time().outputTime())
|
||||
{
|
||||
tForce().write();
|
||||
}
|
||||
|
||||
tmp<fvVectorMatrix>
|
||||
tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume));
|
||||
|
||||
tfvm() += tForce;
|
||||
|
||||
return tfvm;
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,125 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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/>.
|
||||
|
||||
Class
|
||||
Foam::contactAngleForce
|
||||
|
||||
Description
|
||||
Film contact angle force
|
||||
|
||||
SourceFiles
|
||||
contactAngleForce.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef contactAngleForce_H
|
||||
#define contactAngleForce_H
|
||||
|
||||
#include "force.H"
|
||||
#include "distributionModel.H"
|
||||
#include "cachedRandom.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class contactAngleForce Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class contactAngleForce
|
||||
:
|
||||
public force
|
||||
{
|
||||
private:
|
||||
|
||||
// Private Data
|
||||
|
||||
//- Threshold film thickness beyon which the film is 'wet'
|
||||
scalar deltaWet_;
|
||||
|
||||
//- Coefficient applied to the contact angle force
|
||||
scalar Ccf_;
|
||||
|
||||
//- Random number generator
|
||||
cachedRandom rndGen_;
|
||||
|
||||
//- Parcel size PDF model
|
||||
const autoPtr<distributionModels::distributionModel> distribution_;
|
||||
|
||||
|
||||
|
||||
// Private member functions
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
contactAngleForce(const contactAngleForce&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const contactAngleForce&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("contactAngle");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from surface film model
|
||||
contactAngleForce
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
);
|
||||
|
||||
|
||||
//- Destructor
|
||||
virtual ~contactAngleForce();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
// Evolution
|
||||
|
||||
//- Correct
|
||||
virtual tmp<fvVectorMatrix> correct(volVectorField& U);
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,73 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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 "force.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
defineTypeNameAndDebug(force, 0);
|
||||
defineRunTimeSelectionTable(force, dictionary);
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
force::force(const surfaceFilmModel& owner)
|
||||
:
|
||||
subModelBase(owner)
|
||||
{}
|
||||
|
||||
|
||||
force::force
|
||||
(
|
||||
const word& type,
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
subModelBase(type, owner, dict)
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
||||
|
||||
force::~force()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,138 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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/>.
|
||||
|
||||
Class
|
||||
Foam::force
|
||||
|
||||
Description
|
||||
Base class for film (stress-based) force models
|
||||
|
||||
SourceFiles
|
||||
force.C
|
||||
forceNew.C
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef force_H
|
||||
#define force_H
|
||||
|
||||
#include "subModelBase.H"
|
||||
#include "runTimeSelectionTables.H"
|
||||
#include "fvMatrices.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class force Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class force
|
||||
:
|
||||
public subModelBase
|
||||
{
|
||||
private:
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
force(const force&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const force&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("force");
|
||||
|
||||
|
||||
// Declare runtime constructor selection table
|
||||
|
||||
declareRunTimeSelectionTable
|
||||
(
|
||||
autoPtr,
|
||||
force,
|
||||
dictionary,
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
),
|
||||
(owner, dict)
|
||||
);
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct null
|
||||
force(const surfaceFilmModel& owner);
|
||||
|
||||
//- Construct from type name, dictionary and surface film model
|
||||
force
|
||||
(
|
||||
const word& type,
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
);
|
||||
|
||||
|
||||
// Selectors
|
||||
|
||||
//- Return a reference to the selected force model
|
||||
static autoPtr<force> New
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict,
|
||||
const word& mdoelType
|
||||
);
|
||||
|
||||
|
||||
//- Destructor
|
||||
virtual ~force();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
// Evolution
|
||||
|
||||
//- Correct
|
||||
virtual tmp<fvVectorMatrix> correct(volVectorField& U) = 0;
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,77 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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 "force.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
|
||||
|
||||
autoPtr<force> force::New
|
||||
(
|
||||
const surfaceFilmModel& model,
|
||||
const dictionary& dict,
|
||||
const word& modelType
|
||||
)
|
||||
{
|
||||
Info<< " " << modelType << endl;
|
||||
|
||||
dictionaryConstructorTable::iterator cstrIter =
|
||||
dictionaryConstructorTablePtr_->find(modelType);
|
||||
|
||||
if (cstrIter == dictionaryConstructorTablePtr_->end())
|
||||
{
|
||||
FatalErrorIn
|
||||
(
|
||||
"force::New"
|
||||
"("
|
||||
"const surfaceFilmModel&, "
|
||||
"const dictionary&, "
|
||||
"const word&"
|
||||
")"
|
||||
) << "Unknown force type " << modelType
|
||||
<< nl << nl << "Valid force types are:" << nl
|
||||
<< dictionaryConstructorTablePtr_->toc()
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
return autoPtr<force>(cstrIter()(model, dict));
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,101 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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 "forceList.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
forceList::forceList(const surfaceFilmModel& owner)
|
||||
:
|
||||
PtrList<force>()
|
||||
{}
|
||||
|
||||
|
||||
forceList::forceList
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
PtrList<force>()
|
||||
{
|
||||
const wordList models(dict.lookup("forces"));
|
||||
|
||||
Info<< " Selecting film force models" << endl;
|
||||
if (models.size() > 0)
|
||||
{
|
||||
this->setSize(models.size());
|
||||
|
||||
forAll(models, i)
|
||||
{
|
||||
set(i, force::New(owner, dict, models[i]));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Info<< " none" << endl;
|
||||
}
|
||||
}
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
||||
|
||||
forceList::~forceList()
|
||||
{}
|
||||
|
||||
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
|
||||
|
||||
tmp<fvVectorMatrix> forceList::correct(volVectorField& U)
|
||||
{
|
||||
tmp<fvVectorMatrix> tResult
|
||||
(
|
||||
new fvVectorMatrix(U, dimForce/dimArea*dimVolume)
|
||||
);
|
||||
fvVectorMatrix& result = tResult();
|
||||
|
||||
forAll(*this, i)
|
||||
{
|
||||
result += this->operator[](i).correct(U);
|
||||
}
|
||||
|
||||
return tResult;
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,95 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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/>.
|
||||
|
||||
Class
|
||||
Foam::forceList
|
||||
|
||||
Description
|
||||
List container for film sources
|
||||
|
||||
SourceFiles
|
||||
forceList.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef forceList_H
|
||||
#define forceList_H
|
||||
|
||||
#include "PtrList.H"
|
||||
#include "force.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class forceList Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class forceList
|
||||
:
|
||||
public PtrList<force>
|
||||
{
|
||||
public:
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct null
|
||||
forceList(const surfaceFilmModel& owner);
|
||||
|
||||
//- Construct from type name, dictionary and surface film model
|
||||
forceList
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
);
|
||||
|
||||
|
||||
//- Destructor
|
||||
virtual ~forceList();
|
||||
|
||||
|
||||
// Member functions
|
||||
|
||||
//- Return (net) force system
|
||||
tmp<fvVectorMatrix> correct(volVectorField& U);
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,100 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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 "surfaceShearForce.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "fvmSup.H"
|
||||
#include "kinematicSingleLayer.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
defineTypeNameAndDebug(surfaceShearForce, 0);
|
||||
addToRunTimeSelectionTable(force, surfaceShearForce, dictionary);
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
surfaceShearForce::surfaceShearForce
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
force(typeName, owner, dict),
|
||||
Cf_(readScalar(coeffs_.lookup("Cf")))
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
||||
|
||||
surfaceShearForce::~surfaceShearForce()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
|
||||
|
||||
tmp<fvVectorMatrix> surfaceShearForce::correct(volVectorField& U)
|
||||
{
|
||||
const kinematicSingleLayer& film =
|
||||
static_cast<const kinematicSingleLayer&>(owner_);
|
||||
|
||||
const volScalarField& rho = film.rho();
|
||||
const volScalarField& mu = film.mu();
|
||||
const volVectorField& Us = film.Us();
|
||||
const volVectorField& Uw = film.Uw();
|
||||
const volScalarField& delta = film.delta();
|
||||
|
||||
// Calculate shear stress
|
||||
volScalarField Cs("Cs", rho*Cf_*mag(Us - U));
|
||||
volScalarField Cw
|
||||
(
|
||||
"Cw",
|
||||
mu/(0.3333*(delta + dimensionedScalar("SMALL", dimLength, SMALL)))
|
||||
);
|
||||
Cw.min(1.0e+06);
|
||||
|
||||
return
|
||||
(
|
||||
- fvm::Sp(Cs, U) + Cs*Us // surface contribution
|
||||
- fvm::Sp(Cw, U) + Cw*Uw // wall contribution
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,114 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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/>.
|
||||
|
||||
Class
|
||||
Foam::surfaceShearForce
|
||||
|
||||
Description
|
||||
Film surface shear force
|
||||
|
||||
SourceFiles
|
||||
surfaceShearForce.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef surfaceShearForce_H
|
||||
#define surfaceShearForce_H
|
||||
|
||||
#include "force.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class surfaceShearForce Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class surfaceShearForce
|
||||
:
|
||||
public force
|
||||
{
|
||||
private:
|
||||
|
||||
// Private Data
|
||||
|
||||
//- Surface roughness coefficient
|
||||
scalar Cf_;
|
||||
|
||||
|
||||
|
||||
// Private member functions
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
surfaceShearForce(const surfaceShearForce&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const surfaceShearForce&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("surfaceShear");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from surface film model
|
||||
surfaceShearForce
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
);
|
||||
|
||||
|
||||
//- Destructor
|
||||
virtual ~surfaceShearForce();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
// Evolution
|
||||
|
||||
//- Correct
|
||||
virtual tmp<fvVectorMatrix> correct(volVectorField& U);
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,83 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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 "thermocapillaryForce.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
#include "fvcGrad.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
defineTypeNameAndDebug(thermocapillaryForce, 0);
|
||||
addToRunTimeSelectionTable(force, thermocapillaryForce, dictionary);
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
thermocapillaryForce::thermocapillaryForce
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
force(owner)
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
||||
|
||||
thermocapillaryForce::~thermocapillaryForce()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
|
||||
|
||||
tmp<fvVectorMatrix> thermocapillaryForce::correct(volVectorField& U)
|
||||
{
|
||||
const volScalarField& sigma = owner_.sigma();
|
||||
|
||||
tmp<fvVectorMatrix>
|
||||
tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume));
|
||||
|
||||
tfvm() += fvc::grad(sigma);
|
||||
|
||||
return tfvm;
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,107 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
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/>.
|
||||
|
||||
Class
|
||||
Foam::thermocapillaryForce
|
||||
|
||||
Description
|
||||
Thermocapillary force
|
||||
|
||||
SourceFiles
|
||||
thermocapillaryForce.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef thermocapillaryForce_H
|
||||
#define thermocapillaryForce_H
|
||||
|
||||
#include "force.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace regionModels
|
||||
{
|
||||
namespace surfaceFilmModels
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class thermocapillaryForce Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class thermocapillaryForce
|
||||
:
|
||||
public force
|
||||
{
|
||||
private:
|
||||
|
||||
// Private member functions
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
thermocapillaryForce(const thermocapillaryForce&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const thermocapillaryForce&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("thermocapillary");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from surface film model
|
||||
thermocapillaryForce
|
||||
(
|
||||
const surfaceFilmModel& owner,
|
||||
const dictionary& dict
|
||||
);
|
||||
|
||||
|
||||
//- Destructor
|
||||
virtual ~thermocapillaryForce();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
// Evolution
|
||||
|
||||
//- Correct
|
||||
virtual tmp<fvVectorMatrix> correct(volVectorField& U);
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace surfaceFilmModels
|
||||
} // End namespace regionModels
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -97,11 +97,13 @@ void thermoSingleLayer::correctThermoFields()
|
||||
{
|
||||
case tmConstant:
|
||||
{
|
||||
rho_ == dimensionedScalar(coeffs_.lookup("rho0"));
|
||||
mu_ == dimensionedScalar(coeffs_.lookup("mu0"));
|
||||
sigma_ == dimensionedScalar(coeffs_.lookup("sigma0"));
|
||||
Cp_ == dimensionedScalar(coeffs_.lookup("Cp0"));
|
||||
kappa_ == dimensionedScalar(coeffs_.lookup("kappa0"));
|
||||
const dictionary&
|
||||
constDict(coeffs_.subDict("constantThermoCoeffs"));
|
||||
rho_ == dimensionedScalar(constDict.lookup("rho0"));
|
||||
mu_ == dimensionedScalar(constDict.lookup("mu0"));
|
||||
sigma_ == dimensionedScalar(constDict.lookup("sigma0"));
|
||||
Cp_ == dimensionedScalar(constDict.lookup("Cp0"));
|
||||
kappa_ == dimensionedScalar(constDict.lookup("kappa0"));
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@ -52,10 +52,28 @@ Foam::viscosityModels::HerschelBulkley::calcNu() const
|
||||
{
|
||||
dimensionedScalar tone("tone", dimTime, 1.0);
|
||||
dimensionedScalar rtone("rtone", dimless/dimTime, 1.0);
|
||||
|
||||
tmp<volScalarField> sr(strainRate());
|
||||
return (min(nu0_,(tau0_ + k_* rtone *( pow(tone * sr(), n_)
|
||||
- pow(tone*tau0_/nu0_,n_))) / (max(sr(), dimensionedScalar
|
||||
("VSMALL", dimless/dimTime, VSMALL)))));
|
||||
|
||||
// return
|
||||
// (
|
||||
// min
|
||||
// (
|
||||
// nu0_,
|
||||
// (tau0_ + k_*rtone*(pow(tone*sr(), n_) - pow(tone*tau0_/nu0_, n_)))
|
||||
// /max(sr(), dimensionedScalar("VSMALL", dimless/dimTime, VSMALL))
|
||||
// )
|
||||
// );
|
||||
|
||||
return
|
||||
(
|
||||
min
|
||||
(
|
||||
nu0_,
|
||||
(tau0_ + k_*rtone*pow(tone*sr(), n_))
|
||||
/(max(sr(), dimensionedScalar ("VSMALL", dimless/dimTime, VSMALL)))
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -57,7 +57,7 @@ Foam::viscosityModel::viscosityModel
|
||||
|
||||
Foam::tmp<Foam::volScalarField> Foam::viscosityModel::strainRate() const
|
||||
{
|
||||
return mag(symm(fvc::grad(U_)));
|
||||
return sqrt(2.0)*mag(symm(fvc::grad(U_)));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ PIMPLE
|
||||
|
||||
relaxationFactors
|
||||
{
|
||||
"h.* 1;
|
||||
"h.*" 1;
|
||||
"U.*" 1;
|
||||
}
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ boundaryField
|
||||
lowerWall
|
||||
{
|
||||
type fixedValue;
|
||||
value uniform (20 0 0);
|
||||
value $internalField;
|
||||
}
|
||||
|
||||
"motorBike_.*"
|
||||
|
||||
@ -15,34 +15,27 @@ FoamFile
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
//surfaceFilmModel kinematicSingleLayer;
|
||||
surfaceFilmModel thermoSingleLayer;
|
||||
|
||||
regionName wallFilmRegion;
|
||||
|
||||
active true;
|
||||
|
||||
kinematicSingleLayerCoeffs
|
||||
{
|
||||
thermoModel constant;
|
||||
rho0 rho0 [1 -3 0 0 0] 1000;
|
||||
mu0 mu0 [1 -1 -1 0 0] 1e-3;
|
||||
sigma0 sigma0 [1 0 -2 0 0] 0.07;
|
||||
|
||||
deltaStable deltaStable [0 1 0 0 0] 0;
|
||||
Cf 0.005;
|
||||
|
||||
injectionModels ();
|
||||
}
|
||||
|
||||
|
||||
thermoSingleLayerCoeffs
|
||||
{
|
||||
thermoModel singleComponent;
|
||||
liquid H2O;
|
||||
|
||||
deltaStable deltaStable [0 1 0 0 0] 0;
|
||||
forces
|
||||
(
|
||||
surfaceShear
|
||||
thermocapillary
|
||||
);
|
||||
|
||||
surfaceShearCoeffs
|
||||
{
|
||||
Cf 0.005;
|
||||
}
|
||||
|
||||
injectionModels ();
|
||||
|
||||
|
||||
@ -25,9 +25,8 @@ active true;
|
||||
thermoSingleLayerCoeffs
|
||||
{
|
||||
thermoModel singleComponent; // constant
|
||||
liquid H2O;
|
||||
|
||||
Cf 0.005;
|
||||
liquid H2O;
|
||||
|
||||
radiationModel none;
|
||||
|
||||
@ -52,6 +51,35 @@ thermoSingleLayerCoeffs
|
||||
}
|
||||
}
|
||||
|
||||
forces
|
||||
(
|
||||
surfaceShear
|
||||
thermocapillary
|
||||
contactAngle
|
||||
);
|
||||
|
||||
surfaceShearCoeffs
|
||||
{
|
||||
Cf 0.005;
|
||||
}
|
||||
|
||||
contactAngleCoeffs
|
||||
{
|
||||
deltaWet 1e-4;
|
||||
Ccf 0.085;
|
||||
contactAngleDistribution
|
||||
{
|
||||
type normal;
|
||||
normalDistribution
|
||||
{
|
||||
minValue 50;
|
||||
maxValue 100;
|
||||
expectation 75;
|
||||
variance 100;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
injectionModels
|
||||
(
|
||||
curvatureSeparation
|
||||
|
||||
@ -42,6 +42,7 @@ gradSchemes
|
||||
snGradCorr(pp) Gauss linear;
|
||||
snGradCorr(pu) Gauss linear;
|
||||
grad(nHat) Gauss linear;
|
||||
grad(alpha) Gauss linear;
|
||||
}
|
||||
|
||||
laplacianSchemes
|
||||
|
||||
@ -15,32 +15,28 @@ FoamFile
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
//surfaceFilmModel kinematicSingleLayer;
|
||||
surfaceFilmModel thermoSingleLayer;
|
||||
|
||||
regionName wallFilmRegion;
|
||||
|
||||
active true;
|
||||
|
||||
kinematicSingleLayerCoeffs
|
||||
{
|
||||
thermoModel constant;
|
||||
rho0 rho0 [1 -3 0 0 0] 1000;
|
||||
mu0 mu0 [1 -1 -1 0 0] 1e-3;
|
||||
sigma0 sigma0 [1 0 -2 0 0] 0.07;
|
||||
|
||||
Cf 0.005;
|
||||
|
||||
injectionModels ();
|
||||
}
|
||||
|
||||
|
||||
thermoSingleLayerCoeffs
|
||||
{
|
||||
thermoModel singleComponent;
|
||||
|
||||
liquid H2O;
|
||||
|
||||
forces
|
||||
(
|
||||
surfaceShear
|
||||
thermocapillary
|
||||
);
|
||||
|
||||
surfaceShearCoeffs
|
||||
{
|
||||
Cf 0.005;
|
||||
}
|
||||
|
||||
injectionModels
|
||||
();
|
||||
|
||||
@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
rm -rf 0 > /dev/null 2>&1
|
||||
rm -f ./*.obj > /dev/null 2>&1
|
||||
rm -f ./flange ./*.obj > /dev/null 2>&1
|
||||
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
|
||||
rm -f constant/triSurface/flange.eMesh > /dev/null 2>&1
|
||||
rm -f constant/polyMesh/boundary
|
||||
|
||||
Reference in New Issue
Block a user