diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C index 702d2454b..f6cc7c950 100644 --- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C @@ -70,12 +70,12 @@ Foam::MPPICCloud::MPPICCloud const word& cloudName, const volScalarField& rho, const volVectorField& U, - const volScalarField& mu, const dimensionedVector& g, + const SLGThermo& thermo, bool readFields ) : - CloudType(cloudName, rho, U, mu, g, false), + CloudType(cloudName, rho, U, g, thermo, false), packingModel_(NULL), dampingModel_(NULL), isotropyModel_(NULL) diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H index 1d34b686e..c49125bd6 100644 --- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H @@ -43,6 +43,7 @@ SourceFiles #include "fvMesh.H" #include "volFields.H" +#include "ThermoCloud.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -133,8 +134,8 @@ public: const word& cloudName, const volScalarField& rho, const volVectorField& U, - const volScalarField& mu, const dimensionedVector& g, + const SLGThermo& thermo, bool readFields = true ); diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoMPPICCloud/ThermoMPPICCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoMPPICCloud/ThermoMPPICCloud.C deleted file mode 100644 index 5d4cdb97e..000000000 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoMPPICCloud/ThermoMPPICCloud.C +++ /dev/null @@ -1,76 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation - \\/ 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 . - -\*---------------------------------------------------------------------------*/ - -#include "ThermoMPPICCloud.H" -#include "PackingModel.H" -#include "ParticleStressModel.H" -#include "DampingModel.H" -#include "IsotropyModel.H" -#include "TimeScaleModel.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::ThermoMPPICCloud::ThermoMPPICCloud -( - const word& cloudName, - const volScalarField& rho, - const volVectorField& U, - const dimensionedVector& g, - const SLGThermo& thermo, - bool readFields -) -: - CloudType(cloudName, rho, U, g, thermo, false) -{ - this->packingModel_.clear(); - this->dampingModel_.clear(); - this->isotropyModel_.clear(); - - if (this->solution().steadyState()) - { - FatalErrorInFunction - << "MPPIC modelling not available for steady state calculations" - << exit(FatalError); - } - - if (this->solution().active()) - { - this->setModels(); - - if (readFields) - { - parcelType::readFields(*this); - } - } -} - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::ThermoMPPICCloud::~ThermoMPPICCloud() -{} - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoMPPICCloud/ThermoMPPICCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoMPPICCloud/ThermoMPPICCloud.H deleted file mode 100644 index 8ffdfa461..000000000 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoMPPICCloud/ThermoMPPICCloud.H +++ /dev/null @@ -1,135 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation - \\/ 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 . - -Class - Foam::ThermoMPPICCloud - -Description - Adds MPPIC modelling to kinematic clouds - -SourceFiles - ThermoMPPICCloudI.H - ThermoMPPICCloud.C - -\*---------------------------------------------------------------------------*/ - -#ifndef ThermoMPPICCloud_H -#define ThermoMPPICCloud_H - -#include "particle.H" -#include "Cloud.H" -#include "IOdictionary.H" -#include "autoPtr.H" -#include "fvMesh.H" -#include "volFields.H" -#include "SLGThermo.H" -#include "MPPICCloud.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Forward declaration of classes - -template -class PackingModel; - -template -class DampingModel; - -template -class IsotropyModel; - -/*---------------------------------------------------------------------------*\ - Class ThermoMPPICCloud Declaration -\*---------------------------------------------------------------------------*/ - -template -class ThermoMPPICCloud -: - public MPPICCloud -{ -public: - - // Public typedefs - - //- Type of cloud this cloud was instantiated for - typedef CloudType cloudType; - - //- Type of parcel the cloud was instantiated for - typedef typename CloudType::parcelType parcelType; - - //- Convenience typedef for this cloud type - typedef ThermoMPPICCloud ThermoMPPICCloudType; - - -private: - - // Private Member Functions - - //- Disallow default bitwise copy construct - ThermoMPPICCloud(const ThermoMPPICCloud&); - - //- Disallow default bitwise assignment - void operator=(const ThermoMPPICCloud&); - - -public: - - // Constructors - - //- Construct given carrier gas fields - ThermoMPPICCloud - ( - const word& cloudName, - const volScalarField& rho, - const volVectorField& U, - const dimensionedVector& g, - const SLGThermo& thermo, - bool readFields = true - ); - - - //- Destructor - virtual ~ThermoMPPICCloud(); - - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "ThermoMPPICCloud.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoKinematicMPPICCloud/basicThermoKinematicMPPICCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoKinematicMPPICCloud/basicThermoKinematicMPPICCloud.H index 28c021191..dbf6b7c0a 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicThermoKinematicMPPICCloud/basicThermoKinematicMPPICCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicThermoKinematicMPPICCloud/basicThermoKinematicMPPICCloud.H @@ -34,16 +34,16 @@ Description #include "Cloud.H" #include "KinematicCloud.H" -#include "ThermoCloud.H" -#include "ThermoMPPICCloud.H" +#include "MPPICCloud.H" #include "basicThermoKinematicMPPICParcel.H" +#include "ThermoCloud.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef ThermoMPPICCloud + typedef MPPICCloud < ThermoCloud <