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

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;