From 641d2b2961423fef7dfc3e8a4313a31d4d37d3fb Mon Sep 17 00:00:00 2001 From: graham Date: Mon, 7 Sep 2009 12:53:52 +0100 Subject: [PATCH] Removing empty instantiation class, can now cloud declare directly with typedef. --- src/lagrangian/intermediate/Make/files | 2 - .../basicInteractingKinematicCloud.C | 75 ------------------- .../basicInteractingKinematicCloud.H | 55 +------------- .../InteractingKinematicParcel.H | 7 +- .../InteractingKinematicParcelIO.C | 4 +- 5 files changed, 8 insertions(+), 135 deletions(-) delete mode 100644 src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.C diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files index 241ced3e21..7c95a699aa 100644 --- a/src/lagrangian/intermediate/Make/files +++ b/src/lagrangian/intermediate/Make/files @@ -18,8 +18,6 @@ $(BASECLOUDS)/reactingCloud/reactingCloud.C $(BASECLOUDS)/reactingMultiphaseCloud/reactingMultiphaseCloud.C -$(DERIVEDCLOUDS)/basicInteractingKinematicCloud/basicInteractingKinematicCloud.C - /* kinematic parcel sub-models */ // KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel // $(KINEMATICPARCEL)/basicKinematicParcel.C diff --git a/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.C b/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.C deleted file mode 100644 index 28d9efdd54..0000000000 --- a/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.C +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / 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 2 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, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "basicInteractingKinematicCloud.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(basicInteractingKinematicCloud, 0); -}; - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::basicInteractingKinematicCloud::basicInteractingKinematicCloud -( - const word& cloudName, - const volScalarField& rho, - const volVectorField& U, - const volScalarField& mu, - const dimensionedVector& g -) -: - InteractingKinematicCloud - ( - cloudName, - rho, - U, - mu, - g - ) -{ - basicInteractingKinematicParcel::readFields(*this); -} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::basicInteractingKinematicCloud::~basicInteractingKinematicCloud() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void Foam::basicInteractingKinematicCloud::writeFields() const -{ - basicInteractingKinematicParcel::writeFields(*this); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.H index 21b2e7385f..0cea71c4b0 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.H @@ -26,7 +26,7 @@ Class Foam::basicInteractingKinematicCloud Description - Cloud class to introduce interactingKinematic parcels + Cloud class to introduce interacting kinematic parcels SourceFiles basicInteractingKinematicCloud.C @@ -43,56 +43,9 @@ SourceFiles namespace Foam { - -/*---------------------------------------------------------------------------*\ - Class basicInteractingKinematicCloud Declaration -\*---------------------------------------------------------------------------*/ - -class basicInteractingKinematicCloud -: - public InteractingKinematicCloud -{ - // Private member functions - - //- Disallow default bitwise copy construct - basicInteractingKinematicCloud(const basicInteractingKinematicCloud&); - - //- Disallow default bitwise assignment - void operator=(const basicInteractingKinematicCloud&); - - -public: - - //- Runtime type information - TypeName("basicInteractingKinematicCloud"); - - - // Constructors - - //- Construct from components - basicInteractingKinematicCloud - ( - const word& cloudName, - const volScalarField& rho, - const volVectorField& U, - const volScalarField& mu, - const dimensionedVector& g - ); - - - //- Destructor - ~basicInteractingKinematicCloud(); - - - // Member functions - - //- Write fields - virtual void writeFields() const; -}; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + typedef InteractingKinematicCloud + basicInteractingKinematicCloud; +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H index ea7fd7dc37..03a207a4d6 100644 --- a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H @@ -533,13 +533,10 @@ public: // I-O //- Read - static void readFields(InteractingKinematicCloud& c); + static void readFields(Cloud& c); //- Write - static void writeFields - ( - const InteractingKinematicCloud& c - ); + static void writeFields(const Cloud& c); // Ostream Operator diff --git a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C index 1ca77f37a0..a602c5b41b 100644 --- a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C @@ -106,7 +106,7 @@ Foam::InteractingKinematicParcel::InteractingKinematicParcel template void Foam::InteractingKinematicParcel::readFields ( - InteractingKinematicCloud& c + Cloud& c ) { if (!c.size()) @@ -156,7 +156,7 @@ void Foam::InteractingKinematicParcel::readFields template void Foam::InteractingKinematicParcel::writeFields ( - const InteractingKinematicCloud& c + const Cloud& c ) { Particle::writeFields(c);