diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files index bfed281015..df93e62853 100644 --- a/src/postProcessing/functionObjects/field/Make/files +++ b/src/postProcessing/functionObjects/field/Make/files @@ -19,6 +19,6 @@ streamLine/streamLine.C streamLine/streamLineParticle.C streamLine/streamLineParticleCloud.C streamLine/streamLineFunctionObject.C - +streamLine/vectorIOFieldField.C LIB = $(FOAM_LIBBIN)/libfieldFunctionObjects diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C index 1f0f13b184..1bf513e6ea 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C +++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C @@ -32,11 +32,6 @@ License namespace Foam { defineTypeNameAndDebug(fieldValue, 0); - - defineTemplateTypeNameAndDebug(IOField, 0); - defineTemplateTypeNameAndDebug(IOField, 0); - defineTemplateTypeNameAndDebug(IOField, 0); - defineTemplateTypeNameAndDebug(IOField, 0); } diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H index fe4f4d287f..0b8dd20ead 100644 --- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H +++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H @@ -206,12 +206,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//#ifdef NoRepository -//# include "streamLineTemplates.C" -//#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C index 9174e35781..ed702f489a 100644 --- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C +++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C @@ -24,22 +24,14 @@ License \*----------------------------------------------------------------------------*/ #include "streamLineParticle.H" +#include "vectorIOFieldField.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(streamLineParticle, 0); - defineParticleTypeNameAndDebug(streamLineParticle, 0); - - defineTemplateTypeNameAndDebugWithName - ( - IOField, - "vectorFieldField", - 0 - ); } @@ -402,13 +394,13 @@ void Foam::streamLineParticle::readFields(Cloud& c) ); c.checkFieldIOobject(c, lifeTime); - IOField sampledPositions + vectorIOFieldField sampledPositions ( c.fieldIOobject("sampledPositions", IOobject::MUST_READ) ); c.checkFieldIOobject(c, sampledPositions); -// IOField sampleVelocity +// vectorIOFieldField sampleVelocity // ( // c.fieldIOobject("sampleVelocity", IOobject::MUST_READ) // ); @@ -436,12 +428,12 @@ void Foam::streamLineParticle::writeFields(const Cloud& c) c.fieldIOobject("lifeTime", IOobject::NO_READ), np ); - IOField sampledPositions + vectorIOFieldField sampledPositions ( c.fieldIOobject("sampledPositions", IOobject::NO_READ), np ); -// IOField sampleVelocity +// vectorIOFieldField sampleVelocity // ( // c.fieldIOobject("sampleVelocity", IOobject::NO_READ), // np diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H index e2de691282..2ed481c60c 100644 --- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H +++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H @@ -134,11 +134,6 @@ private: public: - //- Run-time type information - TypeName("streamLineParticle"); - - - // Constructors //- Construct from components diff --git a/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.C b/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.C new file mode 100644 index 0000000000..7ecd4d86a2 --- /dev/null +++ b/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.C @@ -0,0 +1,43 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Description + vectorFieldField with IO. + +\*---------------------------------------------------------------------------*/ + +#include "vectorIOFieldField.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + defineTemplateTypeNameAndDebugWithName + ( + vectorIOFieldField, + "vectorFieldField", + 0 + ); +} + +// ************************************************************************* // diff --git a/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.H b/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.H new file mode 100644 index 0000000000..b57b7813fd --- /dev/null +++ b/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.H @@ -0,0 +1,49 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Typedef + Foam::vectorIOFieldField + +Description + vectorField with IO. + +\*---------------------------------------------------------------------------*/ + +#ifndef vectorIOFieldField_H +#define vectorIOFieldField_H + +#include "vectorField.H" +#include "IOField.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef IOField vectorIOFieldField; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* //