diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C index 259691002f..865f359cf4 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License template Foam::CollisionModel::CollisionModel(CloudType& owner) : - SubModelBase(owner) + CloudSubModelBase(owner) {} @@ -42,14 +42,14 @@ Foam::CollisionModel::CollisionModel const word& type ) : - SubModelBase(owner, dict, typeName, type) + CloudSubModelBase(owner, dict, typeName, type) {} template Foam::CollisionModel::CollisionModel(CollisionModel& cm) : - SubModelBase(cm) + CloudSubModelBase(cm) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H index 648a312dd8..dfaf223a8d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ SourceFiles #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace Foam template class CollisionModel : - public SubModelBase + public CloudSubModelBase { // Protected data diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C index 98b1d16075..3f6288aa18 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License template Foam::DispersionModel::DispersionModel(CloudType& owner) : - SubModelBase(owner) + CloudSubModelBase(owner) {} @@ -42,7 +42,7 @@ Foam::DispersionModel::DispersionModel const word& type ) : - SubModelBase(owner, dict, typeName, type) + CloudSubModelBase(owner, dict, typeName, type) {} @@ -52,7 +52,7 @@ Foam::DispersionModel::DispersionModel DispersionModel& dm ) : - SubModelBase(dm) + CloudSubModelBase(dm) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H index 64e32fc95f..323b853907 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,7 +48,7 @@ namespace Foam template class DispersionModel : - public SubModelBase + public CloudSubModelBase { public: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index 82080c4174..d38e28ad99 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -282,7 +282,7 @@ void Foam::InjectionModel::postInjectCheck template Foam::InjectionModel::InjectionModel(CloudType& owner) : - SubModelBase(owner), + CloudSubModelBase(owner), SOI_(0.0), volumeTotal_(0.0), massTotal_(0.0), @@ -310,7 +310,7 @@ Foam::InjectionModel::InjectionModel const word& modelType ) : - SubModelBase(modelName, owner, dict, typeName, modelType), + CloudSubModelBase(modelName, owner, dict, typeName, modelType), SOI_(0.0), volumeTotal_(0.0), massTotal_(0.0), @@ -387,7 +387,7 @@ Foam::InjectionModel::InjectionModel const InjectionModel& im ) : - SubModelBase(im), + CloudSubModelBase(im), SOI_(im.SOI_), volumeTotal_(im.volumeTotal_), massTotal_(im.massTotal_), diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H index 70948c356c..d9b8505bb5 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H @@ -51,7 +51,7 @@ SourceFiles #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" #include "vector.H" #include "TimeDataEntry.H" @@ -67,7 +67,7 @@ namespace Foam template class InjectionModel : - public SubModelBase + public CloudSubModelBase { public: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C index ab9753ce1f..5ccaf9bc02 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C @@ -109,7 +109,7 @@ Foam::PatchInteractionModel::PatchInteractionModel CloudType& owner ) : - SubModelBase(owner), + CloudSubModelBase(owner), UName_("unknown_UName") {} @@ -122,7 +122,7 @@ Foam::PatchInteractionModel::PatchInteractionModel const word& type ) : - SubModelBase(owner, dict, typeName, type), + CloudSubModelBase(owner, dict, typeName, type), UName_(this->coeffDict().lookupOrDefault("UName", word("U"))) {} @@ -133,7 +133,7 @@ Foam::PatchInteractionModel::PatchInteractionModel const PatchInteractionModel& pim ) : - SubModelBase(pim), + CloudSubModelBase(pim), UName_(pim.UName_) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H index 6ea4ccaa5b..cd94e369d4 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H @@ -42,7 +42,7 @@ SourceFiles #include "polyPatch.H" #include "wallPolyPatch.H" #include "tetIndices.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,7 +56,7 @@ namespace Foam template class PatchInteractionModel : - public SubModelBase + public CloudSubModelBase { public: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.C index f177613232..550e121219 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.C @@ -45,7 +45,7 @@ Foam::StochasticCollisionModel::StochasticCollisionModel CloudType& owner ) : - SubModelBase(owner) + CloudSubModelBase(owner) {} @@ -55,7 +55,7 @@ Foam::StochasticCollisionModel::StochasticCollisionModel const StochasticCollisionModel& cm ) : - SubModelBase(cm) + CloudSubModelBase(cm) {} @@ -67,7 +67,7 @@ Foam::StochasticCollisionModel::StochasticCollisionModel const word& type ) : - SubModelBase(owner, dict, typeName, type) + CloudSubModelBase(owner, dict, typeName, type) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H index 0ca8935b18..b7f8641941 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H @@ -39,7 +39,7 @@ SourceFiles #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace Foam template class StochasticCollisionModel : - public SubModelBase + public CloudSubModelBase { protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C index 9284d7f0ff..8d1729361e 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C @@ -35,7 +35,7 @@ using namespace Foam::constant; template Foam::SurfaceFilmModel::SurfaceFilmModel(CloudType& owner) : - SubModelBase(owner), + CloudSubModelBase(owner), g_(owner.g()), ejectedParcelType_(0), massParcelPatch_(0), @@ -56,7 +56,7 @@ Foam::SurfaceFilmModel::SurfaceFilmModel const word& type ) : - SubModelBase(owner, dict, typeName, type), + CloudSubModelBase(owner, dict, typeName, type), g_(owner.g()), ejectedParcelType_ ( @@ -78,7 +78,7 @@ Foam::SurfaceFilmModel::SurfaceFilmModel const SurfaceFilmModel& sfm ) : - SubModelBase(sfm), + CloudSubModelBase(sfm), g_(sfm.g_), ejectedParcelType_(sfm.ejectedParcelType_), massParcelPatch_(sfm.massParcelPatch_), diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H index 734546d086..0f0a4d4196 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ SourceFiles #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,7 +64,7 @@ class mappedPatchBase; template class SurfaceFilmModel : - public SubModelBase + public CloudSubModelBase { protected: diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C index 72e56bf884..1fbd847b79 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License template Foam::CompositionModel::CompositionModel(CloudType& owner) : - SubModelBase(owner), + CloudSubModelBase(owner), thermo_(owner.thermo()), phaseProps_() {} @@ -44,7 +44,7 @@ Foam::CompositionModel::CompositionModel const word& type ) : - SubModelBase(owner, dict, typeName, type), + CloudSubModelBase(owner, dict, typeName, type), thermo_(owner.thermo()), phaseProps_ ( @@ -62,7 +62,7 @@ Foam::CompositionModel::CompositionModel const CompositionModel& cm ) : - SubModelBase(cm), + CloudSubModelBase(cm), thermo_(cm.thermo_), phaseProps_(cm.phaseProps_) {} diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H index cabdd91eac..c876286cc8 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,7 @@ SourceFiles #ifndef CompositionModel_H #define CompositionModel_H -#include "SubModelBase.H" +#include "CloudSubModelBase.H" #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" @@ -60,7 +60,7 @@ namespace Foam template class CompositionModel : - public SubModelBase + public CloudSubModelBase { // Private data //- Reference to the thermo database diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C index 9ec9307278..f85ef8aace 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C @@ -75,7 +75,7 @@ Foam::PhaseChangeModel::PhaseChangeModel CloudType& owner ) : - SubModelBase(owner), + CloudSubModelBase(owner), enthalpyTransfer_(etLatentHeat), dMass_(0.0) {} @@ -87,7 +87,7 @@ Foam::PhaseChangeModel::PhaseChangeModel const PhaseChangeModel& pcm ) : - SubModelBase(pcm), + CloudSubModelBase(pcm), enthalpyTransfer_(pcm.enthalpyTransfer_), dMass_(pcm.dMass_) {} @@ -101,7 +101,7 @@ Foam::PhaseChangeModel::PhaseChangeModel const word& type ) : - SubModelBase(owner, dict, typeName, type), + CloudSubModelBase(owner, dict, typeName, type), enthalpyTransfer_ ( wordToEnthalpyTransfer(this->coeffDict().lookup("enthalpyTransfer")) diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H index 6f3a171708..e2e868e7da 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H @@ -39,7 +39,7 @@ SourceFiles #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace Foam template class PhaseChangeModel : - public SubModelBase + public CloudSubModelBase { public: diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C index 48a0a4ee5f..3ea746b884 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C @@ -33,7 +33,7 @@ Foam::DevolatilisationModel::DevolatilisationModel CloudType& owner ) : - SubModelBase(owner), + CloudSubModelBase(owner), dMass_(0.0) {} @@ -46,7 +46,7 @@ Foam::DevolatilisationModel::DevolatilisationModel const word& type ) : - SubModelBase(owner, dict, typeName, type), + CloudSubModelBase(owner, dict, typeName, type), dMass_(0.0) {} @@ -57,7 +57,7 @@ Foam::DevolatilisationModel::DevolatilisationModel const DevolatilisationModel& dm ) : - SubModelBase(dm), + CloudSubModelBase(dm), dMass_(dm.dMass_) {} diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H index f467aa7470..3db94c0023 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H @@ -39,7 +39,7 @@ SourceFiles #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace Foam template class DevolatilisationModel : - public SubModelBase + public CloudSubModelBase { protected: diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C index f4c66e8b82..3beee0747f 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Foam::SurfaceReactionModel::SurfaceReactionModel CloudType& owner ) : - SubModelBase(owner), + CloudSubModelBase(owner), dMass_(0.0) {} @@ -46,7 +46,7 @@ Foam::SurfaceReactionModel::SurfaceReactionModel const word& type ) : - SubModelBase(owner, dict, typeName, type), + CloudSubModelBase(owner, dict, typeName, type), dMass_(0.0) {} @@ -57,7 +57,7 @@ Foam::SurfaceReactionModel::SurfaceReactionModel const SurfaceReactionModel& srm ) : - SubModelBase(srm), + CloudSubModelBase(srm), dMass_(srm.dMass_) {} diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H index 43f8d3ac89..446b01022e 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ SourceFiles #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" #include "scalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ namespace Foam template class SurfaceReactionModel : - public SubModelBase + public CloudSubModelBase { protected: diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C index 870dc31ffc..2f7dfbc0e0 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C @@ -30,7 +30,7 @@ License template Foam::HeatTransferModel::HeatTransferModel(CloudType& owner) : - SubModelBase(owner), + CloudSubModelBase(owner), BirdCorrection_(false) {} @@ -43,7 +43,7 @@ Foam::HeatTransferModel::HeatTransferModel const word& type ) : - SubModelBase(owner, dict, typeName, type), + CloudSubModelBase(owner, dict, typeName, type), BirdCorrection_(this->coeffDict().lookup("BirdCorrection")) {} @@ -54,7 +54,7 @@ Foam::HeatTransferModel::HeatTransferModel const HeatTransferModel& htm ) : - SubModelBase(htm), + CloudSubModelBase(htm), BirdCorrection_(htm.BirdCorrection_) {} diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H index 3082744bc5..3244007e33 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ SourceFiles #include "IOdictionary.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" -#include "SubModelBase.H" +#include "CloudSubModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ namespace Foam template class HeatTransferModel : - public SubModelBase + public CloudSubModelBase { // Private data