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

7
applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H
View File

@ -2,9 +2,7 @@ rho = thermo.rho();
volScalarField rAU(1.0/UEqn.A());
surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H();
volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
if (pimple.transonic())
{
@ -54,6 +52,9 @@ else
fvc::makeRelative(phiHbyA, rho, U);
MRF.makeRelative(phiHbyA);
// Update the pressure BCs to ensure flux consistency
constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn

2
applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
View File

@ -27,7 +27,7 @@
IOobject::MUST_READ
);
if (turbulenceHeader.typeHeaderOk<IOdictionary>(true))
if (turbulencePropertiesHeader.typeHeaderOk<IOdictionary>(true))
{
autoPtr<compressible::turbulenceModel> turbulence
(

4
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -1368,7 +1368,7 @@ int main(int argc, char *argv[])
// Add all information for all the remaining faceZones
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
HashTable<Pair<word> > faceZoneToPatches;
HashTable<Pair<word>> faceZoneToPatches;
forAll(mesh.faceZones(), zoneI)
{
const word& fzName = mesh.faceZones()[zoneI].name();
@ -1400,7 +1400,7 @@ int main(int argc, char *argv[])
if (faceZoneToPatches.size())
{
autoRefineDriver::addFaceZones
snappyRefineDriver::addFaceZones
(
meshRefiner,
refineParams,

2
applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
View File

@ -230,7 +230,7 @@ void subsetDimensionedFields
(
const fvMeshSubset& subsetter,
const wordList& fieldNames,
PtrList<DimensionedField<Type, volMesh> >& subFields
PtrList<DimensionedField<Type, volMesh>>& subFields
)
{
const fvMesh& baseMesh = subsetter.baseMesh();

2
applications/utilities/parallelProcessing/decomposePar/readFields.C
View File

@ -33,7 +33,7 @@ void Foam::readFields
(
const typename GeoMesh::Mesh& mesh,
const IOobjectList& objects,
PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields,
PtrList<GeometricField<Type, PatchField, GeoMesh>>& fields,
const bool readOldTime
)
{

2
applications/utilities/parallelProcessing/decomposePar/readFields.H
View File

@ -47,7 +47,7 @@ namespace Foam
(
const typename GeoMesh::Mesh& mesh,
const IOobjectList& objects,
PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields,
PtrList<GeometricField<Type, PatchField, GeoMesh>>& fields,
const bool readOldTime
);

12
applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H
View File

@ -105,7 +105,7 @@ public:
//- Reconstruct volume internal field
template<class Type>
tmp<DimensionedField<Type, volMesh> >
tmp<DimensionedField<Type, volMesh>>
reconstructFvVolumeInternalField
(
const DimensionedField<Type, volMesh>&
@ -113,14 +113,14 @@ public:
//- Read and reconstruct volume internal field
template<class Type>
tmp<DimensionedField<Type, volMesh> >
tmp<DimensionedField<Type, volMesh>>
reconstructFvVolumeInternalField(const IOobject& fieldIoObject) const;
//- Reconstruct volume field
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> >
tmp<GeometricField<Type, fvPatchField, volMesh>>
reconstructFvVolumeField
(
const GeometricField<Type, fvPatchField, volMesh>& fld
@ -128,14 +128,14 @@ public:
//- Read and reconstruct volume field
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> >
tmp<GeometricField<Type, fvPatchField, volMesh>>
reconstructFvVolumeField(const IOobject& fieldIoObject) const;
//- Reconstruct surface field
template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
reconstructFvSurfaceField
(
const GeometricField<Type, fvsPatchField, surfaceMesh>&
@ -143,7 +143,7 @@ public:
//- Read and reconstruct surface field
template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
reconstructFvSurfaceField(const IOobject& fieldIoObject) const;

41
applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C
View File

@ -41,7 +41,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh>>
Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField
(
const DimensionedField<Type, volMesh>& fld
@ -66,7 +66,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField
IOobject::NO_WRITE
);
return tmp<DimensionedField<Type, volMesh> >
return tmp<DimensionedField<Type, volMesh>>
(
new DimensionedField<Type, volMesh>
(
@ -80,7 +80,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField
template<class Type>
Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh>>
Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField
(
const IOobject& fieldIoObject
@ -100,7 +100,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField
// Reconstruct a field onto the baseMesh
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::parFvFieldReconstructor::reconstructFvVolumeField
(
const GeometricField<Type, fvPatchField, volMesh>& fld
@ -123,7 +123,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Note: patchFields still on mesh, not baseMesh
PtrList<fvPatchField<Type> > patchFields(fld.mesh().boundary().size());
PtrList<fvPatchField<Type>> patchFields(fld.mesh().boundary().size());
const typename GeometricField
<
@ -151,7 +151,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField
}
PtrList<fvPatchField<Type> > basePatchFields
PtrList<fvPatchField<Type>> basePatchFields
(
baseMesh_.boundary().size()
);
@ -213,7 +213,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField
IOobject::NO_WRITE
);
return tmp<GeometricField<Type, fvPatchField, volMesh> >
return tmp<GeometricField<Type, fvPatchField, volMesh>>
(
new GeometricField<Type, fvPatchField, volMesh>
(
@ -228,7 +228,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::parFvFieldReconstructor::reconstructFvVolumeField
(
const IOobject& fieldIoObject
@ -247,7 +247,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
Foam::parFvFieldReconstructor::reconstructFvSurfaceField
(
const GeometricField<Type, fvsPatchField, surfaceMesh>& fld
@ -263,16 +263,13 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField
);
// Create flat field of internalField + all patch fields
Field<Type> flatFld(fld.mesh().nFaces(), pTraits<Type>::zero);
SubList<Type>(flatFld, fld.internalField().size()).assign
(
fld.internalField()
);
Field<Type> flatFld(fld.mesh().nFaces(), Type(Zero));
SubList<Type>(flatFld, fld.internalField().size()) = fld.internalField();
forAll(fld.boundaryField(), patchI)
{
const fvsPatchField<Type>& fvp = fld.boundaryField()[patchI];
SubList<Type>(flatFld, fvp.size(), fvp.patch().start()).assign(fvp);
SubList<Type>(flatFld, fvp.size(), fvp.patch().start()) = fvp;
}
// Map all faces
@ -293,7 +290,7 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Note: patchFields still on mesh, not baseMesh
PtrList<fvsPatchField<Type> > patchFields(fld.mesh().boundary().size());
PtrList<fvsPatchField<Type>> patchFields(fld.mesh().boundary().size());
const typename GeometricField
<
@ -321,7 +318,7 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField
}
PtrList<fvsPatchField<Type> > basePatchFields
PtrList<fvsPatchField<Type>> basePatchFields
(
baseMesh_.boundary().size()
);
@ -383,7 +380,7 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField
IOobject::NO_WRITE
);
return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
(
new GeometricField<Type, fvsPatchField, surfaceMesh>
(
@ -398,7 +395,7 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
Foam::parFvFieldReconstructor::reconstructFvSurfaceField
(
const IOobject& fieldIoObject
@ -440,7 +437,7 @@ void Foam::parFvFieldReconstructor::reconstructFvVolumeInternalFields
{
Info<< " " << fieldIter()->name() << endl;
tmp<DimensionedField<Type, volMesh> > tfld
tmp<DimensionedField<Type, volMesh>> tfld
(
reconstructFvVolumeInternalField<Type>(*fieldIter())
);
@ -484,7 +481,7 @@ void Foam::parFvFieldReconstructor::reconstructFvVolumeFields
{
Info<< " " << name << endl;
tmp<GeometricField<Type, fvPatchField, volMesh> > tfld
tmp<GeometricField<Type, fvPatchField, volMesh>> tfld
(
reconstructFvVolumeField<Type>(*fieldIter())
);
@ -525,7 +522,7 @@ void Foam::parFvFieldReconstructor::reconstructFvSurfaceFields
{
Info<< " " << fieldIter()->name() << endl;
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tfld
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tfld
(
reconstructFvSurfaceField<Type>(*fieldIter())
);

6
applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
View File

@ -142,7 +142,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
{
// List of lists of particles to be transfered for all of the
// neighbour processors
List<IDLList<passiveParticle> > particleTransferLists
List<IDLList<passiveParticle>> particleTransferLists
(
Pstream::nProcs()
);
@ -185,7 +185,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
// Start sending. Sets number of bytes transferred
labelListList allNTrans(Pstream::nProcs());
labelList allNTrans(Pstream::nProcs());
pBufs.finishedSends(allNTrans);
@ -208,7 +208,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
// Retrieve from receive buffers
forAll(allNTrans, procI)
{
label nRec = allNTrans[procI][Pstream::myProcNo()];
label nRec = allNTrans[procI];
//Pout<< "From processor " << procI << " receiving bytes " << nRec
// << endl;

12
applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
View File

@ -74,7 +74,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFields
{
const wordList objectNames
(
filterObjects<IOField<Type> >
filterObjects<IOField<Type>>
(
objects,
selectedFields
@ -125,7 +125,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFields
IOobject::NO_WRITE,
false
),
xferMove<Field<Type> >(field)
xferMove<Field<Type>>(field)
).write();
}
}
@ -146,7 +146,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
{
wordList objectNames
(
filterObjects<CompactIOField<Field<Type>, Type> >
filterObjects<CompactIOField<Field<Type>, Type>>
(
objects,
selectedFields
@ -157,7 +157,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
{
const wordList ioFieldNames
(
filterObjects<IOField<Field<Type> > >
filterObjects<IOField<Field<Type>>>
(
objects,
selectedFields
@ -212,7 +212,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
IOobject::NO_WRITE,
false
),
xferMove<Field<Field<Type> > >(field)
xferMove<Field<Field<Type>>>(field)
).write();
}
}
@ -309,7 +309,7 @@ void Foam::parLagrangianRedistributor::redistributeStoredLagrangianFields
IOobject::NO_WRITE,
false
),
xferMove<Field<typename Container::value_type> >(field)
xferMove<Field<typename Container::value_type>>(field)
).write();
}
}

84
applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View File

@ -577,7 +577,7 @@ void readField
const IOobject& io,
const fvMesh& mesh,
const label i,
PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields
PtrList<GeometricField<Type, PatchField, GeoMesh>>& fields
)
{
fields.set
@ -829,11 +829,11 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
PtrList<surfaceSymmTensorField> surfSymmTensorFields;
PtrList<surfaceTensorField> surfTensorFields;
PtrList<DimensionedField<scalar, volMesh> > dimScalarFields;
PtrList<DimensionedField<vector, volMesh> > dimVectorFields;
PtrList<DimensionedField<sphericalTensor, volMesh> > dimSphereTensorFields;
PtrList<DimensionedField<symmTensor, volMesh> > dimSymmTensorFields;
PtrList<DimensionedField<tensor, volMesh> > dimTensorFields;
PtrList<DimensionedField<scalar, volMesh>> dimScalarFields;
PtrList<DimensionedField<vector, volMesh>> dimVectorFields;
PtrList<DimensionedField<sphericalTensor, volMesh>> dimSphereTensorFields;
PtrList<DimensionedField<symmTensor, volMesh>> dimSymmTensorFields;
PtrList<DimensionedField<tensor, volMesh>> dimTensorFields;
if (doReadFields)
@ -1815,21 +1815,21 @@ void readLagrangian
//Pout<< "Found clould objects:" << sprayObjs.names() << endl;
parLagrangianRedistributor::readLagrangianFields
<IOField<label> >
<IOField<label>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<IOField<Field<label> > >
<IOField<Field<label>>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<CompactIOField<Field<label>, label> >
<CompactIOField<Field<label>, label>>
(
clouds[i],
sprayObjs,
@ -1838,21 +1838,21 @@ void readLagrangian
parLagrangianRedistributor::readLagrangianFields
<IOField<scalar> >
<IOField<scalar>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<IOField<Field<scalar> > >
<IOField<Field<scalar>>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<CompactIOField<Field<scalar>, scalar> >
<CompactIOField<Field<scalar>, scalar>>
(
clouds[i],
sprayObjs,
@ -1861,21 +1861,21 @@ void readLagrangian
parLagrangianRedistributor::readLagrangianFields
<IOField<vector> >
<IOField<vector>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<IOField<Field<vector> > >
<IOField<Field<vector>>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<CompactIOField<Field<vector>, vector> >
<CompactIOField<Field<vector>, vector>>
(
clouds[i],
sprayObjs,
@ -1884,21 +1884,21 @@ void readLagrangian
parLagrangianRedistributor::readLagrangianFields
<IOField<sphericalTensor> >
<IOField<sphericalTensor>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<IOField<Field<sphericalTensor> > >
<IOField<Field<sphericalTensor>>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<CompactIOField<Field<sphericalTensor>, sphericalTensor> >
<CompactIOField<Field<sphericalTensor>, sphericalTensor>>
(
clouds[i],
sprayObjs,
@ -1907,21 +1907,21 @@ void readLagrangian
parLagrangianRedistributor::readLagrangianFields
<IOField<symmTensor> >
<IOField<symmTensor>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<IOField<Field<symmTensor> > >
<IOField<Field<symmTensor>>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<CompactIOField<Field<symmTensor>, symmTensor> >
<CompactIOField<Field<symmTensor>, symmTensor>>
(
clouds[i],
sprayObjs,
@ -1930,21 +1930,21 @@ void readLagrangian
parLagrangianRedistributor::readLagrangianFields
<IOField<tensor> >
<IOField<tensor>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<IOField<Field<tensor> > >
<IOField<Field<tensor>>>
(
clouds[i],
sprayObjs,
selectedLagrangianFields
);
parLagrangianRedistributor::readLagrangianFields
<CompactIOField<Field<tensor>, tensor> >
<CompactIOField<Field<tensor>, tensor>>
(
clouds[i],
sprayObjs,
@ -1987,19 +1987,19 @@ void redistributeLagrangian
distributor.redistributeLagrangianPositions(clouds[i]);
distributor.redistributeStoredLagrangianFields
<IOField<label> >
<IOField<label>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<IOField<Field<label> > >
<IOField<Field<label>>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<CompactIOField<Field<label>, label> >
<CompactIOField<Field<label>, label>>
(
lagrangianMap,
clouds[i]
@ -2007,19 +2007,19 @@ void redistributeLagrangian
distributor.redistributeStoredLagrangianFields
<IOField<scalar> >
<IOField<scalar>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<IOField<Field<scalar> > >
<IOField<Field<scalar>>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<CompactIOField<Field<scalar>, scalar> >
<CompactIOField<Field<scalar>, scalar>>
(
lagrangianMap,
clouds[i]
@ -2027,19 +2027,19 @@ void redistributeLagrangian
distributor.redistributeStoredLagrangianFields
<IOField<vector> >
<IOField<vector>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<IOField<Field<vector> > >
<IOField<Field<vector>>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<CompactIOField<Field<vector>, vector> >
<CompactIOField<Field<vector>, vector>>
(
lagrangianMap,
clouds[i]
@ -2047,19 +2047,19 @@ void redistributeLagrangian
distributor.redistributeStoredLagrangianFields
<IOField<sphericalTensor> >
<IOField<sphericalTensor>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<IOField<Field<sphericalTensor> > >
<IOField<Field<sphericalTensor>>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<CompactIOField<Field<sphericalTensor>, sphericalTensor> >
<CompactIOField<Field<sphericalTensor>, sphericalTensor>>
(
lagrangianMap,
clouds[i]
@ -2067,19 +2067,19 @@ void redistributeLagrangian
distributor.redistributeStoredLagrangianFields
<IOField<symmTensor> >
<IOField<symmTensor>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<IOField<Field<symmTensor> > >
<IOField<Field<symmTensor>>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<CompactIOField<Field<symmTensor>, symmTensor> >
<CompactIOField<Field<symmTensor>, symmTensor>>
(
lagrangianMap,
clouds[i]
@ -2087,19 +2087,19 @@ void redistributeLagrangian
distributor.redistributeStoredLagrangianFields
<IOField<tensor> >
<IOField<tensor>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<IOField<Field<tensor> > >
<IOField<Field<tensor>>>
(
lagrangianMap,
clouds[i]
);
distributor.redistributeStoredLagrangianFields
<CompactIOField<Field<tensor>, tensor> >
<CompactIOField<Field<tensor>, tensor>>
(
lagrangianMap,
clouds[i]

16
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -66,7 +66,7 @@ volField
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> >
tmp<GeometricField<Type, fvPatchField, volMesh>>
volField
(
const fvMeshSubset& meshSubsetter,
@ -83,7 +83,7 @@ volField
IOobject io(df);
io.readOpt() = IOobject::NO_READ;
tmp<GeometricField<Type, fvPatchField, volMesh> > tvf
tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
(
new GeometricField<Type, fvPatchField, volMesh>
(
@ -93,18 +93,18 @@ volField
zeroGradientFvPatchField<scalar>::typeName
)
);
tvf().internalField() = df;
tvf().correctBoundaryConditions();
tvf.ref().internalField() = df;
tvf.ref().correctBoundaryConditions();
const GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
if (meshSubsetter.hasSubMesh())
{
tmp<GeometricField<Type, fvPatchField, volMesh> > tfld
tmp<GeometricField<Type, fvPatchField, volMesh>> tfld
(
meshSubsetter.interpolate(vf)
);
tfld().checkOut();
tfld().rename(vf.name());
tfld.ref().checkOut();
tfld.ref().rename(vf.name());
return tfld;
}
else

2
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
View File

@ -51,7 +51,7 @@ volField
//- Wrapper to convert dimensionedInternalField to volField
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
volField
(
const Foam::fvMeshSubset&,

2
applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
View File

@ -706,7 +706,7 @@ int main(int argc, char *argv[])
IOobject::MUST_READ
);
bool fieldExists = fieldObject.typeHeaderOk<IOField<scalar> >
bool fieldExists = fieldObject.typeHeaderOk<IOField<scalar>>
(
false
);

2
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
View File

@ -73,7 +73,7 @@ for (label i=0; i < nTypes; i++)
if
(
lagrangianHeader.typeHeaderOk<IOPosition<Cloud<passiveParticle> > >
lagrangianHeader.typeHeaderOk<IOPosition<Cloud<passiveParticle>>>
(
false
)

6
applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -98,7 +98,7 @@ public:
template<class Type, class GeoMesh>
void write
(
const PtrList<DimensionedField<Type, volMesh> >& flds
const PtrList<DimensionedField<Type, volMesh>>& flds
);
//- Interpolate and write volFields
@ -114,7 +114,7 @@ public:
void write
(
const volPointInterpolation&,
const PtrList<DimensionedField<Type, volMesh> >&
const PtrList<DimensionedField<Type, volMesh>>&
);
};

4
applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
View File

@ -44,7 +44,7 @@ void Foam::internalWriter::write
template<class Type, class GeoMesh>
void Foam::internalWriter::write
(
const PtrList<DimensionedField<Type, volMesh> >& flds
const PtrList<DimensionedField<Type, volMesh>>& flds
)
{
forAll(flds, i)
@ -79,7 +79,7 @@ template<class Type, class GeoMesh>
void Foam::internalWriter::write
(
const volPointInterpolation& pInterp,
const PtrList<DimensionedField<Type, volMesh> >& flds
const PtrList<DimensionedField<Type, volMesh>>& flds
)
{
forAll(flds, i)

2
applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
View File

@ -156,7 +156,7 @@ public:
(
std::ostream&,
const bool binary,
const PtrList<DimensionedField<Type, volMesh> >&,
const PtrList<DimensionedField<Type, volMesh>>&,
const vtkMesh&
);

2
applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
View File

@ -177,7 +177,7 @@ void Foam::writeFuns::write
(
std::ostream& os,
const bool binary,
const PtrList<DimensionedField<Type, volMesh> >& flds,
const PtrList<DimensionedField<Type, volMesh>>& flds,
const vtkMesh& vMesh
)
{

4
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H
View File

@ -487,7 +487,7 @@ class vtkPVFoam
template<class Type>
void convertVolField
(
const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
const PtrList<PrimitivePatchInterpolation<primitivePatch>>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const bool interpFields,
vtkMultiBlockDataSet* output
@ -509,7 +509,7 @@ class vtkPVFoam
void convertDimFields
(
const fvMesh&,
const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
const PtrList<PrimitivePatchInterpolation<primitivePatch>>&,
const IOobjectList&,
const bool interpFields,
vtkMultiBlockDataSet* output

12
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -100,27 +100,27 @@ void Foam::vtkPVFoam::updateInfoFields
);
//- Add dimensioned fields to GUI
addToSelection<DimensionedField<scalar, meshType> >
addToSelection<DimensionedField<scalar, meshType>>
(
select,
objects
);
addToSelection<DimensionedField<vector, meshType> >
addToSelection<DimensionedField<vector, meshType>>
(
select,
objects
);
addToSelection<DimensionedField<sphericalTensor, meshType> >
addToSelection<DimensionedField<sphericalTensor, meshType>>
(
select,
objects
);
addToSelection<DimensionedField<symmTensor, meshType> >
addToSelection<DimensionedField<symmTensor, meshType>>
(
select,
objects
);
addToSelection<DimensionedField<tensor, meshType> >
addToSelection<DimensionedField<tensor, meshType>>
(
select,
objects

14
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H
View File

@ -51,7 +51,7 @@ template<class Type>
<<<<<<< HEAD:applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
void Foam::vtkPV4Foam::convertVolField
(
const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
const GeometricField<Type, fvPatchField, volMesh>& tf,
=======
void Foam::vtkPVFoam::convertVolFields
@ -68,7 +68,7 @@ void Foam::vtkPVFoam::convertVolFields
const polyBoundaryMesh& patches = mesh.boundaryMesh();
// Interpolated field (demand driven)
autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
autoPtr<GeometricField<Type, pointPatchField, pointMesh>> ptfPtr;
if (interpFields)
{
if (debug)
@ -157,7 +157,7 @@ void Foam::vtkPVFoam::convertVolFields
if
(
isType<emptyFvPatchField<Type> >(ptf)
isType<emptyFvPatchField<Type>>(ptf)
||
(
reader_->GetExtrapolatePatches()
@ -167,7 +167,7 @@ void Foam::vtkPVFoam::convertVolFields
{
fvPatch p(ptf.patch().patch(), mesh.boundary());
tmp<Field<Type> > tpptf
tmp<Field<Type>> tpptf
(
<<<<<<< HEAD:applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
fvPatchField<Type>(p, tf).patchInternalField()
@ -313,7 +313,7 @@ template<class Type>
void Foam::vtkPV4Foam::convertVolFields
(
const fvMesh& mesh,
const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
const IOobjectList& objects,
const bool interpFields,
vtkMultiBlockDataSet* output
@ -348,7 +348,7 @@ template<class Type>
void Foam::vtkPV4Foam::convertDimFields
(
const fvMesh& mesh,
const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
const IOobjectList& objects,
const bool interpFields,
vtkMultiBlockDataSet* output
@ -375,7 +375,7 @@ void Foam::vtkPV4Foam::convertDimFields
IOobject io(dimFld);
io.readOpt() = IOobject::NO_READ;
PtrList<fvPatchField<Type> > patchFields(mesh.boundary().size());
PtrList<fvPatchField<Type>> patchFields(mesh.boundary().size());
forAll(patchFields, patchI)
{
patchFields.set

2
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
View File

@ -171,7 +171,7 @@ int USERD_set_filenames
false
);
if (sprayHeader.typeHeaderOk<Cloud<passiveParticle> >(false))
if (sprayHeader.typeHeaderOk<Cloud<passiveParticle>>(false))
{
Info<< "[Found lagrangian]" << endl;

10
applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
View File

@ -74,7 +74,7 @@ Foam::tmp<Foam::volVectorField> createSimplifiedU(const volVectorField& U)
);
// Assign the internal value to the original field
tU() = U;
tU.ref() = U;
return tU;
}
@ -94,7 +94,7 @@ void correctProcessorPatches(volScalarField& vf)
forAll(bf, patchI)
{
if (isA<processorFvPatchField<scalar> >(bf[patchI]))
if (isA<processorFvPatchField<scalar>>(bf[patchI]))
{
bf[patchI].initEvaluate();
}
@ -102,7 +102,7 @@ void correctProcessorPatches(volScalarField& vf)
forAll(bf, patchI)
{
if (isA<processorFvPatchField<scalar> >(bf[patchI]))
if (isA<processorFvPatchField<scalar>>(bf[patchI]))
{
bf[patchI].evaluate();
}
@ -128,7 +128,7 @@ void blendField
false
);
if (fieldHeader.headerOk())
if (fieldHeader.typeHeaderOk<volScalarField>(true))
{
volScalarField fld(fieldHeader, mesh);
scalarField& internalField = fld.internalField();
@ -236,7 +236,7 @@ tmp<volScalarField> calcNut
basicThermo::dictName,
runTime.constant(),
mesh
).headerOk()
).typeHeaderOk<IOdictionary>(true)
)
{
// Compressible

2
applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
View File

@ -94,7 +94,7 @@ private:
List<wordList> fieldTypes_;
//- Field dimensions
List<PtrList<dimensionSet> > fieldDimensions_;
List<PtrList<dimensionSet>> fieldDimensions_;
// Public member functions

6
applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
View File

@ -74,7 +74,7 @@ void rewriteBoundary
HashTable<word>& nbrNames
)
{
Info<< "Reading boundary from " << typeFilePath<IOPtrList<entry> >(io)
Info<< "Reading boundary from " << typeFilePath<IOPtrList<entry>>(io)
<< endl;
// Read PtrList of dictionary.
@ -447,7 +447,7 @@ int main(int argc, char *argv[])
false
);
if (io.typeHeaderOk<IOPtrList<entry> >(false))
if (io.typeHeaderOk<IOPtrList<entry>>(false))
{
rewriteBoundary
(
@ -481,7 +481,7 @@ int main(int argc, char *argv[])
false
);
if (io.typeHeaderOk<IOPtrList<entry> >(false))
if (io.typeHeaderOk<IOPtrList<entry>>(false))
{
rewriteBoundary
(

15
applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
View File

@ -335,7 +335,7 @@ int main(int argc, char *argv[])
const polyBoundaryMesh& coarsePatches = coarseMesh.boundaryMesh();
labelList viewFactorsPatches(patches.findIndices(viewFactorWall));
forAll (viewFactorsPatches, i)
forAll(viewFactorsPatches, i)
{
label patchI = viewFactorsPatches[i];
nCoarseFaces += coarsePatches[patchI].size();
@ -413,14 +413,14 @@ int main(int argc, char *argv[])
(
availablePoints,
upp.faceCentres().size()
).assign(upp.faceCentres());
) = upp.faceCentres();
SubList<point>
(
availablePoints,
upp.localPoints().size(),
upp.faceCentres().size()
).assign(upp.localPoints());
) = upp.localPoints();
point cfo = cf;
scalar dist = GREAT;
@ -783,24 +783,17 @@ int main(int argc, char *argv[])
const labelList& agglom = finalAgglom[patchID];
if (agglom.size() > 0)
{
<<<<<<< HEAD
label nAgglom = max(agglom)+1;
labelListList coarseToFine(invertOneToMany(nAgglom, agglom));
const labelList& coarsePatchFace =
coarseMesh.patchFaceMap()[patchID];
forAll(coarseToFine, coarseI)
=======
const scalar Fij = sum(F[compactI]);
const label coarseFaceID = coarsePatchFace[coarseI];
const labelList& fineFaces = coarseToFine[coarseFaceID];
forAll(fineFaces, fineId)
>>>>>>> foundation
{
const scalar Fij = sum(F[compactI]);
const label coarseFaceID = coarsePatchFace[coarseI];
const labelList& fineFaces = coarseToFine[coarseFaceID];
forAll (fineFaces, fineId)
forAll(fineFaces, fineId)
{
const label faceID = fineFaces[fineId];
viewFactorField.boundaryField()[patchID][faceID] = Fij;

14
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -607,7 +607,7 @@ labelPair edgeIntersectionsCGAL
const labelList& meshPoints = surf.meshPoints();
//Info<< "Intersecting CGAL surface ..." << endl;
List<List<pointIndexHit> > intersections(edges.size());
List<List<pointIndexHit>> intersections(edges.size());
labelListList classifications(edges.size());
label nPoints = 0;
@ -1006,12 +1006,12 @@ void calcEdgeCutsBitsCGAL
{
edgeCuts1 = edgeIntersections
(
List<List<pointIndexHit> >(surf1.nEdges()),
List<List<pointIndexHit>>(surf1.nEdges()),
labelListList(surf1.nEdges())
);
edgeCuts2 = edgeIntersections
(
List<List<pointIndexHit> >(surf2.nEdges()),
List<List<pointIndexHit>>(surf2.nEdges()),
labelListList(surf2.nEdges())
);
@ -1247,8 +1247,8 @@ autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
(
2*nFeatEds
);
List<DynamicList<label> > edgeNormals(nFeatEds);
List<DynamicList<label> > normalDirections(nFeatEds);
List<DynamicList<label>> edgeNormals(nFeatEds);
List<DynamicList<label>> normalDirections(nFeatEds);
const triSurface& s1 = surf1;
@ -1570,7 +1570,7 @@ int main(int argc, char *argv[])
}
List<Pair<word> > surfaceAndSide;
List<Pair<word>> surfaceAndSide;
if (args.optionReadIfPresent("trim", surfaceAndSide))
{
Info<< "Trimming edges with " << surfaceAndSide << endl;

6
applications/utilities/surface/surfaceInflate/surfaceInflate.C
View File

@ -90,7 +90,7 @@ tmp<vectorField> calcVertexNormals(const triSurface& surf)
(
new pointField(surf.nPoints(), vector::zero)
);
vectorField& pointNormals = tpointNormals();
vectorField& pointNormals = tpointNormals.ref();
const pointField& points = surf.points();
const labelListList& pointFaces = surf.pointFaces();
@ -134,7 +134,7 @@ tmp<vectorField> calcPointNormals
{
//const pointField pointNormals(s.pointNormals());
tmp<vectorField> tpointNormals(calcVertexNormals(s));
vectorField& pointNormals = tpointNormals();
vectorField& pointNormals = tpointNormals.ref();
// feature edges: create edge normals from edgeFaces only.
@ -356,7 +356,7 @@ tmp<scalarField> avg
)
{
tmp<scalarField> tres(new scalarField(s.nPoints(), 0.0));
scalarField& res = tres();
scalarField& res = tres.ref();
scalarField sumWeight(s.nPoints(), 0.0);

2
etc/config.sh/settings
View File

@ -125,7 +125,7 @@ SunOS)
/bin/cat <<USAGE 1>&2
Your "$WM_ARCH" operating system is not supported by this release
of OpenFOAM. For further assistance, please contact www.OpenFOAM.org
of OpenFOAM. For further assistance, please contact www.OpenFOAM.com
USAGE
;;

1
src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
View File

@ -44,7 +44,6 @@ Foam::UPtrList<T>::UPtrList(const label s)
template<class T>
<<<<<<< HEAD
Foam::UPtrList<T>::UPtrList(UList<T>& lst)
:
ptrs_(lst.size())

2
src/OpenFOAM/db/IOobjectList/IOobjectList.C
View File

@ -78,7 +78,7 @@ Foam::IOobjectList::IOobjectList
);
// Use object with local scope
if (objectPtr->typeHeaderOk<IOList<label> >(false))
if (objectPtr->typeHeaderOk<IOList<label>>(false))
{
insert(ObjectNames[i], objectPtr);
}

12
src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.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.
@ -33,7 +33,7 @@ Foam::GlobalIOField<Type>::GlobalIOField(const IOobject& io)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<GlobalIOField<Type> >();
warnNoRereading<GlobalIOField<Type>>();
readHeaderOk(IOstream::BINARY, typeName);
}
@ -45,7 +45,7 @@ Foam::GlobalIOField<Type>::GlobalIOField(const IOobject& io, const label size)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<GlobalIOField<Type> >();
warnNoRereading<GlobalIOField<Type>>();
if (!readHeaderOk(IOstream::BINARY, typeName))
{
@ -64,7 +64,7 @@ Foam::GlobalIOField<Type>::GlobalIOField
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<GlobalIOField<Type> >();
warnNoRereading<GlobalIOField<Type>>();
if (!readHeaderOk(IOstream::BINARY, typeName))
{
@ -77,13 +77,13 @@ template<class Type>
Foam::GlobalIOField<Type>::GlobalIOField
(
const IOobject& io,
const Xfer<Field<Type> >& f
const Xfer<Field<Type>>& f
)
:
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<GlobalIOField<Type> >();
warnNoRereading<GlobalIOField<Type>>();
Field<Type>::transfer(f());

4
src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H
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.
@ -71,7 +71,7 @@ public:
GlobalIOField(const IOobject&, const Field<Type>&);
//- Construct by transferring the Field contents
GlobalIOField(const IOobject&, const Xfer<Field<Type> >&);
GlobalIOField(const IOobject&, const Xfer<Field<Type>>&);
//- Destructor

12
src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.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.
@ -33,7 +33,7 @@ Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<GlobalIOList<Type> >();
warnNoRereading<GlobalIOList<Type>>();
readHeaderOk(IOstream::BINARY, typeName);
}
@ -45,7 +45,7 @@ Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io, const label size)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<GlobalIOList<Type> >();
warnNoRereading<GlobalIOList<Type>>();
if (!readHeaderOk(IOstream::BINARY, typeName))
{
@ -60,7 +60,7 @@ Foam::GlobalIOList<Type>::GlobalIOList(const IOobject& io, const List<Type>& f)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<GlobalIOList<Type> >();
warnNoRereading<GlobalIOList<Type>>();
if (!readHeaderOk(IOstream::BINARY, typeName))
{
@ -73,13 +73,13 @@ template<class Type>
Foam::GlobalIOList<Type>::GlobalIOList
(
const IOobject& io,
const Xfer<List<Type> >& f
const Xfer<List<Type>>& f
)
:
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<GlobalIOList<Type> >();
warnNoRereading<GlobalIOList<Type>>();
List<Type>::transfer(f());

2
src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H
View File

@ -71,7 +71,7 @@ public:
GlobalIOList(const IOobject&, const List<Type>&);
//- Construct by transferring the List contents
GlobalIOList(const IOobject&, const Xfer<List<Type> >&);
GlobalIOList(const IOobject&, const Xfer<List<Type>>&);
//- Destructor

10
src/OpenFOAM/db/IOobjects/IOField/IOField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -33,7 +33,7 @@ Foam::IOField<Type>::IOField(const IOobject& io)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<IOField<Type> >();
warnNoRereading<IOField<Type>>();
if
(
@ -56,7 +56,7 @@ Foam::IOField<Type>::IOField(const IOobject& io, const label size)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<IOField<Type> >();
warnNoRereading<IOField<Type>>();
if
(
@ -83,7 +83,7 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<IOField<Type> >();
warnNoRereading<IOField<Type>>();
if
(
@ -110,7 +110,7 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type>>& f)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<IOField<Type> >();
warnNoRereading<IOField<Type>>();
Field<Type>::transfer(f());

10
src/OpenFOAM/db/IOobjects/IOList/IOList.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -33,7 +33,7 @@ Foam::IOList<T>::IOList(const IOobject& io)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<IOList<T> >();
warnNoRereading<IOList<T>>();
if
(
@ -56,7 +56,7 @@ Foam::IOList<T>::IOList(const IOobject& io, const label size)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<IOList<T> >();
warnNoRereading<IOList<T>>();
if
(
@ -83,7 +83,7 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<IOList<T> >();
warnNoRereading<IOList<T>>();
if
(
@ -110,7 +110,7 @@ Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T>>& list)
regIOobject(io)
{
// Check for MUST_READ_IF_MODIFIED
warnNoRereading<IOList<T> >();
warnNoRereading<IOList<T>>();
List<T>::transfer(list());

2
src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C
View File

@ -32,7 +32,7 @@ namespace Foam
//- Template specialisation for obtaining filePath
template<>
fileName typeFilePath<IOMap<dictionary> >(const IOobject& io)
fileName typeFilePath<IOMap<dictionary>>(const IOobject& io)
{
return io.globalFilePath();
}

8
src/OpenFOAM/db/Time/findInstance.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -64,7 +64,7 @@ Foam::word Foam::Time::findInstance
timeName(),
dir,
*this
).typeHeaderOk<IOList<label> >(false) // use object with local scope
).typeHeaderOk<IOList<label>>(false) // use object with local scope
)
)
{
@ -109,7 +109,7 @@ Foam::word Foam::Time::findInstance
ts[instanceI].name(),
dir,
*this
).typeHeaderOk<IOList<label> >(false)
).typeHeaderOk<IOList<label>>(false)
)
)
{
@ -182,7 +182,7 @@ Foam::word Foam::Time::findInstance
constant(),
dir,
*this
).typeHeaderOk<IOList<label> >(false)
).typeHeaderOk<IOList<label>>(false)
)
)
{

8
src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.H
View File

@ -134,7 +134,7 @@ public:
Type getProperty
(
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve generic property
@ -151,7 +151,7 @@ public:
(
const word& objectName,
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve generic property from named object
@ -197,7 +197,7 @@ public:
Type getResult
(
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve result from named object
@ -206,7 +206,7 @@ public:
(
const word& objectName,
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve result from named object

1
src/OpenFOAM/db/regIOobject/regIOobjectRead.C
View File

@ -365,6 +365,7 @@ bool Foam::regIOobject::read()
{
// Re-watch master file
addWatch();
}
return ok;
}

8
src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
View File

@ -129,7 +129,7 @@ public:
const word&,
const dictionary&,
const dimensionSet& dims = dimless,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
);
//- Construct from dictionary dimensionless with value.
@ -137,7 +137,7 @@ public:
(
const word&,
const dictionary&,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
);
//- Construct from dictionary, with default value.
@ -147,7 +147,7 @@ public:
const word&,
dictionary&,
const dimensionSet& dims = dimless,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
);
//- Construct from dictionary, dimensionless with default value.
@ -156,7 +156,7 @@ public:
(
const word&,
dictionary&,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
);

16
src/OpenFOAM/fields/Fields/Field/Field.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -167,14 +167,9 @@ Foam::Field<Type>::Field
template<class Type>
Foam::Field<Type>::Field
(
<<<<<<< HEAD
const tmp<Field<Type> >& tmapF,
const tmp<Field<Type>>& tmapF,
const FieldMapper& mapper,
const bool applyFlip
=======
const tmp<Field<Type>>& tmapF,
const FieldMapper& mapper
>>>>>>> foundation
)
:
List<Type>(mapper.size())
@ -504,14 +499,9 @@ void Foam::Field<Type>::map
template<class Type>
void Foam::Field<Type>::map
(
<<<<<<< HEAD
const tmp<Field<Type> >& tmapF,
const tmp<Field<Type>>& tmapF,
const FieldMapper& mapper,
const bool applyFlip
=======
const tmp<Field<Type>>& tmapF,
const FieldMapper& mapper
>>>>>>> foundation
)
{
map(tmapF(), mapper, applyFlip);

16
src/OpenFOAM/fields/Fields/Field/Field.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -185,14 +185,9 @@ public:
//- Construct by mapping from the given tmp field
Field
(
<<<<<<< HEAD
const tmp<Field<Type> >& tmapF,
const tmp<Field<Type>>& tmapF,
const FieldMapper& map,
const bool applyFlip = true
=======
const tmp<Field<Type>>& tmapF,
const FieldMapper& map
>>>>>>> foundation
);
//- Construct by mapping from the given tmp field. Supplied uniform
@ -290,14 +285,9 @@ public:
//- Map from the given tmp field
void map
(
<<<<<<< HEAD
const tmp<Field<Type> >& tmapF,
const tmp<Field<Type>>& tmapF,
const FieldMapper& map,
const bool applyFlip = true
=======
const tmp<Field<Type>>& tmapF,
const FieldMapper& map
>>>>>>> foundation
);
//- Map from self

22
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -31,14 +31,14 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define checkField(gf1, gf2, op) \
if ((gf1).mesh() != (gf2).mesh()) \
{ \
FatalErrorInFunction \
<< "different mesh for fields " \
<< (gf1).name() << " and " << (gf2).name() \
<< " during operation " << op \
<< abort(FatalError); \
#define checkField(gf1, gf2, op) \
if ((gf1).mesh() != (gf2).mesh()) \
{ \
FatalErrorInFunction \
<< "different mesh for fields " \
<< (gf1).name() << " and " << (gf2).name() \
<< " during operation " << op \
<< abort(FatalError); \
}
@ -108,7 +108,7 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::readIfPresent()
else if
(
this->readOpt() == IOobject::READ_IF_PRESENT
&& this->template typeHeaderOk<GeometricField<Type, PatchField, GeoMesh> >
&& this->template typeHeaderOk<GeometricField<Type, PatchField, GeoMesh>>
(
true
)
@ -151,7 +151,7 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::readOldTimeIfPresent()
if
(
field0.template typeHeaderOk<GeometricField<Type, PatchField, GeoMesh> >
field0.template typeHeaderOk<GeometricField<Type, PatchField, GeoMesh>>
(
true
)

2
src/OpenFOAM/fields/ReadFields/ReadFields.H
View File

@ -57,7 +57,7 @@ wordList ReadFields
(
const typename GeoMesh::Mesh& mesh,
const IOobjectList& objects,
PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields,
PtrList<GeometricField<Type, PatchField, GeoMesh>>& fields,
const bool syncPar = true,
const bool readOldTime = false
);

2
src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C
View File

@ -36,7 +36,7 @@ Foam::wordList Foam::ReadFields
(
const typename GeoMesh::Mesh& mesh,
const IOobjectList& objects,
PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields,
PtrList<GeometricField<Type, PatchField, GeoMesh>>& fields,
const bool syncPar,
const bool readOldTime
)

6
src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
View File

@ -78,7 +78,7 @@ uniformFixedValuePointPatchField
)
:
fixedValuePointPatchField<Type>(ptf, p, iF, mapper),
uniformValue_(ptf.uniformValue_().clone().ptr())
uniformValue_(ptf.uniformValue_, false)
{
// For safety re-evaluate
const scalar t = this->db().time().timeOutputValue();
@ -94,7 +94,7 @@ uniformFixedValuePointPatchField
)
:
fixedValuePointPatchField<Type>(ptf),
uniformValue_(ptf.uniformValue_().clone().ptr())
uniformValue_(ptf.uniformValue_, false)
{}
@ -107,7 +107,7 @@ uniformFixedValuePointPatchField
)
:
fixedValuePointPatchField<Type>(ptf, iF),
uniformValue_(ptf.uniformValue_().clone().ptr())
uniformValue_(ptf.uniformValue_, false)
{
// For safety re-evaluate
const scalar t = this->db().time().timeOutputValue();

4
src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
View File

@ -122,8 +122,8 @@ public:
(
const word& solverName,
const word& fieldName,
const Type& iRes = pTraits<Type>::zero,
const Type& fRes = pTraits<Type>::zero,
const Type& iRes = Type(Zero),
const Type& fRes = Type(Zero),
const label nIter = 0,
const bool converged = false,
const bool singular = false

4
src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
View File

@ -139,7 +139,7 @@ void Foam::LUBacksubstitute
sum -= luMatrixi[j]*sourceSol[j];
}
}
else if (sum != pTraits<Type>::zero)
else if (sum != Type(Zero))
{
ii = i+1;
}
@ -185,7 +185,7 @@ void Foam::LUBacksubstitute
sum -= luMatrixi[j]*sourceSol[j];
}
}
else if (sum != pTraits<Type>::zero)
else if (sum != Type(Zero))
{
ii = i+1;
}

22
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.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 | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -50,7 +50,7 @@ Foam::List<Foam::labelPair> Foam::mapDistributeBase::schedule
List<labelPair> allComms;
{
HashSet<labelPair, labelPair::Hash<> > commsSet(Pstream::nProcs());
HashSet<labelPair, labelPair::Hash<>> commsSet(Pstream::nProcs());
// Find what communication is required
forAll(subMap, procI)
@ -280,7 +280,7 @@ void Foam::mapDistributeBase::calcCompactAddressing
(
const globalIndex& globalNumbering,
const labelList& elements,
List<Map<label> >& compactMap
List<Map<label>>& compactMap
) const
{
compactMap.setSize(Pstream::nProcs());
@ -329,7 +329,7 @@ void Foam::mapDistributeBase::calcCompactAddressing
(
const globalIndex& globalNumbering,
const labelListList& cellCells,
List<Map<label> >& compactMap
List<Map<label>>& compactMap
) const
{
compactMap.setSize(Pstream::nProcs());
@ -389,7 +389,7 @@ void Foam::mapDistributeBase::exchangeAddressing
const int tag,
const globalIndex& globalNumbering,
labelList& elements,
List<Map<label> >& compactMap,
List<Map<label>>& compactMap,
labelList& compactStart
)
{
@ -446,12 +446,10 @@ void Foam::mapDistributeBase::exchangeAddressing
}
subMap_.setSize(Pstream::nProcs());
labelListList sendSizes;
Pstream::exchange<labelList, label>
(
wantedRemoteElements,
subMap_,
sendSizes,
tag,
Pstream::worldComm //TBD
);
@ -469,7 +467,7 @@ void Foam::mapDistributeBase::exchangeAddressing
const int tag,
const globalIndex& globalNumbering,
labelListList& cellCells,
List<Map<label> >& compactMap,
List<Map<label>>& compactMap,
labelList& compactStart
)
{
@ -526,12 +524,10 @@ void Foam::mapDistributeBase::exchangeAddressing
}
subMap_.setSize(Pstream::nProcs());
labelListList sendSizes;
Pstream::exchange<labelList, label>
(
wantedRemoteElements,
subMap_,
sendSizes,
tag,
Pstream::worldComm //TBD
);
@ -658,7 +654,7 @@ Foam::mapDistributeBase::mapDistributeBase
(
const globalIndex& globalNumbering,
labelList& elements,
List<Map<label> >& compactMap,
List<Map<label>>& compactMap,
const int tag
)
:
@ -718,7 +714,7 @@ Foam::mapDistributeBase::mapDistributeBase
(
const globalIndex& globalNumbering,
labelListList& cellCells,
List<Map<label> >& compactMap,
List<Map<label>>& compactMap,
const int tag
)
:
@ -824,7 +820,7 @@ Foam::Xfer<Foam::mapDistributeBase> Foam::mapDistributeBase::xfer()
Foam::label Foam::mapDistributeBase::renumber
(
const globalIndex& globalNumbering,
const List<Map<label> >& compactMap,
const List<Map<label>>& compactMap,
const label globalI
)
{

18
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
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 | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -112,7 +112,7 @@ protected:
//- Schedule
mutable autoPtr<List<labelPair> > schedulePtr_;
mutable autoPtr<List<labelPair>> schedulePtr_;
// Private Member Functions
@ -128,13 +128,13 @@ protected:
(
const globalIndex& globalNumbering,
const labelList& elements,
List<Map<label> >& compactMap
List<Map<label>>& compactMap
) const;
void calcCompactAddressing
(
const globalIndex& globalNumbering,
const labelListList& elements,
List<Map<label> >& compactMap
List<Map<label>>& compactMap
) const;
void exchangeAddressing
@ -142,7 +142,7 @@ protected:
const int tag,
const globalIndex& globalNumbering,
labelList& elements,
List<Map<label> >& compactMap,
List<Map<label>>& compactMap,
labelList& compactStart
);
void exchangeAddressing
@ -150,7 +150,7 @@ protected:
const int tag,
const globalIndex& globalNumbering,
labelListList& elements,
List<Map<label> >& compactMap,
List<Map<label>>& compactMap,
labelList& compactStart
);
@ -212,7 +212,7 @@ public:
(
const globalIndex&,
labelList& elements,
List<Map<label> >& compactMap,
List<Map<label>>& compactMap,
const int tag = Pstream::msgType()
);
@ -223,7 +223,7 @@ public:
(
const globalIndex&,
labelListList& cellCells,
List<Map<label> >& compactMap,
List<Map<label>>& compactMap,
const int tag = Pstream::msgType()
);
@ -326,7 +326,7 @@ public:
static label renumber
(
const globalIndex&,
const List<Map<label> >& compactMap,
const List<Map<label>>& compactMap,
const label globalElement
);

10
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.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 | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -461,7 +461,7 @@ void Foam::mapDistributeBase::distribute
{
// Set up sends to neighbours
List<List<T > > sendFields(Pstream::nProcs());
List<List<T>> sendFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@ -495,7 +495,7 @@ void Foam::mapDistributeBase::distribute
// Set up receives from neighbours
List<List<T > > recvFields(Pstream::nProcs());
List<List<T>> recvFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@ -938,7 +938,7 @@ void Foam::mapDistributeBase::distribute
{
// Set up sends to neighbours
List<List<T > > sendFields(Pstream::nProcs());
List<List<T>> sendFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@ -972,7 +972,7 @@ void Foam::mapDistributeBase::distribute
// Set up receives from neighbours
List<List<T > > recvFields(Pstream::nProcs());
List<List<T>> recvFields(Pstream::nProcs());
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{

4
src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -81,7 +81,7 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::read()
)
{
// Warn for MUST_READ_IF_MODIFIED
warnNoRereading<ZoneMesh<ZoneType, MeshType> >();
warnNoRereading<ZoneMesh<ZoneType, MeshType>>();
PtrList<ZoneType>& zones = *this;

30
src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
View File

@ -27,6 +27,18 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Foam::Function1Types::Constant<Type>::Constant
(
const word& entryName,
const Type& value
)
:
Function1<Type>(entryName),
value_(value)
{}
template<class Type>
Foam::Function1Types::Constant<Type>::Constant
(
@ -44,29 +56,11 @@ Foam::Function1Types::Constant<Type>::Constant
template<class Type>
<<<<<<< HEAD:src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
Foam::Constant<Type>::Constant
(
const word& entryName,
const Type& value,
const dimensionSet& dimensions
)
:
DataEntry<Type>(entryName),
value_(value),
dimensions_(dimensions)
{}
template<class Type>
Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
=======
Foam::Function1Types::Constant<Type>::Constant
(
const word& entryName,
Istream& is
)
>>>>>>> foundation:src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
:
Function1<Type>(entryName),
value_(pTraits<Type>(is))

6
src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
View File

@ -78,17 +78,13 @@ public:
// Constructors
<<<<<<< HEAD:src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
//- Construct from components
Constant
(
const word& entryName,
const Type& value,
const dimensionSet& dimensions = dimless
const Type& value
);
=======
>>>>>>> foundation:src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
//- Construct from entry name and dictionary
Constant(const word& entryName, const dictionary& dict);

4
src/OpenFOAM/primitives/subModelBase/subModelBase.H
View File

@ -165,7 +165,7 @@ public:
Type getBaseProperty
(
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve generic property from the base model
@ -188,7 +188,7 @@ public:
Type getModelProperty
(
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Add generic property to the sub-model

12
src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
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 | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -129,10 +129,10 @@ class DEShybrid
// Private Data
//- Scheme 1
tmp<surfaceInterpolationScheme<Type> > tScheme1_;
tmp<surfaceInterpolationScheme<Type>> tScheme1_;
//- Scheme 2
tmp<surfaceInterpolationScheme<Type> > tScheme2_;
tmp<surfaceInterpolationScheme<Type>> tScheme2_;
//- DES Coefficient
scalar CDES_;
@ -424,7 +424,7 @@ public:
//- Return the face-interpolate of the given cell field
// with explicit correction
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& vf
@ -447,7 +447,7 @@ public:
//- Return the explicit correction to the face-interpolate
// for the given field
virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
correction
(
const GeometricField<Type, fvPatchField, volMesh>& vf
@ -482,7 +482,7 @@ public:
}
else
{
return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
(
NULL
);

4
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
View File

@ -175,7 +175,7 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::psi
if (lowReCorrection_)
{
volScalarField& psi = tpsi();
volScalarField& psi = tpsi.ref();
const volScalarField fv2(this->fv2(chi, fv1));
const volScalarField ft2(this->ft2(chi));
@ -477,7 +477,7 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::k() const
zeroGradientFvPatchField<vector>::typeName
)
);
volScalarField& dTildaF = tdTilda();
volScalarField& dTildaF = tdTilda.ref();
dTildaF = dTilda(chi, fv1, fvc::grad(this->U_));
dTildaF.correctBoundaryConditions();

2
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
View File

@ -98,7 +98,7 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::rd
scalar(10)
)
);
tr().boundaryField() == 0.0;
tr.ref().boundaryField() == 0.0;
return tr;
}

2
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C
View File

@ -56,7 +56,7 @@ tmp<volScalarField> kOmegaSSTDDES<BasicTurbulenceModel>::rd
scalar(10)
)
);
tr().boundaryField() == 0.0;
tr.ref().boundaryField() == 0.0;
return tr;
}

14
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.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.
@ -38,7 +38,7 @@ template<class BasicTurbulenceModel>
void kOmegaSSTDES<BasicTurbulenceModel>::correctNut(const volScalarField& S2)
{
// Correct the turbulence viscosity
kOmegaSSTBase<DESModel<BasicTurbulenceModel> >::correctNut(S2);
kOmegaSSTBase<DESModel<BasicTurbulenceModel>>::correctNut(S2);
// Correct the turbulence thermal diffusivity
BasicTurbulenceModel::correctNut();
@ -81,7 +81,7 @@ kOmegaSSTDES<BasicTurbulenceModel>::kOmegaSSTDES
const word& type
)
:
kOmegaSSTBase<DESModel<BasicTurbulenceModel> >
kOmegaSSTBase<DESModel<BasicTurbulenceModel>>
(
type,
alpha,
@ -135,7 +135,7 @@ kOmegaSSTDES<BasicTurbulenceModel>::kOmegaSSTDES
template<class BasicTurbulenceModel>
bool kOmegaSSTDES<BasicTurbulenceModel>::read()
{
if (kOmegaSSTBase<DESModel<BasicTurbulenceModel> >::read())
if (kOmegaSSTBase<DESModel<BasicTurbulenceModel>>::read())
{
kappa_.readIfPresent(this->coeffDict());
CDESkom_.readIfPresent(this->coeffDict());
@ -206,9 +206,9 @@ void kOmegaSSTDES<BasicTurbulenceModel>::correct()
+ this->omegaSource()
);
omegaEqn().relax();
omegaEqn.ref().relax();
omegaEqn().boundaryManipulate(omega.boundaryField());
omegaEqn.ref().boundaryManipulate(omega.boundaryField());
solve(omegaEqn);
bound(omega, this->omegaMin_);
@ -231,7 +231,7 @@ void kOmegaSSTDES<BasicTurbulenceModel>::correct()
+ this->kSource()
);
kEqn().relax();
kEqn.ref().relax();
solve(kEqn);
bound(k, this->kMin_);
}

4
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H
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.
@ -65,7 +65,7 @@ namespace LESModels
template<class BasicTurbulenceModel>
class kOmegaSSTDES
:
public kOmegaSSTBase<DESModel<BasicTurbulenceModel> >
public kOmegaSSTBase<DESModel<BasicTurbulenceModel>>
{
// Private Member Functions

2
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
View File

@ -98,7 +98,7 @@ tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::rd
scalar(10)
)
);
tr().boundaryField() == 0.0;
tr.ref().boundaryField() == 0.0;
return tr;
}

5
src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
View File

@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "LESeddyViscosity.H"
#include "zeroGradientFvPatchField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -107,10 +108,10 @@ tmp<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::epsilon() const
IOobject::NO_WRITE
),
Ce_*tk()*sqrt(tk())/this->delta(),
zeroGradientFvPatchScalarField::typeName
zeroGradientFvPatchField<scalar>::typeName
)
);
volScalarField& epsilon = tepsilon();
volScalarField& epsilon = tepsilon.ref();
epsilon.correctBoundaryConditions();
return tepsilon;

8
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
View File

@ -24,12 +24,6 @@ License
\*---------------------------------------------------------------------------*/
#include "kOmegaSST.H"
<<<<<<< HEAD
=======
#include "fvOptions.H"
#include "bound.H"
#include "wallDist.H"
>>>>>>> foundation
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +38,7 @@ template<class BasicTurbulenceModel>
void kOmegaSST<BasicTurbulenceModel>::correctNut(const volScalarField& S2)
{
// Correct the turbulence viscosity
kOmegaSSTBase<eddyViscosity<RASModel<BasicTurbulenceModel> > >::correctNut
kOmegaSSTBase<eddyViscosity<RASModel<BasicTurbulenceModel>>>::correctNut
(
S2
);

4
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
View File

@ -56,8 +56,8 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
fixedJumpFvPatchField<scalar>(p, iF),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
D_(DataEntry<scalar>::New("D", dict)),
I_(DataEntry<scalar>::New("I", dict)),
D_(Function1<scalar>::New("D", dict)),
I_(Function1<scalar>::New("I", dict)),
length_(readScalar(dict.lookup("length"))),
uniformJump_(dict.lookupOrDefault<bool>("uniformJump", false))
{

8
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -89,7 +89,7 @@ SourceFiles
#define porousBafflePressureFvPatchField_H
#include "fixedJumpFvPatchField.H"
#include "DataEntry.H"
#include "Function1.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -113,10 +113,10 @@ class porousBafflePressureFvPatchField
const word rhoName_;
//- Darcy pressure loss coefficient
autoPtr<DataEntry<scalar> > D_;
autoPtr<Function1<scalar>> D_;
//- Inertia pressure lost coefficient
autoPtr<DataEntry<scalar> > I_;
autoPtr<Function1<scalar>> I_;
//- Porous media length
scalar length_;

16
src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
View File

@ -256,14 +256,14 @@ diffusionMulticomponent<CombThermoType, ThermoType>::correct()
const List<specieCoeffs>& lhs = reactions_[k].lhs();
// Set to zero RR's
forAll (lhs, l)
forAll(lhs, l)
{
const label lIndex = lhs[l].index;
this->chemistryPtr_->RR(lIndex) =
dimensionedScalar("zero", dimMass/dimTime/dimVolume, 0.0);
}
forAll (rhs, l)
forAll(rhs, l)
{
const label rIndex = rhs[l].index;
this->chemistryPtr_->RR(rIndex) =
@ -363,7 +363,7 @@ diffusionMulticomponent<CombThermoType, ThermoType>::correct()
const List<specieCoeffs>& lhs = reactions_[k].lhs();
scalar fuelStoic = 1.0;
forAll (lhs, l)
forAll(lhs, l)
{
const label lIndex = lhs[l].index;
if (lIndex == fuelIndex)
@ -376,7 +376,7 @@ diffusionMulticomponent<CombThermoType, ThermoType>::correct()
const scalar MwFuel = specieThermo_[fuelIndex].W();
// Update left hand side species
forAll (lhs, l)
forAll(lhs, l)
{
const label lIndex = lhs[l].index;
@ -389,7 +389,7 @@ diffusionMulticomponent<CombThermoType, ThermoType>::correct()
}
// Update right hand side species
forAll (rhs, r)
forAll(rhs, r)
{
const label rIndex = rhs[r].index;
@ -411,7 +411,7 @@ R(volScalarField& Y) const
{
tmp<fvScalarMatrix> tSu(new fvScalarMatrix(Y, dimMass/dimTime));
fvScalarMatrix& Su = tSu();
fvScalarMatrix& Su = tSu.ref();
if (this->active())
{
@ -449,7 +449,7 @@ dQ() const
if (this->active())
{
volScalarField& dQ = tdQ();
volScalarField& dQ = tdQ.ref();
dQ = this->chemistryPtr_->dQ();
}
@ -483,7 +483,7 @@ Sh() const
if (this->active())
{
scalarField& Sh = tSh();
scalarField& Sh = tSh.ref();
Sh = this->chemistryPtr_->Sh();
}

2
src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
View File

@ -92,7 +92,7 @@ class diffusionMulticomponent
// Private data
//- Reactions
const PtrList<Reaction<ThermoType> >& reactions_;
const PtrList<Reaction<ThermoType>>& reactions_;
//- Thermodynamic data of the species
const PtrList<ThermoType>& specieThermo_;

14
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -408,7 +408,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvMeshDistribute::generateTestField
dimensionedScalar("zero", dimless, 0.0)
)
);
surfaceScalarField& fld = tfld();
surfaceScalarField& fld = tfld.ref();
const surfaceVectorField n(mesh.Sf()/mesh.magSf());
@ -1104,15 +1104,15 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::doRemoveCells
// Save internal fields (note: not as DimensionedFields since would
// get mapped)
PtrList<Field<scalar> > sFlds;
PtrList<Field<scalar>> sFlds;
saveInternalFields(sFlds);
PtrList<Field<vector> > vFlds;
PtrList<Field<vector>> vFlds;
saveInternalFields(vFlds);
PtrList<Field<sphericalTensor> > sptFlds;
PtrList<Field<sphericalTensor>> sptFlds;
saveInternalFields(sptFlds);
PtrList<Field<symmTensor> > sytFlds;
PtrList<Field<symmTensor>> sytFlds;
saveInternalFields(sytFlds);
PtrList<Field<tensor> > tFlds;
PtrList<Field<tensor>> tFlds;
saveInternalFields(tFlds);
// Change the mesh. No inflation. Note: no parallel comms allowed.

6
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -129,7 +129,7 @@ class fvMeshDistribute
template<class T>
void saveInternalFields
(
PtrList<Field<T> >& iflds
PtrList<Field<T>>& iflds
) const;
//- Set value of patch faces resulting from internal faces
@ -137,7 +137,7 @@ class fvMeshDistribute
void mapExposedFaces
(
const mapPolyMesh& map,
const PtrList<Field<T> >& oldFlds
const PtrList<Field<T>>& oldFlds
);
//- Init patch fields of certain type

6
src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -147,7 +147,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
template<class T>
void Foam::fvMeshDistribute::saveInternalFields
(
PtrList<Field<T> >& iflds
PtrList<Field<T>>& iflds
) const
{
typedef GeometricField<T, fvsPatchField, surfaceMesh> fldType;
@ -177,7 +177,7 @@ template<class T>
void Foam::fvMeshDistribute::mapExposedFaces
(
const mapPolyMesh& map,
const PtrList<Field<T> >& oldFlds
const PtrList<Field<T>>& oldFlds
)
{
const labelList& faceMap = map.faceMap();

6
src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -306,7 +306,7 @@ public:
//- Map dimensioned fields
template<class Type>
static tmp<DimensionedField<Type, volMesh> >
static tmp<DimensionedField<Type, volMesh>>
interpolate
(
const DimensionedField<Type, volMesh>&,
@ -315,7 +315,7 @@ public:
);
template<class Type>
tmp<DimensionedField<Type, volMesh> >
tmp<DimensionedField<Type, volMesh>>
interpolate
(
const DimensionedField<Type, volMesh>&

10
src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
View File

@ -2,11 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
<<<<<<< HEAD:src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
=======
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
>>>>>>> foundation:src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -510,7 +506,7 @@ tmp<GeometricField<Type, pointPatchField, pointMesh>> fvMeshSubset::interpolate
template<class Type>
tmp<DimensionedField<Type, volMesh> > fvMeshSubset::interpolate
tmp<DimensionedField<Type, volMesh>> fvMeshSubset::interpolate
(
const DimensionedField<Type, volMesh>& df,
const fvMesh& sMesh,
@ -518,7 +514,7 @@ tmp<DimensionedField<Type, volMesh> > fvMeshSubset::interpolate
)
{
// Create the complete field from the pieces
tmp<DimensionedField<Type, volMesh> > tresF
tmp<DimensionedField<Type, volMesh>> tresF
(
new DimensionedField<Type, volMesh>
(
@ -541,7 +537,7 @@ tmp<DimensionedField<Type, volMesh> > fvMeshSubset::interpolate
template<class Type>
tmp<DimensionedField<Type, volMesh> > fvMeshSubset::interpolate
tmp<DimensionedField<Type, volMesh>> fvMeshSubset::interpolate
(
const DimensionedField<Type, volMesh>& df
) const

4
src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.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.
@ -57,7 +57,7 @@ Foam::velocityDisplacementMotionSolver::pointDisplacementBoundaryTypes() const
forAll(pmUbf, patchI)
{
if (isA<fixedValuePointPatchField<vector> >(pmUbf[patchI]))
if (isA<fixedValuePointPatchField<vector>>(pmUbf[patchI]))
{
cmUbf[patchI] = fixedValuePointPatchField<vector>::typeName;
}

4
src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -233,7 +233,7 @@ void Foam::extendedEdgeMesh::cut
const pointField& points = this->points();
List<List<pointIndexHit> > edgeHits(edges.size());
List<List<pointIndexHit>> edgeHits(edges.size());
{
pointField start(edges.size());
pointField end(edges.size());

5
src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H
View File

@ -39,12 +39,7 @@ Description
myPatch
{
type movingWallVelocity;
<<<<<<< HEAD
U U;
value uniform (0 0 0); // initial value
=======
value uniform (0 0 0); // Initial value
>>>>>>> foundation
}
\endverbatim

2
src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C
View File

@ -44,7 +44,7 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::faceZoneAverage
const faceZone& zone = mesh.faceZones()[name];
area = 0;
average = pTraits<Type>::zero;
average = Type(Zero);
forAll(zone, faceI)
{

2
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
View File

@ -124,7 +124,7 @@ CrankNicolsonDdtScheme<Type>::ddt0_
name,
startTimeName,
mesh()
).template typeHeaderOk<DDt0Field<GeoField> >(true)
).template typeHeaderOk<DDt0Field<GeoField>>(true)
)
{
regIOobject::store

4
src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
View File

@ -54,7 +54,7 @@ namespace fvc
(
const GeometricField<Type, fvsPatchField, surfaceMesh>&,
const CombineOp& cop,
const Type& nullValue = pTraits<Type>::zero
const Type& nullValue = Type(Zero)
);
template<class Type, class CombineOp>
@ -62,7 +62,7 @@ namespace fvc
(
const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&,
const CombineOp& cop,
const Type& nullValue = pTraits<Type>::zero
const Type& nullValue = Type(Zero)
);
}

32
src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -186,7 +186,7 @@ void Foam::volPointInterpolation::interpolateDimensionedInternalField
{
const labelList& ppc = pointCells[pointi];
pf[pointi] = pTraits<Type>::zero;
pf[pointi] = Type(Zero);
forAll(ppc, pointCelli)
{
@ -382,10 +382,10 @@ Foam::volPointInterpolation::interpolate
)
);
interpolateInternalField(vf, tpf());
interpolateInternalField(vf, tpf.ref());
// Interpolate to the patches overriding fixed value BCs
interpolateBoundaryField(vf, tpf(), true);
interpolateBoundaryField(vf, tpf.ref(), true);
return tpf;
}
@ -518,8 +518,8 @@ Foam::volPointInterpolation::interpolate
template<class Type>
tmp<DimensionedField<Type, pointMesh> >
volPointInterpolation::interpolate
Foam::tmp<Foam::DimensionedField<Type, Foam::pointMesh>>
Foam::volPointInterpolation::interpolate
(
const DimensionedField<Type, volMesh>& vf,
const word& name,
@ -550,7 +550,7 @@ volPointInterpolation::interpolate
}
tmp<DimensionedField<Type, pointMesh> > tpf
tmp<DimensionedField<Type, pointMesh>> tpf
(
new DimensionedField<Type, pointMesh>
(
@ -565,7 +565,7 @@ volPointInterpolation::interpolate
)
);
interpolateDimensionedInternalField(vf, tpf());
interpolateDimensionedInternalField(vf, tpf.ref());
return tpf;
}
@ -603,8 +603,8 @@ volPointInterpolation::interpolate
template<class Type>
tmp<DimensionedField<Type, pointMesh> >
volPointInterpolation::interpolate
Foam::tmp<Foam::DimensionedField<Type, Foam::pointMesh>>
Foam::volPointInterpolation::interpolate
(
const DimensionedField<Type, volMesh>& vf
) const
@ -614,21 +614,17 @@ volPointInterpolation::interpolate
template<class Type>
tmp<DimensionedField<Type, pointMesh> >
volPointInterpolation::interpolate
Foam::tmp<Foam::DimensionedField<Type, Foam::pointMesh>>
Foam::volPointInterpolation::interpolate
(
const tmp<DimensionedField<Type, volMesh> >& tvf
const tmp<DimensionedField<Type, volMesh>>& tvf
) const
{
// Construct tmp<pointField>
tmp<DimensionedField<Type, pointMesh> > tpf = interpolate(tvf());
tmp<DimensionedField<Type, pointMesh>> tpf = interpolate(tvf.ref());
tvf.clear();
return tpf;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

10
src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -190,7 +190,7 @@ public:
//- Interpolate dimensionedField using inverse distance weighting
// returning pointField
template<class Type>
tmp<DimensionedField<Type, pointMesh> > interpolate
tmp<DimensionedField<Type, pointMesh>> interpolate
(
const DimensionedField<Type, volMesh>&
) const;
@ -198,9 +198,9 @@ public:
//- Interpolate tmp<dimensionedField> using inverse distance
// weighting returning pointField
template<class Type>
tmp<DimensionedField<Type, pointMesh> > interpolate
tmp<DimensionedField<Type, pointMesh>> interpolate
(
const tmp<DimensionedField<Type, volMesh> >&
const tmp<DimensionedField<Type, volMesh>>&
) const;
@ -264,7 +264,7 @@ public:
//- Interpolate dimensionedField using inverse distance weighting
// returning pointField with name. Optionally caches
template<class Type>
tmp<DimensionedField<Type, pointMesh> > interpolate
tmp<DimensionedField<Type, pointMesh>> interpolate
(
const DimensionedField<Type, volMesh>&,
const word& name,

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,

2
src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
View File

@ -151,7 +151,7 @@ private:
word rhoNbrName_;
//- Pointer to 2-D look-up table of NTU f(mDot1, mDot2)
autoPtr<interpolation2DTable<scalar> > ntuTable_;
autoPtr<interpolation2DTable<scalar>> ntuTable_;
//- Geometry input mode
geometryModeType geometryMode_;

4
src/lagrangian/basic/particle/particleTemplates.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -135,7 +135,7 @@ void Foam::particle::readFields(CloudType& c)
IOobject procIO(c.fieldIOobject("origProcId", IOobject::MUST_READ));
if (procIO.typeHeaderOk<IOField<label> >(true))
if (procIO.typeHeaderOk<IOField<label>>(true))
{
IOField<label> origProcId(procIO);
c.checkFieldIOobject(c, origProcId);

4
src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
View File

@ -111,7 +111,7 @@ public:
bool accessed,
label origProcOfOther,
label origIdOfOther,
const Type& data = pTraits<Type>::zero
const Type& data = Type(Zero)
);
//- Construct from Istream
@ -122,7 +122,7 @@ public:
//- Destructor
~PairCollisionRecord();
~PairCollisionRecord();
// Member Functions

2
src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
View File

@ -108,7 +108,7 @@ public:
(
bool accessed,
const vector& pRel,
const Type& data = pTraits<Type>::zero
const Type& data = Type(Zero)
);
//- Construct from Istream

8
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.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 | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -39,14 +39,14 @@ void Foam::CloudToVTK<CloudType>::writeData
{
const label procI = Pstream::myProcNo();
List<List<floatScalar> > allProcData(Pstream::nProcs());
List<List<floatScalar>> allProcData(Pstream::nProcs());
allProcData[procI] = data;
Pstream::gatherList(allProcData);
List<floatScalar> allData =
ListListOps::combine<List<floatScalar> >
ListListOps::combine<List<floatScalar>>
(
allProcData,
accessOp<List<floatScalar> >()
accessOp<List<floatScalar>>()
);
vtkTools::write(vtkOs, binary, allData);

6
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.H
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 | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -107,9 +107,9 @@ public:
CloudToVTK(const CloudToVTK<CloudType>& c);
//- Construct and return a clone
virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
virtual autoPtr<CloudFunctionObject<CloudType>> clone() const
{
return autoPtr<CloudFunctionObject<CloudType> >
return autoPtr<CloudFunctionObject<CloudType>>
(
new CloudToVTK<CloudType>(*this)
);

2
src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
View File

@ -116,7 +116,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
cloudName + ":rhoAverage"
);
const AveragingMethod<vector>& uAverage =
mesh.lookupObject<AveragingMethod<vector> >
mesh.lookupObject<AveragingMethod<vector>>
(
cloudName + ":uAverage"
);

8
src/mesh/blockMesh/curvedEdges/bezier.C
View File

@ -74,13 +74,11 @@ Foam::point Foam::bezier::position(const scalar lambda) const
forAll(working, workingI)
{
-- nWorking;
--nWorking;
SubList<point>(working, nWorking).assign
(
SubList<point>(working, nWorking) =
(1 - lambda)*SubList<point>(working, nWorking)
+ lambda*SubList<point>(working, nWorking, 1)
);
+ lambda*SubList<point>(working, nWorking, 1);
}
return working[0];

6
src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -50,9 +50,9 @@ Foam::labelList Foam::externalDisplacementMeshMover::getFixedValueBCs
const pointPatchField<vector>& patchField =
field.boundaryField()[patchI];
if (isA<valuePointPatchField<vector> >(patchField))
if (isA<valuePointPatchField<vector>>(patchField))
{
if (isA<zeroFixedValuePointPatchField<vector> >(patchField))
if (isA<zeroFixedValuePointPatchField<vector>>(patchField))
{
// Special condition of fixed boundary condition. Does not
// get adapted

76
src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -56,7 +56,7 @@ namespace Foam
// wall point for both vertices of edge.
bool Foam::medialAxisMeshMover::isMaxEdge
(
const List<PointData<vector> >& pointWallDist,
const List<PointData<vector>>& pointWallDist,
const label edgeI,
const scalar minCos
) const
@ -223,7 +223,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Distance to wall
List<PointData<vector> > pointWallDist(mesh().nPoints());
List<PointData<vector>> pointWallDist(mesh().nPoints());
// Dummy additional info for PointEdgeWave
int dummyTrackData = 0;
@ -232,7 +232,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
// 1. Calculate distance to points where displacement is specified.
{
// Seed data.
List<PointData<vector> > wallInfo(meshPoints.size());
List<PointData<vector>> wallInfo(meshPoints.size());
forAll(meshPoints, patchPointI)
{
@ -246,8 +246,8 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
}
// Do all calculations
List<PointData<vector> > edgeWallDist(mesh().nEdges());
PointEdgeWave<PointData<vector> > wallDistCalc
List<PointData<vector>> edgeWallDist(mesh().nEdges());
PointEdgeWave<PointData<vector>> wallDistCalc
(
mesh(),
meshPoints,
@ -624,18 +624,18 @@ bool Foam::medialAxisMeshMover::unmarkExtrusion
(
const label patchPointI,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::EXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDE)
{
extrudeStatus[patchPointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
patchDisp[patchPointI] = vector::zero;
return true;
}
else if (extrudeStatus[patchPointI] == autoLayerDriver::EXTRUDEREMOVE)
else if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDEREMOVE)
{
extrudeStatus[patchPointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
patchDisp[patchPointI] = vector::zero;
return true;
}
@ -650,7 +650,7 @@ void Foam::medialAxisMeshMover::syncPatchDisplacement
(
const scalarField& minThickness,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
) const
{
const indirectPrimitivePatch& pp = adaptPatchPtr_();
@ -770,7 +770,7 @@ handleFeatureAngleLayerTerminations
const scalar minCos,
const PackedBoolList& isPatchMasterPoint,
const labelList& meshEdges,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp,
label& nPointCounter
) const
@ -788,7 +788,7 @@ handleFeatureAngleLayerTerminations
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
extrudedFaces[faceI] = false;
break;
@ -805,8 +805,8 @@ handleFeatureAngleLayerTerminations
// edge for extrusion.
List<List<point> > edgeFaceNormals(pp.nEdges());
List<List<bool> > edgeFaceExtrude(pp.nEdges());
List<List<point>> edgeFaceNormals(pp.nEdges());
List<List<bool>> edgeFaceExtrude(pp.nEdges());
const labelListList& edgeFaces = pp.edgeFaces();
const vectorField& faceNormals = pp.faceNormals();
@ -830,7 +830,7 @@ handleFeatureAngleLayerTerminations
mesh(),
meshEdges,
edgeFaceNormals,
globalMeshData::ListPlusEqOp<List<point> >(), // combine operator
globalMeshData::ListPlusEqOp<List<point>>(), // combine operator
List<point>() // null value
);
@ -839,7 +839,7 @@ handleFeatureAngleLayerTerminations
mesh(),
meshEdges,
edgeFaceExtrude,
globalMeshData::ListPlusEqOp<List<bool> >(), // combine operator
globalMeshData::ListPlusEqOp<List<bool>>(), // combine operator
List<bool>() // null value
);
@ -857,8 +857,8 @@ handleFeatureAngleLayerTerminations
if
(
extrudeStatus[v0] != autoLayerDriver::NOEXTRUDE
|| extrudeStatus[v1] != autoLayerDriver::NOEXTRUDE
extrudeStatus[v0] != snappyLayerDriver::NOEXTRUDE
|| extrudeStatus[v1] != snappyLayerDriver::NOEXTRUDE
)
{
if (!eFaceExtrude[0] || !eFaceExtrude[1])
@ -905,7 +905,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
const PackedBoolList& isPatchMasterEdge,
const labelList& meshEdges,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
) const
{
@ -974,7 +974,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
forAll(f, fp)
{
if (extrudeStatus[f[fp]] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] != snappyLayerDriver::NOEXTRUDE)
{
if (islandPoint[faceI] == -1)
{
@ -998,7 +998,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
// Check all surrounding faces that I am the islandPoint
forAll(pointFaces, patchPointI)
{
if (extrudeStatus[patchPointI] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
{
const labelList& pFaces = pointFaces[patchPointI];
@ -1026,7 +1026,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
const face& f = pp.localFaces()[faceI];
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
extrudedFaces[faceI] = false;
break;
@ -1100,11 +1100,11 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
label v0 = e[0];
label v1 = e[1];
if (extrudeStatus[v1] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[v1] != snappyLayerDriver::NOEXTRUDE)
{
isolatedPoint[v0] += 1;
}
if (extrudeStatus[v0] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[v0] != snappyLayerDriver::NOEXTRUDE)
{
isolatedPoint[v1] += 1;
}
@ -1139,7 +1139,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
{
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
allPointsExtruded = false;
break;
@ -1285,7 +1285,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
(
const dictionary& coeffDict,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
)
{
@ -1379,7 +1379,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
forAll(thickness, patchPointI)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
{
thickness[patchPointI] = 0.0;
}
@ -1428,7 +1428,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
forAll(meshPoints, patchPointI)
{
if (extrudeStatus[patchPointI] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
{
label pointI = meshPoints[patchPointI];
@ -1522,7 +1522,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
// Update thickess for changed extrusion
forAll(thickness, patchPointI)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
{
thickness[patchPointI] = 0.0;
}
@ -1547,18 +1547,18 @@ void Foam::medialAxisMeshMover::calculateDisplacement
// Dummy additional info for PointEdgeWave
int dummyTrackData = 0;
List<PointData<scalar> > pointWallDist(mesh().nPoints());
List<PointData<scalar>> pointWallDist(mesh().nPoints());
const pointField& points = mesh().points();
// 1. Calculate distance to points where displacement is specified.
// This wave is used to transport layer thickness
{
// Distance to wall and medial axis on edges.
List<PointData<scalar> > edgeWallDist(mesh().nEdges());
List<PointData<scalar>> edgeWallDist(mesh().nEdges());
labelList wallPoints(meshPoints.size());
// Seed data.
List<PointData<scalar> > wallInfo(meshPoints.size());
List<PointData<scalar>> wallInfo(meshPoints.size());
forAll(meshPoints, patchPointI)
{
@ -1573,7 +1573,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
}
// Do all calculations
PointEdgeWave<PointData<scalar> > wallDistCalc
PointEdgeWave<PointData<scalar>> wallDistCalc
(
mesh(),
wallPoints,
@ -1732,16 +1732,16 @@ bool Foam::medialAxisMeshMover::move
pp.meshPoints()
);
List<autoLayerDriver::extrudeMode> extrudeStatus
List<snappyLayerDriver::extrudeMode> extrudeStatus
(
pp.nPoints(),
autoLayerDriver::EXTRUDE
snappyLayerDriver::EXTRUDE
);
forAll(extrudeStatus, pointI)
{
if (mag(patchDisp[pointI]) <= minThickness[pointI]+SMALL)
{
extrudeStatus[pointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[pointI] = snappyLayerDriver::NOEXTRUDE;
}
}

14
src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
View File

@ -46,7 +46,7 @@ SourceFiles
#include "externalDisplacementMeshMover.H"
#include "motionSmootherAlgo.H"
#include "autoLayerDriver.H"
#include "snappyLayerDriver.H"
#include "fieldSmoother.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -112,7 +112,7 @@ class medialAxisMeshMover
//- Is mesh edge on a cusp of displacement
bool isMaxEdge
(
const List<PointData<vector> >& pointWallDist,
const List<PointData<vector>>& pointWallDist,
const label edgeI,
const scalar minCos
) const;
@ -129,7 +129,7 @@ class medialAxisMeshMover
(
const label patchPointI,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
);
//- Synchronise extrusion
@ -137,7 +137,7 @@ class medialAxisMeshMover
(
const scalarField& minThickness,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
) const;
//- Stop layer growth at feature edges
@ -146,7 +146,7 @@ class medialAxisMeshMover
const scalar minCos,
const PackedBoolList& isMasterPoint,
const labelList& meshEdges,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp,
label& nPointCounter
) const;
@ -162,7 +162,7 @@ class medialAxisMeshMover
const PackedBoolList& isMasterEdge,
const labelList& meshEdges,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
) const;
@ -174,7 +174,7 @@ class medialAxisMeshMover
(
const dictionary&,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
);

6
src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
View File

@ -55,7 +55,7 @@ zeroFixedValuePointPatchField
:
fixedValuePointPatchField<Type>(p, iF, dict, false)
{
fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
fixedValuePointPatchField<Type>::operator=(Type(Zero));
}
@ -72,7 +72,7 @@ zeroFixedValuePointPatchField
fixedValuePointPatchField<Type>(ptf, p, iF, mapper)
{
// For safety re-evaluate
fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
fixedValuePointPatchField<Type>::operator=(Type(Zero));
}
@ -98,7 +98,7 @@ zeroFixedValuePointPatchField
fixedValuePointPatchField<Type>(ptf, iF)
{
// For safety re-evaluate
fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
fixedValuePointPatchField<Type>::operator=(Type(Zero));
}

Some files were not shown because too many files have changed in this diff Show More