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

ENH: Consistency updates after Foundation merge and code tidying

Browse Source
This commit is contained in:
Andrew Heather
2016-04-25 16:46:56 +01:00
parent d3157ac905
commit b9313ef2fe
242 changed files with 923 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ namespace Foam
);
template<>
const word GlobalIOList<Tuple2<scalar, vector> >::typeName
const word GlobalIOList<Tuple2<scalar, vector>>::typeName
(
"scalarVectorTable"
);
@ -91,7 +91,7 @@ void Foam::displacementInterpolationMotionSolver::calcInterpolation()
const word& tableName = faceZoneToTable[i][1];
GlobalIOList<Tuple2<scalar, vector> > table
GlobalIOList<Tuple2<scalar, vector>> table
(
IOobject
(

14
src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C
View File

@ -97,7 +97,7 @@ surfaceAlignedSBRStressFvMotionSolver
),
minSigmaDiff_(coeffDict().lookupOrDefault<scalar>("minSigmaDiff", 1e-4))
{
forAll (surfaceNames_, i)
forAll(surfaceNames_, i)
{
surfaceMesh_.set
(
@ -146,7 +146,7 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::calculateCellRot()
DynamicList<label> hitCells;
forAll (surfaceMesh_, surfI)
forAll(surfaceMesh_, surfI)
{
List<pointIndexHit> hit(start.size());
surfaceMesh_[surfI].findLineAny(start, end, hit);
@ -260,7 +260,7 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::calculateCellRot()
const labelList& cPoints =
fvMesh_.cellPoints(rotCellId);
forAll (cPoints, j)
forAll(cPoints, j)
{
const label pointId = cPoints[j];
@ -279,7 +279,7 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::calculateCellRot()
}
}
forAll (pointDisplacement_.internalField(), iPoint)
forAll(pointDisplacement_.internalField(), iPoint)
{
vector& point = pointDisplacement_.internalField()[iPoint];
point /= pointsCount[iPoint];
@ -324,10 +324,10 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::solve()
)
);
volVectorField& Ud = tUd();
volVectorField& Ud = tUd.ref();
const vectorList& C = fvMesh_.C();
forAll (Ud, i)
forAll(Ud, i)
{
pointMVCWeight pointInter(fvMesh_, C[i], i);
Ud[i] = pointInter.interpolate(pointDisplacement_);
@ -364,7 +364,7 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::solve()
dimensionedScalar("zero", dimless, 0.0)
)
);
volScalarField& mu = tmu();
volScalarField& mu = tmu.ref();
const scalarList& V = fvMesh_.V();
mu.internalField() = (1.0/V);

2
src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolation.C
View File

@ -48,7 +48,7 @@ Foam::labelListList Foam::patchCorrectedInterpolation::getPatchGroups
Istream& entry
) const
{
List<List<word> > patchGroupNames(entry);
List<List<word>> patchGroupNames(entry);
labelListList patchGroups(patchGroupNames.size());

12
src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -106,7 +106,7 @@ void Foam::patchCorrectedInterpolation::interpolateDataFromPatchGroups
dimensionedScalar("zero", dimless, 0),
zeroGradientPointPatchField<scalar>::typeName
);
data = dimensioned<Type>("zero", data.dimensions(), pTraits<Type>::zero);
data = dimensioned<Type>("zero", data.dimensions(), Type(Zero));
forAll(patchGroups_, patchGroupI)
{
@ -168,7 +168,7 @@ void Foam::patchCorrectedInterpolation::propagateDataFromPatchGroup
// Generate the seed labels and info
labelList seedLabels(nSeedInfo);
List<PointData<Type> > seedInfo(nSeedInfo);
List<PointData<Type>> seedInfo(nSeedInfo);
nSeedInfo = 0;
forAll(patchGroup, patchGroupI)
{
@ -200,9 +200,9 @@ void Foam::patchCorrectedInterpolation::propagateDataFromPatchGroup
}
// Wave the data through the mesh
List<PointData<Type> > allPointInfo(mesh().nPoints());
List<PointData<Type> > allEdgeInfo(mesh().nEdges());
PointEdgeWave<PointData<Type> >
List<PointData<Type>> allPointInfo(mesh().nPoints());
List<PointData<Type>> allEdgeInfo(mesh().nEdges());
PointEdgeWave<PointData<Type>>
(
mesh(),
seedLabels,