zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Initial commit after latest foundation merge

Browse Source
This commit is contained in:
andy
2016-04-25 11:40:48 +01:00
parent 69ae5a9a78 e5a029c187
commit fd9d801e2d
4003 changed files with 74634 additions and 37783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -194,8 +194,9 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
else
{
tmp<pointField> tcurPoints(new pointField(fvMesh_.points()));
pointField& curPoints = tcurPoints.ref();
tcurPoints().replace
curPoints.replace
(
cmpt_,
points0_ + pointDisplacement_.internalField()
@ -210,11 +211,11 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
{
label pointI = pz[i];
tcurPoints()[pointI][cmpt_] = points0_[pointI];
curPoints[pointI][cmpt_] = points0_[pointI];
}
}
twoDCorrectPoints(tcurPoints());
twoDCorrectPoints(curPoints);
return tcurPoints;
}

6
src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -107,14 +107,14 @@ Foam::velocityComponentLaplacianFvMotionSolver::curPoints() const
tmp<pointField> tcurPoints(new pointField(fvMesh_.points()));
tcurPoints().replace
tcurPoints.ref().replace
(
cmpt_,
tcurPoints().component(cmpt_)
+ fvMesh_.time().deltaTValue()*pointMotionU_.internalField()
);
twoDCorrectPoints(tcurPoints());
twoDCorrectPoints(tcurPoints.ref());
return tcurPoints;
}

16
src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -81,7 +81,7 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
(
"cellDisplacement",
pointDisplacement().dimensions(),
vector::zero
Zero
),
cellMotionBoundaryTypes<vector>(pointDisplacement().boundaryField())
),
@ -167,7 +167,7 @@ Foam::displacementSBRStressFvMotionSolver::curPoints() const
points0() + pointDisplacement().internalField()
);
twoDCorrectPoints(tcurPoints());
twoDCorrectPoints(tcurPoints.ref());
return tcurPoints;
}
@ -199,9 +199,10 @@ void Foam::displacementSBRStressFvMotionSolver::solve()
(
Df
*(
fvc::dotInterpolate
(
cellDisplacement_.mesh().Sf()
& fvc::interpolate(gradCd.T() - gradCd)
cellDisplacement_.mesh().Sf(),
gradCd.T() - gradCd
)
// Solid-body rotation "lambda" term
@ -221,9 +222,10 @@ void Foam::displacementSBRStressFvMotionSolver::solve()
(
Df
*(
fvc::dotInterpolate
(
cellDisplacement_.mesh().Sf()
& fvc::interpolate(gradCd + gradCd.T())
cellDisplacement_.mesh().Sf(),
gradCd + gradCd.T()
)
// Solid-body rotation "lambda" term

8
src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -66,7 +66,7 @@ void Foam::displacementInterpolationMotionSolver::calcInterpolation()
// Get zones and their interpolation tables for displacement
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
List<Pair<word> > faceZoneToTable
List<Pair<word>> faceZoneToTable
(
coeffDict().lookup("interpolationTables")
);
@ -344,10 +344,10 @@ Foam::displacementInterpolationMotionSolver::curPoints() const
}
tmp<pointField> tcurPoints(new pointField(points0()));
pointField& curPoints = tcurPoints();
pointField& curPoints = tcurPoints.ref();
// Interpolate the displacement of the face zones.
vectorField zoneDisp(displacements_.size(), vector::zero);
vectorField zoneDisp(displacements_.size(), Zero);
forAll(zoneDisp, zoneI)
{
if (times_[zoneI].size())

9
src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -79,7 +79,7 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
(
"cellDisplacement",
pointDisplacement_.dimensions(),
vector::zero
Zero
),
cellMotionBoundaryTypes<vector>(pointDisplacement_.boundaryField())
),
@ -303,6 +303,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
(
points0() + pointDisplacement_.internalField()
);
pointField& curPoints = tcurPoints.ref();
// Implement frozen points
if (frozenPointsZone_ != -1)
@ -311,11 +312,11 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
forAll(pz, i)
{
tcurPoints()[pz[i]] = points0()[pz[i]];
curPoints[pz[i]] = points0()[pz[i]];
}
}
twoDCorrectPoints(tcurPoints());
twoDCorrectPoints(curPoints);
return tcurPoints;
}

8
src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -171,7 +171,7 @@ void Foam::displacementLayeredMotionMotionSolver::walkStructured
points0()[pointI], // location of data
vector::max, // not valid
0.0,
vector::zero // passive data
Zero // passive data
);
}
}
@ -189,7 +189,7 @@ void Foam::displacementLayeredMotionMotionSolver::walkStructured
mesh().edges()[edgeI].centre(points0()), // location of data
vector::max, // not valid
0.0,
vector::zero
Zero
);
}
}
@ -230,7 +230,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
) const
{
tmp<vectorField> tfld(new vectorField(meshPoints.size()));
vectorField& fld = tfld();
vectorField& fld = tfld.ref();
const word type(dict.lookup("type"));

4
src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -61,7 +61,7 @@ inline Foam::pointEdgeStructuredWalk::pointEdgeStructuredWalk()
point0_(vector::max),
previousPoint_(vector::max),
dist_(0),
data_(vector::zero)
data_(Zero)
{}

4
src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCore.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -96,7 +96,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "fvMotionSolverCoreTemplates.C"
#include "fvMotionSolverCoreTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/fvMotionSolver/fvMotionSolvers/fvMotionSolverCore/fvMotionSolverCoreTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -43,7 +43,7 @@ Foam::wordList Foam::fvMotionSolverCore::cellMotionBoundaryTypes
forAll(cmUbf, patchi)
{
if (isA<fixedValuePointPatchField<Type> >(pmUbf[patchi]))
if (isA<fixedValuePointPatchField<Type>>(pmUbf[patchi]))
{
cmUbf[patchi] = cellMotionFvPatchField<Type>::typeName;
}

6
src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,7 +69,7 @@ Foam::velocityLaplacianFvMotionSolver::velocityLaplacianFvMotionSolver
(
"cellMotionU",
pointMotionU_.dimensions(),
vector::zero
Zero
),
cellMotionBoundaryTypes<vector>(pointMotionU_.boundaryField())
),
@ -109,7 +109,7 @@ Foam::velocityLaplacianFvMotionSolver::curPoints() const
+ fvMesh_.time().deltaTValue()*pointMotionU_.internalField()
);
twoDCorrectPoints(tcurPoints());
twoDCorrectPoints(tcurPoints.ref());
return tcurPoints;
}

4
src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -110,7 +110,7 @@ void Foam::cellMotionFvPatchField<Type>::updateCoeffs()
const GeometricField<Type, pointPatchField, pointMesh>& pointMotion =
this->db().objectRegistry::template
lookupObject<GeometricField<Type, pointPatchField, pointMesh> >
lookupObject<GeometricField<Type, pointPatchField, pointMesh>>
(pfName);
forAll(p, i)

12
src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -93,9 +93,9 @@ public:
);
//- Construct and return a clone
virtual tmp<fvPatchField<Type> > clone() const
virtual tmp<fvPatchField<Type>> clone() const
{
return tmp<fvPatchField<Type> >
return tmp<fvPatchField<Type>>
(
new cellMotionFvPatchField<Type>(*this)
);
@ -109,12 +109,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual tmp<fvPatchField<Type> > clone
virtual tmp<fvPatchField<Type>> clone
(
const DimensionedField<Type, volMesh>& iF
) const
{
return tmp<fvPatchField<Type> >
return tmp<fvPatchField<Type>>
(
new cellMotionFvPatchField<Type>(*this, iF)
);
@ -138,7 +138,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "cellMotionFvPatchField.C"
#include "cellMotionFvPatchField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -107,9 +107,9 @@ public:
{}
//- Construct and return a clone
virtual tmp<fvPatchField<Type> > clone() const
virtual tmp<fvPatchField<Type>> clone() const
{
return tmp<fvPatchField<Type> >
return tmp<fvPatchField<Type>>
(
new surfaceSlipDisplacementFvPatchField<Type>(*this)
);
@ -126,12 +126,12 @@ public:
{}
//- Construct and return a clone setting internal field reference
virtual tmp<fvPatchField<Type> > clone
virtual tmp<fvPatchField<Type>> clone
(
const DimensionedField<Type, volMesh>& iF
) const
{
return tmp<fvPatchField<Type> >
return tmp<fvPatchField<Type>>
(
new surfaceSlipDisplacementFvPatchField<Type>(*this, iF)
);

6
src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,8 +44,8 @@ angularOscillatingDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
axis_(vector::zero),
origin_(vector::zero),
axis_(Zero),
origin_(Zero),
angle0_(0.0),
amplitude_(0.0),
omega_(0.0),

10
src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -94,9 +94,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<vector> > clone() const
virtual autoPtr<pointPatchField<vector>> clone() const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new angularOscillatingDisplacementPointPatchVectorField
(
@ -113,12 +113,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<vector> > clone
virtual autoPtr<pointPatchField<vector>> clone
(
const DimensionedField<vector, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new angularOscillatingDisplacementPointPatchVectorField
(

6
src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,8 +44,8 @@ angularOscillatingVelocityPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
axis_(vector::zero),
origin_(vector::zero),
axis_(Zero),
origin_(Zero),
angle0_(0.0),
amplitude_(0.0),
omega_(0.0),

10
src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -94,9 +94,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<vector> > clone() const
virtual autoPtr<pointPatchField<vector>> clone() const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new angularOscillatingVelocityPointPatchVectorField
(
@ -113,12 +113,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<vector> > clone
virtual autoPtr<pointPatchField<vector>> clone
(
const DimensionedField<vector, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new angularOscillatingVelocityPointPatchVectorField
(

4
src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,7 +44,7 @@ oscillatingDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
amplitude_(vector::zero),
amplitude_(Zero),
omega_(0.0)
{}

10
src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -89,9 +89,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<vector> > clone() const
virtual autoPtr<pointPatchField<vector>> clone() const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new oscillatingDisplacementPointPatchVectorField
(
@ -108,12 +108,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<vector> > clone
virtual autoPtr<pointPatchField<vector>> clone
(
const DimensionedField<vector, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new oscillatingDisplacementPointPatchVectorField
(

4
src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,7 +44,7 @@ oscillatingVelocityPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
amplitude_(vector::zero),
amplitude_(Zero),
omega_(0.0),
p0_(p.localPoints())
{}

10
src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -91,9 +91,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<vector> > clone() const
virtual autoPtr<pointPatchField<vector>> clone() const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new oscillatingVelocityPointPatchVectorField
(
@ -110,12 +110,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<vector> > clone
virtual autoPtr<pointPatchField<vector>> clone
(
const DimensionedField<vector, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new oscillatingVelocityPointPatchVectorField
(

8
src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,7 +72,7 @@ void surfaceDisplacementPointPatchVectorField::calcProjection
const scalar projectLen = mag(mesh.bounds().max()-mesh.bounds().min());
// For case of fixed projection vector:
vector projectVec(vector::zero);
vector projectVec(Zero);
if (projectMode_ == FIXEDNORMAL)
{
vector n = projectDir_/mag(projectDir_);
@ -308,9 +308,9 @@ surfaceDisplacementPointPatchVectorField
)
:
fixedValuePointPatchVectorField(p, iF),
velocity_(vector::zero),
velocity_(Zero),
projectMode_(NEAREST),
projectDir_(vector::zero),
projectDir_(Zero),
wedgePlane_(-1)
{}

4
src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -308,7 +308,7 @@ surfaceSlipDisplacementPointPatchVectorField
:
pointPatchVectorField(p, iF),
projectMode_(NEAREST),
projectDir_(vector::zero),
projectDir_(Zero),
wedgePlane_(-1)
{}

18
src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,10 +46,10 @@ timeVaryingMappedFixedValuePointPatchField
sampleTimes_(0),
startSampleTime_(-1),
startSampledValues_(0),
startAverage_(pTraits<Type>::zero),
startAverage_(Zero),
endSampleTime_(-1),
endSampledValues_(0),
endAverage_(pTraits<Type>::zero),
endAverage_(Zero),
offset_()
{}
@ -74,10 +74,10 @@ timeVaryingMappedFixedValuePointPatchField
sampleTimes_(0),
startSampleTime_(-1),
startSampledValues_(0),
startAverage_(pTraits<Type>::zero),
startAverage_(Zero),
endSampleTime_(-1),
endSampledValues_(0),
endAverage_(pTraits<Type>::zero),
endAverage_(Zero),
offset_
(
ptf.offset_.valid()
@ -113,15 +113,15 @@ timeVaryingMappedFixedValuePointPatchField
sampleTimes_(0),
startSampleTime_(-1),
startSampledValues_(0),
startAverage_(pTraits<Type>::zero),
startAverage_(Zero),
endSampleTime_(-1),
endSampledValues_(0),
endAverage_(pTraits<Type>::zero),
endAverage_(Zero),
offset_()
{
if (dict.found("offset"))
{
offset_ = DataEntry<Type>::New("offset", dict);
offset_ = Function1<Type>::New("offset", dict);
}
dict.readIfPresent("fieldTableName", fieldTableName_);
@ -236,7 +236,7 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::rmap
fixedValuePointPatchField<Type>::rmap(ptf, addr);
const timeVaryingMappedFixedValuePointPatchField<Type>& tiptf =
refCast<const timeVaryingMappedFixedValuePointPatchField<Type> >(ptf);
refCast<const timeVaryingMappedFixedValuePointPatchField<Type>>(ptf);
startSampledValues_.rmap(tiptf.startSampledValues_, addr);
endSampledValues_.rmap(tiptf.endSampledValues_, addr);

16
src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -41,7 +41,7 @@ SourceFiles
#include "fixedValuePointPatchField.H"
#include "instantList.H"
#include "pointToPointPlanarInterpolation.H"
#include "DataEntry.H"
#include "Function1.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -96,7 +96,7 @@ class timeVaryingMappedFixedValuePointPatchField
Type endAverage_;
//- Time varying offset values to interpolated data
autoPtr<DataEntry<Type> > offset_;
autoPtr<Function1<Type>> offset_;
public:
@ -138,9 +138,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<Type> > clone() const
virtual autoPtr<pointPatchField<Type>> clone() const
{
return autoPtr<pointPatchField<Type> >
return autoPtr<pointPatchField<Type>>
(
new timeVaryingMappedFixedValuePointPatchField<Type>(*this)
);
@ -154,12 +154,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<Type> > clone
virtual autoPtr<pointPatchField<Type>> clone
(
const DimensionedField<Type, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<Type> >
return autoPtr<pointPatchField<Type>>
(
new timeVaryingMappedFixedValuePointPatchField<Type>(*this, iF)
);
@ -209,7 +209,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "timeVaryingMappedFixedValuePointPatchField.C"
#include "timeVaryingMappedFixedValuePointPatchField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

21
src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -27,8 +27,12 @@ Class
Description
Interpolates pre-specified motion.
Motion specified as pointVectorFields. E.g.
Motion specified as pointVectorFields.
\heading Patch usage
Example:
\verbatim
walls
{
type uniformInterpolatedDisplacement;
@ -36,9 +40,10 @@ Description
fieldName wantedDisplacement;
interpolationScheme linear;
}
\endverbatim
This will scan the case for 'wantedDisplacement' pointVectorFields
and interpolate those in time (using 'linear' interpolation) to
This will scan the case for \a wantedDisplacement pointVectorFields
and interpolate those in time (using \c linear interpolation) to
obtain the current displacement.
The advantage of specifying displacement in this way is that it
automatically works through decomposePar.
@ -124,9 +129,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<vector> > clone() const
virtual autoPtr<pointPatchField<vector>> clone() const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new uniformInterpolatedDisplacementPointPatchVectorField
(
@ -143,12 +148,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<vector> > clone
virtual autoPtr<pointPatchField<vector>> clone
(
const DimensionedField<vector, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new uniformInterpolatedDisplacementPointPatchVectorField
(

8
src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -39,9 +39,9 @@ waveDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
amplitude_(vector::zero),
amplitude_(Zero),
omega_(0.0),
waveNumber_(vector::zero)
waveNumber_(Zero)
{}
@ -56,7 +56,7 @@ waveDisplacementPointPatchVectorField
fixedValuePointPatchField<vector>(p, iF, dict),
amplitude_(dict.lookup("amplitude")),
omega_(readScalar(dict.lookup("omega"))),
waveNumber_(dict.lookupOrDefault<vector>("waveNumber", vector::zero))
waveNumber_(dict.lookupOrDefault<vector>("waveNumber", Zero))
{
if (!dict.found("value"))
{

10
src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -90,9 +90,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<vector> > clone() const
virtual autoPtr<pointPatchField<vector>> clone() const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new waveDisplacementPointPatchVectorField
(
@ -109,12 +109,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<vector> > clone
virtual autoPtr<pointPatchField<vector>> clone
(
const DimensionedField<vector, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<vector> >
return autoPtr<pointPatchField<vector>>
(
new waveDisplacementPointPatchVectorField
(