Removing empty instantiation class, can now cloud declare directly

with typedef.

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

src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.C

@@ -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<basicInteractingKinematicParcel>
-    (
-        cloudName,
-        rho,
-        U,
-        mu,
-        g
-    )
-{
-    basicInteractingKinematicParcel::readFields(*this);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::basicInteractingKinematicCloud::~basicInteractingKinematicCloud()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::basicInteractingKinematicCloud::writeFields() const
-{
-    basicInteractingKinematicParcel::writeFields(*this);
-}
-
-
-// ************************************************************************* //

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
 {
-
+    typedef InteractingKinematicCloud<basicInteractingKinematicParcel>
-/*---------------------------------------------------------------------------*\
+        basicInteractingKinematicCloud;
-                Class basicInteractingKinematicCloud Declaration
+}
-\*---------------------------------------------------------------------------*/
-
-class basicInteractingKinematicCloud
-:
-    public InteractingKinematicCloud<basicInteractingKinematicParcel>
-{
-    // 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
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H

@@ -533,13 +533,10 @@ public:
         // I-O
 
             //- Read
-            static void readFields(InteractingKinematicCloud<ParcelType>& c);
+            static void readFields(Cloud<ParcelType>& c);
 
             //- Write
-            static void writeFields
+            static void writeFields(const Cloud<ParcelType>& c);
-            (
-                const InteractingKinematicCloud<ParcelType>& c
-            );
 
 
     // Ostream Operator

src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C

@@ -106,7 +106,7 @@ Foam::InteractingKinematicParcel<ParcelType>::InteractingKinematicParcel
 template<class ParcelType>
 void Foam::InteractingKinematicParcel<ParcelType>::readFields
 (
-    InteractingKinematicCloud<ParcelType>& c
+    Cloud<ParcelType>& c
 )
 {
     if (!c.size())
@@ -156,7 +156,7 @@ void Foam::InteractingKinematicParcel<ParcelType>::readFields
 template<class ParcelType>
 void Foam::InteractingKinematicParcel<ParcelType>::writeFields
 (
-    const InteractingKinematicCloud<ParcelType>& c
+    const Cloud<ParcelType>& c
 )
 {
     Particle<ParcelType>::writeFields(c);