zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: corrections to interfaceTrackingFvMesh following commit 14a471f937

Browse Source
This commit is contained in:
Andrew Heather
2020-12-22 09:46:42 +00:00
parent bdcc02cf64
commit 77aa2e6026
2 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C
View File

@ -1568,27 +1568,15 @@ Foam::interfaceTrackingFvMesh::interfaceTrackingFvMesh
dynamicMotionSolverFvMesh(io, doInit),
aMeshPtr_(new faMesh(*this)),
fsPatchIndex_(-1),
fixedFreeSurfacePatches_
(
motion().get<wordList>("fixedFreeSurfacePatches")
),
fixedFreeSurfacePatches_(),
nonReflectingFreeSurfacePatches_(),
pointNormalsCorrectionPatches_
(
motion().get<wordList>("pointNormalsCorrectionPatches")
),
normalMotionDir_
(
motion().get<bool>("normalMotionDir")
),
pointNormalsCorrectionPatches_(),
normalMotionDir_(false),
motionDir_(Zero),
smoothing_(motion().getOrDefault("smoothing", false)),
pureFreeSurface_(motion().getOrDefault("pureFreeSurface", true)),
rigidFreeSurface_(motion().getOrDefault("rigidFreeSurface", false)),
correctContactLineNormals_
(
motion().getOrDefault("correctContactLineNormals", false)
),
smoothing_(false),
pureFreeSurface_(true),
rigidFreeSurface_(false),
correctContactLineNormals_(false),
sigma0_("zero", dimForce/dimLength/dimDensity, Zero),
rho_("one", dimDensity, 1.0),
timeIndex_(-1),
@ -1605,10 +1593,13 @@ Foam::interfaceTrackingFvMesh::interfaceTrackingFvMesh
surfactantPtr_(nullptr),
contactAnglePtr_(nullptr)
{
initializeData();
if (doInit)
{
init(false); // do not initialise lower levels
}
}
/*
Foam::interfaceTrackingFvMesh::interfaceTrackingFvMesh
(
const IOobject& io,
@ -1630,22 +1621,13 @@ Foam::interfaceTrackingFvMesh::interfaceTrackingFvMesh
),
aMeshPtr_(new faMesh(*this)),
fsPatchIndex_(-1),
fixedFreeSurfacePatches_
(
motion().get<wordList>("fixedFreeSurfacePatches")
),
fixedFreeSurfacePatches_(),
nonReflectingFreeSurfacePatches_(),
pointNormalsCorrectionPatches_
(
motion().get<wordList>("pointNormalsCorrectionPatches")
),
normalMotionDir_
(
motion().get<bool>("normalMotionDir")
),
pointNormalsCorrectionPatches_(),
normalMotionDir_(false),
motionDir_(Zero),
smoothing_(motion().getOrDefault("smoothing", false)),
pureFreeSurface_(motion().getOrDefault("pureFreeSurface", true)),
smoothing_(false),
pureFreeSurface_(true),
sigma0_("zero", dimForce/dimLength/dimDensity, Zero),
rho_("one", dimDensity, 1.0),
timeIndex_(-1),
@ -1661,10 +1643,8 @@ Foam::interfaceTrackingFvMesh::interfaceTrackingFvMesh
surfaceTensionPtr_(nullptr),
surfactantPtr_(nullptr),
contactAnglePtr_(nullptr)
{
initializeData();
}
{}
*/
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
@ -1687,6 +1667,32 @@ Foam::interfaceTrackingFvMesh::~interfaceTrackingFvMesh()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::interfaceTrackingFvMesh::init(const bool doInit)
{
if (doInit)
{
dynamicMotionSolverFvMesh::init(doInit);
}
aMeshPtr_.reset(new faMesh(*this));
// Set motion-based data
fixedFreeSurfacePatches_ =
motion().get<wordList>("fixedFreeSurfacePatches");
pointNormalsCorrectionPatches_ =
motion().get<wordList>("pointNormalsCorrectionPatches");
normalMotionDir_ = motion().get<bool>("normalMotionDir");
smoothing_ = motion().getOrDefault("smoothing", false);
pureFreeSurface_ = motion().getOrDefault("pureFreeSurface", true);
initializeData();
return true;
}
Foam::areaVectorField& Foam::interfaceTrackingFvMesh::Us()
{
if (!UsPtr_)