diff --git a/src/lagrangian/dsmc/Make/files b/src/lagrangian/dsmc/Make/files index 9f6d33d209..983de123ab 100644 --- a/src/lagrangian/dsmc/Make/files +++ b/src/lagrangian/dsmc/Make/files @@ -4,9 +4,6 @@ parcels/derived/dsmcParcel/dsmcParcel.C /* Cloud base classes */ clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C -/* Clouds */ -clouds/derived/dsmcCloud/dsmcCloud.C - /* submodels */ parcels/derived/dsmcParcel/defineDsmcParcel.C parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C diff --git a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.C b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.C deleted file mode 100644 index 2f819e826b..0000000000 --- a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.C +++ /dev/null @@ -1,68 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2009-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 "dsmcCloud.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(dsmcCloud, 0); -}; - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::dsmcCloud::dsmcCloud -( - const word& cloudName, - const fvMesh& mesh -) -: - DsmcCloud(cloudName, mesh) -{ - dsmcParcel::readFields(*this); -} - - -Foam::dsmcCloud::dsmcCloud -( - const word& cloudName, - const fvMesh& mesh, - const IOdictionary& dsmcInitialiseDict -) -: - DsmcCloud(cloudName, mesh, dsmcInitialiseDict) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::dsmcCloud::~dsmcCloud() -{} - - -// ************************************************************************* // diff --git a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H index 861244652f..c0c17336e6 100644 --- a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H +++ b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H @@ -43,55 +43,8 @@ SourceFiles namespace Foam { - -/*---------------------------------------------------------------------------*\ - Class dsmcCloud Declaration -\*---------------------------------------------------------------------------*/ - -class dsmcCloud -: - public DsmcCloud -{ - // Private member functions - - //- Disallow default bitwise copy construct - dsmcCloud(const dsmcCloud&); - - //- Disallow default bitwise assignment - void operator=(const dsmcCloud&); - - -public: - - //- Runtime type information - TypeName("dsmcCloud"); - - - // Constructors - - //- Construct given name and mesh, will read Parcels and fields from - // file - dsmcCloud - ( - const word& cloudName, - const fvMesh& mesh - ); - - //- Construct given name, mesh and initialisation dictionary. - dsmcCloud - ( - const word& cloudName, - const fvMesh& mesh, - const IOdictionary& dsmcInitialiseDict - ); - - //- Destructor - ~dsmcCloud(); -}; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + typedef DsmcCloud dsmcCloud; +} // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //