STYLE: renamed IOFieldField to CompactIOField to be consistent with CompactIOList.

This commit is contained in:
mattijs
2010-10-01 17:33:07 +01:00
parent 0ebecd2d33
commit ed67d5be34
28 changed files with 133 additions and 129 deletions

View File

@ -402,17 +402,17 @@ int main(int argc, char *argv[])
PtrList< List<SLList<indexedParticle*>*> > cellParticles(cloudDirs.size());
PtrList<PtrList<labelIOField> > lagrangianLabelFields(cloudDirs.size());
PtrList<PtrList<labelIOFieldField> > lagrangianLabelFieldFields
PtrList<PtrList<labelFieldCompactIOField> > lagrangianLabelFieldFields
(
cloudDirs.size()
);
PtrList<PtrList<scalarIOField> > lagrangianScalarFields(cloudDirs.size());
PtrList<PtrList<scalarIOFieldField> > lagrangianScalarFieldFields
PtrList<PtrList<scalarFieldCompactIOField> > lagrangianScalarFieldFields
(
cloudDirs.size()
);
PtrList<PtrList<vectorIOField> > lagrangianVectorFields(cloudDirs.size());
PtrList<PtrList<vectorIOFieldField> > lagrangianVectorFieldFields
PtrList<PtrList<vectorFieldCompactIOField> > lagrangianVectorFieldFields
(
cloudDirs.size()
);
@ -420,13 +420,14 @@ int main(int argc, char *argv[])
(
cloudDirs.size()
);
PtrList<PtrList<sphericalTensorIOFieldField> >
PtrList<PtrList<sphericalTensorFieldCompactIOField> >
lagrangianSphericalTensorFieldFields(cloudDirs.size());
PtrList<PtrList<symmTensorIOField> > lagrangianSymmTensorFields
(
cloudDirs.size()
);
PtrList<PtrList<symmTensorIOFieldField> > lagrangianSymmTensorFieldFields
PtrList<PtrList<symmTensorFieldCompactIOField> >
lagrangianSymmTensorFieldFields
(
cloudDirs.size()
);
@ -434,7 +435,7 @@ int main(int argc, char *argv[])
(
cloudDirs.size()
);
PtrList<PtrList<tensorIOFieldField> > lagrangianTensorFieldFields
PtrList<PtrList<tensorFieldCompactIOField> > lagrangianTensorFieldFields
(
cloudDirs.size()
);

View File

@ -37,7 +37,7 @@ SourceFiles
#define lagrangianFieldDecomposer_H
#include "Cloud.H"
#include "IOFieldField.H"
#include "CompactIOField.H"
#include "indexedParticle.H"
#include "passiveParticle.H"
@ -111,9 +111,9 @@ public:
const IOobjectList& lagrangianObjects,
PtrList
<
PtrList<IOFieldField<Field<Type>, Type> >
PtrList<CompactIOField<Field<Type>, Type> >
>& lagrangianFields
// PtrList<IOFieldField<Field<Type>, Type > >& lagrangianFields
// PtrList<CompactIOField<Field<Type>, Type > >& lagrangianFields
);
@ -126,10 +126,10 @@ public:
) const;
template<class Type>
tmp<IOFieldField<Field<Type>, Type> > decomposeFieldField
tmp<CompactIOField<Field<Type>, Type> > decomposeFieldField
(
const word& cloudName,
const IOFieldField<Field<Type>, Type>& field
const CompactIOField<Field<Type>, Type>& field
) const;

View File

@ -68,7 +68,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
(
const label cloudI,
const IOobjectList& lagrangianObjects,
PtrList<PtrList<IOFieldField<Field<Type>, Type> > >& lagrangianFields
PtrList<PtrList<CompactIOField<Field<Type>, Type> > >& lagrangianFields
)
{
// Search list of objects for lagrangian fields
@ -79,13 +79,17 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
IOobjectList lagrangianTypeObjectsB
(
lagrangianObjects.lookupClass(IOFieldField<Field<Type>, Type>::typeName)
lagrangianObjects.lookupClass
(
CompactIOField<Field<Type>,
Type>::typeName
)
);
lagrangianFields.set
(
cloudI,
new PtrList<IOFieldField<Field<Type>, Type> >
new PtrList<CompactIOField<Field<Type>, Type> >
(
lagrangianTypeObjectsA.size() + lagrangianTypeObjectsB.size()
)
@ -98,7 +102,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
lagrangianFields[cloudI].set
(
lagrangianFieldi++,
new IOFieldField<Field<Type>, Type>(*iter())
new CompactIOField<Field<Type>, Type>(*iter())
);
}
@ -107,7 +111,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
lagrangianFields[cloudI].set
(
lagrangianFieldi++,
new IOFieldField<Field<Type>, Type>(*iter())
new CompactIOField<Field<Type>, Type>(*iter())
);
}
}
@ -145,20 +149,20 @@ Foam::lagrangianFieldDecomposer::decomposeField
template<class Type>
Foam::tmp<Foam::IOFieldField<Foam::Field<Type>, Type> >
Foam::tmp<Foam::CompactIOField<Foam::Field<Type>, Type> >
Foam::lagrangianFieldDecomposer::decomposeFieldField
(
const word& cloudName,
const IOFieldField<Field<Type>, Type>& field
const CompactIOField<Field<Type>, Type>& field
) const
{
// Create and map the internal field values
Field<Field<Type> > procField(field, particleIndices_);
// Create the field for the processor
return tmp<IOFieldField<Field<Type>, Type> >
return tmp<CompactIOField<Field<Type>, Type> >
(
new IOFieldField<Field<Type>, Type>
new CompactIOField<Field<Type>, Type>
(
IOobject
(