From 6b0daf3618d4d2a82dee3238b0b8880b71b60f1e Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 2 Mar 2010 16:07:20 +0000
Subject: [PATCH] EHN: lagrangian/intermediate. Merging
InteractingKinematicParcel back to KinematicParcel incorporating latest
master branch changes.
---
.../createFields.H | 12 +-
...mpressibleInteractingKinematicParcelFoam.C | 8 +-
src/lagrangian/intermediate/Make/files | 15 +-
.../InteractingKinematicCloud.C | 348 ---------
.../InteractingKinematicCloud.H | 432 ------------
.../InteractingKinematicCloudI.H | 436 ------------
.../Templates/KinematicCloud/KinematicCloud.C | 85 ++-
.../Templates/KinematicCloud/KinematicCloud.H | 29 +
.../KinematicCloud/KinematicCloudI.H | 69 ++
.../ReactingMultiphaseCloud.C | 2 +-
.../ReactingMultiphaseCloud.H | 2 +-
.../ReactingMultiphaseCloudI.H | 2 +-
.../Templates/ThermoCloud/ThermoCloud.C | 12 +-
.../Templates/ThermoCloud/ThermoCloud.H | 4 +-
.../BasicReactingMultiphaseCloud.H | 2 +-
.../basicInteractingKinematicCloud.H | 54 --
.../basicKinematicCloud/basicKinematicCloud.H | 2 +-
.../InteractingKinematicParcel.C | 441 ------------
.../InteractingKinematicParcel.H | 660 ------------------
.../InteractingKinematicParcelI.H | 554 ---------------
.../InteractingKinematicParcelIO.C | 292 --------
.../CollisionRecord/CollisionRecord.C | 0
.../CollisionRecord/CollisionRecord.H | 0
.../CollisionRecord/CollisionRecordI.H | 0
.../CollisionRecord/CollisionRecordIO.C | 0
.../CollisionRecordList/CollisionRecordList.C | 0
.../CollisionRecordList/CollisionRecordList.H | 0
.../KinematicParcel/KinematicParcel.C | 94 ++-
.../KinematicParcel/KinematicParcel.H | 90 ++-
.../KinematicParcel/KinematicParcelI.H | 155 +++-
.../KinematicParcel/KinematicParcelIO.C | 45 +-
.../ReactingMultiphaseParcel.C | 2 +-
.../ReactingMultiphaseParcel.H | 5 +-
.../ReactingMultiphaseParcelI.H | 7 +-
.../ReactingMultiphaseParcelIO.C | 2 +-
.../Templates/ReactingParcel/ReactingParcel.H | 3 +
.../ReactingParcel/ReactingParcelI.H | 6 +
.../Templates/ThermoParcel/ThermoParcel.C | 4 +-
.../Templates/ThermoParcel/ThermoParcel.H | 10 +-
.../Templates/ThermoParcel/ThermoParcelI.H | 8 +-
.../Templates/ThermoParcel/ThermoParcelIO.C | 12 +-
.../reactingParcel/reactingParcel.C | 2 +-
.../reactingParcel/reactingParcel.H | 2 +-
.../BasicReactingMultiphaseParcel.C | 8 +-
.../BasicReactingMultiphaseParcel.H | 5 +-
.../defineBasicReactingMultiphaseParcel.C | 2 +-
...keBasicReactingMultiphaseParcelSubmodels.C | 2 +-
.../BasicReactingParcel/BasicReactingParcel.C | 6 +
.../BasicReactingParcel/BasicReactingParcel.H | 3 +
.../makeBasicReactingParcelSubmodels.C | 2 +-
.../basicInteractingKinematicParcel.C | 120 ----
.../basicInteractingKinematicParcel.H | 133 ----
.../defineBasicInteractingKinematicParcel.C | 43 --
...BasicInteractingKinematicParcelSubmodels.C | 51 --
.../basicKinematicParcel.C | 6 +
.../basicKinematicParcel.H | 3 +
.../makeBasicKinematicParcelSubmodels.C | 4 +-
.../defineBasicThermoParcel.C | 12 +-
.../makeBasicThermoParcelSubmodels.C | 2 +-
.../createReactingMultiphaseParcelTypes.H | 16 +-
.../include/createReactingParcelTypes.H | 16 +-
.../include/makeParcelCollisionModels.H | 19 +-
.../include/makeParcelDispersionModels.H | 14 +-
.../parcels/include/makeParcelDragModels.H | 10 +-
.../include/makeParcelHeatTransferModels.H | 2 +-
.../include/makeParcelInjectionModels.H | 20 +-
.../makeParcelPatchInteractionModels.H | 12 +-
.../include/makeParcelPostProcessingModels.H | 10 +-
...eactingMultiphaseParcelCompositionModels.H | 2 +-
...ngMultiphaseParcelDevolatilisationModels.H | 2 +-
...eReactingMultiphaseParcelInjectionModels.H | 20 +-
...ingMultiphaseParcelSurfaceReactionModels.H | 2 +-
.../makeReactingParcelCollisionModels.H | 19 +-
.../makeReactingParcelCompositionModels.H | 2 +-
.../makeReactingParcelDispersionModels.H | 17 +-
.../include/makeReactingParcelDragModels.H | 10 +-
.../makeReactingParcelHeatTransferModels.H | 2 +-
.../makeReactingParcelInjectionModels.H | 20 +-
...makeReactingParcelPatchInteractionModels.H | 17 +-
.../makeReactingParcelPhaseChangeModels.H | 2 +-
.../makeReactingParcelPostProcessingModels.H | 13 +-
.../particleForces/particleForces.C | 3 +-
.../particleForces/particleForces.H | 2 +-
.../phaseProperties/phaseProperties.C | 2 +-
.../phaseProperties/phaseProperties.H | 2 +-
.../phaseProperties/phasePropertiesIO.C | 2 +-
.../phasePropertiesList/phasePropertiesList.C | 2 +-
.../phasePropertiesList/phasePropertiesList.H | 2 +-
.../IO/DataEntry/polynomial/polynomial.C | 2 +-
.../IO/DataEntry/polynomial/polynomial.H | 2 +-
.../IO/DataEntry/polynomial/polynomialIO.C | 2 +-
.../CollisionModel/CollisionModel.C | 2 +-
.../CollisionModel/CollisionModel.H | 2 +-
.../CollisionModel/CollisionModelI.H | 2 +-
.../CollisionModel/NewCollisionModel.C | 2 +-
.../CollisionModel/NoCollision/NoCollision.C | 4 +-
.../CollisionModel/NoCollision/NoCollision.H | 2 +-
.../PairCollision/PairCollision.C | 18 +-
.../PairCollision/PairCollision.H | 2 +-
.../PairModel/PairModel/NewPairModel.C | 2 +-
.../PairModel/PairModel/PairModel.C | 2 +-
.../PairModel/PairModel/PairModel.H | 2 +-
.../PairSpringSliderDashpot.C | 12 +-
.../PairSpringSliderDashpot.H | 2 +-
.../WallModel/WallModel/NewWallModel.C | 2 +-
.../WallModel/WallModel/WallModel.C | 2 +-
.../WallModel/WallModel/WallModel.H | 2 +-
.../WallSpringSliderDashpot.C | 10 +-
.../WallSpringSliderDashpot.H | 2 +-
.../ConeInjectionMP/ConeInjectionMP.C | 2 +-
.../ConeInjectionMP/ConeInjectionMP.H | 2 +-
.../FieldActivatedInjection.C | 2 +-
.../FieldActivatedInjection.H | 2 +-
.../KinematicLookupTableInjection.C | 2 +-
.../KinematicLookupTableInjection.H | 2 +-
.../LocalInteraction/LocalInteraction.C | 2 +-
.../LocalInteraction/LocalInteraction.H | 2 +-
.../NewPatchInteractionModel.C | 2 +-
.../PatchInteractionModel.C | 2 +-
.../PatchInteractionModel.H | 2 +-
.../PatchInteractionModel/Rebound/Rebound.C | 2 +-
.../PatchInteractionModel/Rebound/Rebound.H | 2 +-
.../StandardWallInteraction.C | 2 +-
.../StandardWallInteraction.H | 2 +-
.../NoPostProcessing/NoPostProcessing.C | 2 +-
.../NoPostProcessing/NoPostProcessing.H | 2 +-
.../PatchPostProcessing/PatchPostProcessing.C | 2 +-
.../PatchPostProcessing/PatchPostProcessing.H | 2 +-
.../PatchPostProcessingI.H | 2 +-
.../NewPostProcessingModel.C | 2 +-
.../PostProcessingModel/PostProcessingModel.C | 2 +-
.../PostProcessingModel/PostProcessingModel.H | 2 +-
.../PostProcessingModelI.H | 2 +-
.../CompositionModel/CompositionModel.C | 2 +-
.../CompositionModel/CompositionModel.H | 2 +-
.../CompositionModel/NewCompositionModel.C | 2 +-
.../SingleMixtureFraction.C | 2 +-
.../SingleMixtureFraction.H | 2 +-
.../SinglePhaseMixture/SinglePhaseMixture.C | 2 +-
.../SinglePhaseMixture/SinglePhaseMixture.H | 2 +-
.../ReactingLookupTableInjection.C | 2 +-
.../ReactingLookupTableInjection.H | 2 +-
.../ConstantRateDevolatilisation.C | 2 +-
.../ConstantRateDevolatilisation.H | 2 +-
.../DevolatilisationModel.C | 2 +-
.../DevolatilisationModel.H | 2 +-
.../NewDevolatilisationModel.C | 2 +-
.../NoDevolatilisation/NoDevolatilisation.C | 2 +-
.../NoDevolatilisation/NoDevolatilisation.H | 2 +-
.../SingleKineticRateDevolatilisation.C | 2 +-
.../SingleKineticRateDevolatilisation.H | 2 +-
.../ReactingMultiphaseLookupTableInjection.C | 2 +-
.../ReactingMultiphaseLookupTableInjection.H | 2 +-
.../ThermoLookupTableInjection.C | 2 +-
.../ThermoLookupTableInjection.H | 2 +-
155 files changed, 837 insertions(+), 3905 deletions(-)
delete mode 100644 src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloud.C
delete mode 100644 src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloud.H
delete mode 100644 src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloudI.H
delete mode 100644 src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.H
delete mode 100644 src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.C
delete mode 100644 src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H
delete mode 100644 src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelI.H
delete mode 100644 src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C
rename src/lagrangian/intermediate/{ => parcels/Templates/KinematicParcel}/CollisionRecordList/CollisionRecord/CollisionRecord.C (100%)
rename src/lagrangian/intermediate/{ => parcels/Templates/KinematicParcel}/CollisionRecordList/CollisionRecord/CollisionRecord.H (100%)
rename src/lagrangian/intermediate/{ => parcels/Templates/KinematicParcel}/CollisionRecordList/CollisionRecord/CollisionRecordI.H (100%)
rename src/lagrangian/intermediate/{ => parcels/Templates/KinematicParcel}/CollisionRecordList/CollisionRecord/CollisionRecordIO.C (100%)
rename src/lagrangian/intermediate/{ => parcels/Templates/KinematicParcel}/CollisionRecordList/CollisionRecordList.C (100%)
rename src/lagrangian/intermediate/{ => parcels/Templates/KinematicParcel}/CollisionRecordList/CollisionRecordList.H (100%)
delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/basicInteractingKinematicParcel.C
delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/basicInteractingKinematicParcel.H
delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/defineBasicInteractingKinematicParcel.C
delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/makeBasicInteractingKinematicParcelSubmodels.C
diff --git a/applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/createFields.H
index f816d386078..dea7477da84 100644
--- a/applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/createFields.H
@@ -69,15 +69,15 @@
laminarTransport.nu()*rhoValue
);
- word interactingKinematicCloudName("interactingKinematicCloud");
- args.optionReadIfPresent("cloudName", interactingKinematicCloudName);
+ word kinematicCloudName("kinematicCloud");
+ args.optionReadIfPresent("cloudName", kinematicCloudName);
- Info<< "Constructing interactingKinematicCloud "
- << interactingKinematicCloudName << endl;
+ Info<< "Constructing kinematicCloud "
+ << kinematicCloudName << endl;
- basicInteractingKinematicCloud interactingKinematicCloud
+ basicKinematicCloud kinematicCloud
(
- interactingKinematicCloudName,
+ kinematicCloudName,
rho,
U,
mu,
diff --git a/applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/incompressibleInteractingKinematicParcelFoam.C b/applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/incompressibleInteractingKinematicParcelFoam.C
index dd70f50d498..49f9583a423 100644
--- a/applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/incompressibleInteractingKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/incompressibleInteractingKinematicParcelFoam.C
@@ -36,7 +36,7 @@ Description
#include "fvCFD.H"
#include "singlePhaseTransportModel.H"
#include "turbulenceModel.H"
-#include "basicInteractingKinematicCloud.H"
+#include "basicKinematicCloud.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,9 +58,9 @@ int main(int argc, char *argv[])
{
Info<< "Time = " << runTime.timeName() << nl << endl;
- Info<< "Evolving " << interactingKinematicCloud.name() << endl;
- interactingKinematicCloud.evolve();
- interactingKinematicCloud.info();
+ Info<< "Evolving " << kinematicCloud.name() << endl;
+ kinematicCloud.evolve();
+ kinematicCloud.info();
runTime.write();
diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 1491fd30f11..2ee3d31c3fa 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -19,17 +19,10 @@ $(BASECLOUDS)/reactingMultiphaseCloud/reactingMultiphaseCloud.C
/* kinematic parcel sub-models */
-// KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
-// $(KINEMATICPARCEL)/basicKinematicParcel.C
-// $(KINEMATICPARCEL)/defineBasicKinematicParcel.C
-// $(KINEMATICPARCEL)/makeBasicKinematicParcelSubmodels.C
-
-
-/* interactingKinematic parcel sub-models */
-INTERACTINGKINEMATICPARCEL=$(DERIVEDPARCELS)/basicInteractingKinematicParcel
-$(INTERACTINGKINEMATICPARCEL)/basicInteractingKinematicParcel.C
-$(INTERACTINGKINEMATICPARCEL)/defineBasicInteractingKinematicParcel.C
-$(INTERACTINGKINEMATICPARCEL)/makeBasicInteractingKinematicParcelSubmodels.C
+KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
+$(KINEMATICPARCEL)/basicKinematicParcel.C
+$(KINEMATICPARCEL)/defineBasicKinematicParcel.C
+$(KINEMATICPARCEL)/makeBasicKinematicParcelSubmodels.C
/* thermo parcel sub-models */
diff --git a/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloud.C
deleted file mode 100644
index 554dcdcb166..00000000000
--- a/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloud.C
+++ /dev/null
@@ -1,348 +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 "InteractingKinematicCloud.H"
-#include "IntegrationScheme.H"
-#include "interpolation.H"
-#include "subCycleTime.H"
-
-#include "DispersionModel.H"
-#include "DragModel.H"
-#include "InjectionModel.H"
-#include "CollisionModel.H"
-#include "PatchInteractionModel.H"
-#include "PostProcessingModel.H"
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::InteractingKinematicCloud<ParcelType>::InteractingKinematicCloud
-(
- const word& cloudName,
- const volScalarField& rho,
- const volVectorField& U,
- const volScalarField& mu,
- const dimensionedVector& g,
- bool readFields
-)
-:
- Cloud<ParcelType>(rho.mesh(), cloudName, false),
- kinematicCloud(),
- mesh_(rho.mesh()),
- particleProperties_
- (
- IOobject
- (
- cloudName + "Properties",
- rho.mesh().time().constant(),
- rho.mesh(),
- IOobject::MUST_READ,
- IOobject::NO_WRITE
- )
- ),
- constProps_(particleProperties_),
- parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))),
- coupled_(particleProperties_.lookup("coupled")),
- cellValueSourceCorrection_
- (
- particleProperties_.lookup("cellValueSourceCorrection")
- ),
- rndGen_(label(0)),
- rho_(rho),
- U_(U),
- mu_(mu),
- g_(g),
- forces_(mesh_, particleProperties_, g_.value()),
- interpolationSchemes_(particleProperties_.subDict("interpolationSchemes")),
- dispersionModel_
- (
- DispersionModel<InteractingKinematicCloud<ParcelType> >::New
- (
- particleProperties_,
- *this
- )
- ),
- dragModel_
- (
- DragModel<InteractingKinematicCloud<ParcelType> >::New
- (
- particleProperties_,
- *this
- )
- ),
- injectionModel_
- (
- InjectionModel<InteractingKinematicCloud<ParcelType> >::New
- (
- particleProperties_,
- *this
- )
- ),
- collisionModel_
- (
- CollisionModel<InteractingKinematicCloud<ParcelType> >::New
- (
- particleProperties_,
- *this
- )
- ),
- patchInteractionModel_
- (
- PatchInteractionModel<InteractingKinematicCloud<ParcelType> >::New
- (
- particleProperties_,
- *this
- )
- ),
- postProcessingModel_
- (
- PostProcessingModel<InteractingKinematicCloud<ParcelType> >::New
- (
- this->particleProperties_,
- *this
- )
- ),
- UIntegrator_
- (
- vectorIntegrationScheme::New
- (
- "U",
- particleProperties_.subDict("integrationSchemes")
- )
- ),
- UTrans_
- (
- IOobject
- (
- this->name() + "UTrans",
- this->db().time().timeName(),
- this->db(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh_,
- dimensionedVector("zero", dimMass*dimVelocity, vector::zero)
- )
-{
- if (readFields)
- {
- ParcelType::readFields(*this);
- }
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::InteractingKinematicCloud<ParcelType>::~InteractingKinematicCloud()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-template<class ParcelType>
-void Foam::InteractingKinematicCloud<ParcelType>::checkParcelProperties
-(
- ParcelType& parcel,
- const scalar lagrangianDt,
- const bool fullyDescribed
-)
-{
- if (!fullyDescribed)
- {
- parcel.rho() = constProps_.rho0();
- }
-
- scalar carrierDt = this->db().time().deltaTValue();
- parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicCloud<ParcelType>::resetSourceTerms()
-{
- UTrans_.field() = vector::zero;
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicCloud<ParcelType>::preEvolve()
-{
- this->dispersion().cacheFields(true);
- forces_.cacheFields(true);
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicCloud<ParcelType>::postEvolve()
-{
- if (debug)
- {
- this->writePositions();
- }
-
- this->dispersion().cacheFields(false);
- forces_.cacheFields(false);
-
- this->postProcessing().post();
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicCloud<ParcelType>::evolve()
-{
- preEvolve();
-
- autoPtr<interpolation<scalar> > rhoInterpolator =
- interpolation<scalar>::New
- (
- interpolationSchemes_,
- rho_
- );
-
- autoPtr<interpolation<vector> > UInterpolator =
- interpolation<vector>::New
- (
- interpolationSchemes_,
- U_
- );
-
- autoPtr<interpolation<scalar> > muInterpolator =
- interpolation<scalar>::New
- (
- interpolationSchemes_,
- mu_
- );
-
- typename ParcelType::trackData td
- (
- *this,
- constProps_,
- rhoInterpolator(),
- UInterpolator(),
- muInterpolator(),
- g_.value()
- );
-
- this->injection().inject(td);
-
- if (coupled_)
- {
- resetSourceTerms();
- }
-
- // Sympletic leapfrog integration of particle forces:
- // + apply half deltaV with stored force
- // + move positions with new velocity
- // + calculate forces in new position
- // + apply half deltaV with new force
-
- label nSubCycles = collision().nSubCycles();
-
- if (nSubCycles > 1)
- {
- subCycleTime moveCollideSubCycle
- (
- const_cast<Time&>(this->db().time()),
- nSubCycles
- );
-
- while(!(++moveCollideSubCycle).end())
- {
- Info<< "subCycle time = " << this->db().time().timeName() << endl;
-
- moveCollide(td);
- }
-
- moveCollideSubCycle.endSubCycle();
- }
- else
- {
- moveCollide(td);
- }
-
- postEvolve();
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicCloud<ParcelType>::moveCollide
-(
- typename ParcelType::trackData& td
-)
-{
- td.part() = ParcelType::trackData::tpVelocityHalfStep;
- Cloud<ParcelType>::move(td);
-
- td.part() = ParcelType::trackData::tpLinearTrack;
- Cloud<ParcelType>::move(td);
-
- // td.part() = ParcelType::trackData::tpRotationalTrack;
- // Cloud<ParcelType>::move(td);
-
- this->collision().collide();
-
- td.part() = ParcelType::trackData::tpVelocityHalfStep;
- Cloud<ParcelType>::move(td);
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicCloud<ParcelType>::info() const
-{
- vector linearMomentum = linearMomentumOfSystem();
- reduce(linearMomentum, sumOp<vector>());
-
- scalar linearKineticEnergy = linearKineticEnergyOfSystem();
- reduce(linearKineticEnergy, sumOp<scalar>());
-
- scalar rotationalKineticEnergy = rotationalKineticEnergyOfSystem();
- reduce(rotationalKineticEnergy, sumOp<scalar>());
-
- Info<< "Cloud: " << this->name() << nl
- << " Total number of parcels added = "
- << returnReduce(this->injection().parcelsAddedTotal(), sumOp<label>())
- << nl
- << " Total mass introduced = "
- << returnReduce(this->injection().massInjected(), sumOp<scalar>())
- << nl
- << " Current number of parcels = "
- << returnReduce(this->size(), sumOp<label>()) << nl
- << " Current mass in system = "
- << returnReduce(massInSystem(), sumOp<scalar>()) << nl
- << " Linear momentum = "
- << linearMomentum << nl
- << " |Linear momentum| = "
- << mag(linearMomentum) << nl
- << " Linear kinetic energy = "
- << linearKineticEnergy << nl
- << " Rotational kinetic energy = "
- << rotationalKineticEnergy << nl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloud.H
deleted file mode 100644
index b21168155cb..00000000000
--- a/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloud.H
+++ /dev/null
@@ -1,432 +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
-
-Class
- Foam::InteractingKinematicCloud
-
-Description
- Templated base class for interactingKinematic cloud
-
- - InteractingKinematic only
- - Particle collisions
- - Dispersion model
- - Drag model
- - Injection model
- - Wall interaction model
-
-SourceFiles
- InteractingKinematicCloudI.H
- InteractingKinematicCloud.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef InteractingKinematicCloud_H
-#define InteractingKinematicCloud_H
-
-#include "Cloud.H"
-#include "kinematicCloud.H"
-#include "IOdictionary.H"
-#include "autoPtr.H"
-#include "Random.H"
-#include "fvMesh.H"
-#include "volFields.H"
-#include "fvMatrices.H"
-#include "particleForces.H"
-
-#include "IntegrationSchemesFwd.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-
-template<class CloudType>
-class DispersionModel;
-
-template<class CloudType>
-class DragModel;
-
-template<class CloudType>
-class InjectionModel;
-
-template<class CloudType>
-class CollisionModel;
-
-template<class CloudType>
-class PostProcessingModel;
-
-template<class CloudType>
-class PatchInteractionModel;
-
-/*---------------------------------------------------------------------------*\
- Class InteractingKinematicCloud Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class ParcelType>
-class InteractingKinematicCloud
-:
- public Cloud<ParcelType>,
- public kinematicCloud
-{
- // Private Member Functions
-
- //- Disallow default bitwise copy construct
- InteractingKinematicCloud(const InteractingKinematicCloud&);
-
- //- Disallow default bitwise assignment
- void operator=(const InteractingKinematicCloud&);
-
-
-protected:
-
- // Protected data
-
- //- References to the mesh and time databases
- const fvMesh& mesh_;
-
- //- Dictionary of particle properties
- IOdictionary particleProperties_;
-
- //- Parcel constant properties
- typename ParcelType::constantProperties constProps_;
-
- //- Parcel type id - used to flag the type of parcels issued by this
- // cloud
- const label parcelTypeId_;
-
- //- Flag to indicate whether parcels are coupled to the carrier phase
- // i.e. whether or not to generate source terms for carrier phase
- const Switch coupled_;
-
- //- Flag to correct cell values with latest transfer information
- // during the lagrangian timestep
- const Switch cellValueSourceCorrection_;
-
- //- Random number generator - used by some injection routines
- Random rndGen_;
-
-
- // References to the carrier gas fields
-
- //- Density
- const volScalarField& rho_;
-
- //- Velocity
- const volVectorField& U_;
-
- //- Dynamic viscosity
- const volScalarField& mu_;
-
-
- // Environmental properties
-
- //- Gravity
- const dimensionedVector& g_;
-
-
- //- Optional particle forces
- particleForces forces_;
-
- //- Interpolation schemes dictionary
- dictionary interpolationSchemes_;
-
-
- // References to the cloud sub-models
-
- //- Dispersion model
- autoPtr<DispersionModel<InteractingKinematicCloud<ParcelType> > >
- dispersionModel_;
-
- //- Drag transfer model
- autoPtr<DragModel<InteractingKinematicCloud<ParcelType> > >
- dragModel_;
-
- //- Injector model
- autoPtr<InjectionModel<InteractingKinematicCloud<ParcelType> > >
- injectionModel_;
-
- //- Collision model
- autoPtr<CollisionModel<InteractingKinematicCloud<ParcelType> > >
- collisionModel_;
-
- //- Patch interaction model
- autoPtr
- <
- PatchInteractionModel<InteractingKinematicCloud<ParcelType> >
- >
- patchInteractionModel_;
-
- //- Post-processing model
- autoPtr
- <
- PostProcessingModel<InteractingKinematicCloud<ParcelType> >
- >
- postProcessingModel_;
-
-
- // Reference to the particle integration schemes
-
- //- Velocity integration
- autoPtr<vectorIntegrationScheme> UIntegrator_;
-
-
- // Sources
-
- //- Momentum
- DimensionedField<vector, volMesh> UTrans_;
-
-
- // Cloud evolution functions
-
- //- Pre-evolve
- void preEvolve();
-
- //- Move-collide
- void moveCollide(typename ParcelType::trackData& td);
-
- //- Post-evolve
- void postEvolve();
-
-
-public:
-
- // Constructors
-
- //- Construct given carrier gas fields
- InteractingKinematicCloud
- (
- const word& cloudName,
- const volScalarField& rho,
- const volVectorField& U,
- const volScalarField& mu,
- const dimensionedVector& g,
- bool readFields = true
- );
-
-
- //- Destructor
- virtual ~InteractingKinematicCloud();
-
-
- //- Type of parcel the cloud was instantiated for
- typedef ParcelType parcelType;
-
-
- // Member Functions
-
- // Access
-
- // References to the mesh and databases
-
- //- Return the parcel type id
- inline label parcelTypeId() const;
-
- //- Return refernce to the mesh
- inline const fvMesh& mesh() const;
-
- //- Return particle properties dictionary
- inline const IOdictionary& particleProperties() const;
-
- //- Return the constant properties
- inline const typename ParcelType::constantProperties&
- constProps() const;
-
-
- //- Return coupled flag
- inline const Switch coupled() const;
-
- //- Return cell value correction flag
- inline const Switch cellValueSourceCorrection() const;
-
- //- Return refernce to the random object
- inline Random& rndGen();
-
-
- // References to the carrier gas fields
-
- //- Return carrier gas velocity
- inline const volVectorField& U() const;
-
- //- Return carrier gas density
- inline const volScalarField& rho() const;
-
- //- Return carrier gas dynamic viscosity
- inline const volScalarField& mu() const;
-
-
- // Environmental properties
-
- //- Gravity
- inline const dimensionedVector& g() const;
-
-
- //- Optional particle forces
- inline const particleForces& forces() const;
-
-
- // Interpolations
-
- //- Return reference to the interpolation dictionary
- inline const dictionary& interpolationSchemes() const;
-
-
- // Sub-models
-
- //- Return const-access to the dispersion model
- inline
- const DispersionModel<InteractingKinematicCloud<ParcelType> >&
- dispersion() const;
-
- //- Return reference to the dispersion model
- inline DispersionModel<InteractingKinematicCloud<ParcelType> >&
- dispersion();
-
- //- Return const-access to the drag model
- inline const DragModel<InteractingKinematicCloud<ParcelType> >&
- drag() const;
-
- //- Return const access to the injection model
- inline
- const InjectionModel<InteractingKinematicCloud<ParcelType> >&
- injection() const;
-
- //- Return reference to the injection model
- inline InjectionModel<InteractingKinematicCloud<ParcelType> >&
- injection();
-
- //- Return const access to the collision model
- inline
- const CollisionModel<InteractingKinematicCloud<ParcelType> >&
- collision() const;
-
- //- Return reference to the collision model
- inline CollisionModel<InteractingKinematicCloud<ParcelType> >&
- collision();
-
- //- Return const-access to the patch interaction model
- inline
- const PatchInteractionModel
- <
- InteractingKinematicCloud<ParcelType>
- >&
- patchInteraction() const;
-
- //- Return reference to post-processing model
- inline
- PostProcessingModel<InteractingKinematicCloud<ParcelType> >&
- postProcessing();
-
-
- // Integration schemes
-
- //-Return reference to velocity integration
- inline const vectorIntegrationScheme& UIntegrator() const;
-
-
- // Sources
-
- // Momentum
-
- //- Return reference to momentum source
- inline DimensionedField<vector, volMesh>& UTrans();
-
- //- Return tmp momentum source term - fully explicit
- inline tmp<DimensionedField<vector, volMesh> > SU() const;
-
-
- // Check
-
- //- Total mass injected
- inline scalar massInjected() const;
-
- //- Total mass in system
- inline scalar massInSystem() const;
-
- //- Total linear momentum of the system
- inline vector linearMomentumOfSystem() const;
-
- //- Total linear kinetic energy in the system
- inline scalar linearKineticEnergyOfSystem() const;
-
- //- Total rotational kinetic energy in the system
- inline scalar rotationalKineticEnergyOfSystem() const;
-
- //- Print cloud information
- void info() const;
-
-
- // Fields
-
- //- Return the particle volume fraction field
- // Note: for particles belonging to this cloud only
- inline const tmp<volScalarField> theta() const;
-
- //- Return the particle mass fraction field
- // Note: for particles belonging to this cloud only
- inline const tmp<volScalarField> alpha() const;
-
- //- Return the particle effective density field
- // Note: for particles belonging to this cloud only
- inline const tmp<volScalarField> rhoEff() const;
-
-
- // Cloud evolution functions
-
- //- Check parcel properties
- void checkParcelProperties
- (
- ParcelType& parcel,
- const scalar lagrangianDt,
- const bool fullyDescribed
- );
-
- //- Reset the spray source terms
- void resetSourceTerms();
-
- //- Evolve the spray (inject, inject)
- void evolve();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "InteractingKinematicCloudI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-# include "InteractingKinematicCloud.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloudI.H
deleted file mode 100644
index 37326e11c52..00000000000
--- a/src/lagrangian/intermediate/clouds/Templates/InteractingKinematicCloud/InteractingKinematicCloudI.H
+++ /dev/null
@@ -1,436 +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 "fvmSup.H"
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-template<class ParcelType>
-inline Foam::label
-Foam::InteractingKinematicCloud<ParcelType>::parcelTypeId() const
-{
- return parcelTypeId_;
-}
-
-
-template<class ParcelType>
-inline const Foam::fvMesh&
-Foam::InteractingKinematicCloud<ParcelType>::mesh() const
-{
- return mesh_;
-}
-
-
-template<class ParcelType>
-inline const Foam::IOdictionary&
-Foam::InteractingKinematicCloud<ParcelType>::particleProperties() const
-{
- return particleProperties_;
-}
-
-
-template<class ParcelType>
-inline const typename ParcelType::constantProperties&
-Foam::InteractingKinematicCloud<ParcelType>::constProps() const
-{
- return constProps_;
-}
-
-
-template<class ParcelType>
-inline const Foam::Switch
-Foam::InteractingKinematicCloud<ParcelType>::coupled() const
-{
- return coupled_;
-}
-
-
-template <class ParcelType>
-inline const Foam::Switch
-Foam::InteractingKinematicCloud<ParcelType>::cellValueSourceCorrection() const
-{
- return cellValueSourceCorrection_;
-}
-
-
-template<class ParcelType>
-inline const Foam::volScalarField&
-Foam::InteractingKinematicCloud<ParcelType>::rho() const
-{
- return rho_;
-}
-
-
-template<class ParcelType>
-inline const Foam::volVectorField&
-Foam::InteractingKinematicCloud<ParcelType>::U() const
-{
- return U_;
-}
-
-
-template<class ParcelType>
-inline const Foam::volScalarField&
-Foam::InteractingKinematicCloud<ParcelType>::mu() const
-{
- return mu_;
-}
-
-
-template<class ParcelType>
-inline const Foam::dimensionedVector&
-Foam::InteractingKinematicCloud<ParcelType>::g() const
-{
- return g_;
-}
-
-
-template<class ParcelType>
-inline const Foam::particleForces&
-Foam::InteractingKinematicCloud<ParcelType>::forces() const
-{
- return forces_;
-}
-
-
-template<class ParcelType>
-inline const Foam::dictionary&
-Foam::InteractingKinematicCloud<ParcelType>::interpolationSchemes() const
-{
- return interpolationSchemes_;
-}
-
-
-template<class ParcelType>
-inline
-const Foam::DispersionModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::dispersion() const
-{
- return dispersionModel_;
-}
-
-
-template<class ParcelType>
-inline Foam::DispersionModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::dispersion()
-{
- return dispersionModel_();
-}
-
-
-template<class ParcelType>
-inline const Foam::DragModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::drag() const
-{
- return dragModel_;
-}
-
-
-template<class ParcelType>
-inline const Foam::InjectionModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::injection() const
-{
- return injectionModel_;
-}
-
-
-template<class ParcelType>
-inline
-const Foam::PatchInteractionModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::patchInteraction() const
-{
- return patchInteractionModel_;
-}
-
-
-template<class ParcelType>
-inline Foam::InjectionModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::injection()
-{
- return injectionModel_();
-}
-
-
-template<class ParcelType>
-inline const Foam::CollisionModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::collision() const
-{
- return collisionModel_();
-}
-
-
-template<class ParcelType>
-inline Foam::CollisionModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::collision()
-{
- return collisionModel_();
-}
-
-
-template<class ParcelType>
-inline Foam::PostProcessingModel<Foam::InteractingKinematicCloud<ParcelType> >&
-Foam::InteractingKinematicCloud<ParcelType>::postProcessing()
-{
- return postProcessingModel_();
-}
-
-
-template<class ParcelType>
-inline const Foam::vectorIntegrationScheme&
-Foam::InteractingKinematicCloud<ParcelType>::UIntegrator() const
-{
- return UIntegrator_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicCloud<ParcelType>::massInSystem() const
-{
- scalar sysMass = 0.0;
- forAllConstIter(typename InteractingKinematicCloud<ParcelType>, *this, iter)
- {
- const ParcelType& p = iter();
- sysMass += p.mass()*p.nParticle();
- }
-
- return sysMass;
-}
-
-
-template<class ParcelType>
-inline Foam::vector
-Foam::InteractingKinematicCloud<ParcelType>::linearMomentumOfSystem() const
-{
- vector linearMomentum(vector::zero);
-
- forAllConstIter(typename InteractingKinematicCloud<ParcelType>, *this, iter)
- {
- const ParcelType& p = iter();
-
- linearMomentum += p.mass()*p.U();
- }
-
- return linearMomentum;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicCloud<ParcelType>::linearKineticEnergyOfSystem() const
-{
- scalar linearKineticEnergy = 0.0;
-
- forAllConstIter(typename InteractingKinematicCloud<ParcelType>, *this, iter)
- {
- const ParcelType& p = iter();
-
- linearKineticEnergy += 0.5*p.mass()*(p.U() & p.U());
- }
-
- return linearKineticEnergy;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicCloud<ParcelType>::
-rotationalKineticEnergyOfSystem() const
-{
- scalar rotationalKineticEnergy = 0.0;
-
- forAllConstIter(typename InteractingKinematicCloud<ParcelType>, *this, iter)
- {
- const ParcelType& p = iter();
-
- rotationalKineticEnergy +=
- 0.5*p.momentOfInertia()*(p.omega() & p.omega());
- }
-
- return rotationalKineticEnergy;
-}
-
-
-template<class ParcelType>
-inline Foam::Random& Foam::InteractingKinematicCloud<ParcelType>::rndGen()
-{
- return rndGen_;
-}
-
-
-template<class ParcelType>
-inline Foam::DimensionedField<Foam::vector, Foam::volMesh>&
-Foam::InteractingKinematicCloud<ParcelType>::UTrans()
-{
- return UTrans_;
-}
-
-
-template<class ParcelType>
-inline Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
-Foam::InteractingKinematicCloud<ParcelType>::SU() const
-{
- tmp<DimensionedField<vector, volMesh> > tSU
- (
- new DimensionedField<vector, volMesh>
- (
- IOobject
- (
- this->name() + "SU",
- this->db().time().timeName(),
- this->mesh(),
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- this->mesh(),
- dimensionedVector
- (
- "zero",
- dimDensity*dimVelocity/dimTime,
- vector::zero
- )
- )
- );
-
- vectorField& SU = tSU().field();
- SU = UTrans_/(mesh_.V()*this->db().time().deltaT());
-
- return tSU;
-}
-
-
-template<class ParcelType>
-inline const Foam::tmp<Foam::volScalarField>
-Foam::InteractingKinematicCloud<ParcelType>::theta() const
-{
- tmp<volScalarField> ttheta
- (
- new volScalarField
- (
- IOobject
- (
- this->name() + "Theta",
- this->db().time().timeName(),
- this->db(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh_,
- dimensionedScalar("zero", dimless, 0.0)
- )
- );
-
- scalarField& theta = ttheta().internalField();
- forAllConstIter(typename InteractingKinematicCloud<ParcelType>, *this, iter)
- {
- const ParcelType& p = iter();
- const label cellI = p.cell();
-
- theta[cellI] += p.nParticle()*p.volume();
- }
-
- theta /= mesh().V();
-
- return ttheta;
-}
-
-
-template<class ParcelType>
-inline const Foam::tmp<Foam::volScalarField>
-Foam::InteractingKinematicCloud<ParcelType>::alpha() const
-{
- tmp<volScalarField> talpha
- (
- new volScalarField
- (
- IOobject
- (
- this->name() + "Alpha",
- this->db().time().timeName(),
- this->db(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh_,
- dimensionedScalar("zero", dimless, 0.0)
- )
- );
-
- scalarField& alpha = talpha().internalField();
- forAllConstIter(typename InteractingKinematicCloud<ParcelType>, *this, iter)
- {
- const ParcelType& p = iter();
- const label cellI = p.cell();
-
- alpha[cellI] += p.nParticle()*p.mass();
- }
-
- alpha /= (mesh().V()*rho_);
-
- return talpha;
-}
-
-
-template<class ParcelType>
-inline const Foam::tmp<Foam::volScalarField>
-Foam::InteractingKinematicCloud<ParcelType>::rhoEff() const
-{
- tmp<volScalarField> trhoEff
- (
- new volScalarField
- (
- IOobject
- (
- this->name() + "RhoEff",
- this->db().time().timeName(),
- this->db(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- mesh_,
- dimensionedScalar("zero", dimDensity, 0.0)
- )
- );
-
- scalarField& rhoEff = trhoEff().internalField();
- forAllConstIter(typename InteractingKinematicCloud<ParcelType>, *this, iter)
- {
- const ParcelType& p = iter();
- const label cellI = p.cell();
-
- rhoEff[cellI] += p.nParticle()*p.mass();
- }
-
- rhoEff /= mesh().V();
-
- return trhoEff;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 29130c69dc7..d1ff2043983 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -27,10 +27,12 @@ License
#include "KinematicCloud.H"
#include "IntegrationScheme.H"
#include "interpolation.H"
+#include "subCycleTime.H"
#include "DispersionModel.H"
#include "DragModel.H"
#include "InjectionModel.H"
+#include "CollisionModel.H"
#include "PatchInteractionModel.H"
#include "PostProcessingModel.H"
@@ -85,6 +87,56 @@ void Foam::KinematicCloud<ParcelType>::evolveCloud()
resetSourceTerms();
}
+ // Sympletic leapfrog integration of particle forces:
+ // + apply half deltaV with stored force
+ // + move positions with new velocity
+ // + calculate forces in new position
+ // + apply half deltaV with new force
+
+ label nSubCycles = collision().nSubCycles();
+
+ if (nSubCycles > 1)
+ {
+ subCycleTime moveCollideSubCycle
+ (
+ const_cast<Time&>(this->db().time()),
+ nSubCycles
+ );
+
+ while(!(++moveCollideSubCycle).end())
+ {
+ Info<< "subCycle time = " << this->db().time().timeName() << endl;
+
+ moveCollide(td);
+ }
+
+ moveCollideSubCycle.endSubCycle();
+ }
+ else
+ {
+ moveCollide(td);
+ }
+}
+
+
+template<class ParcelType>
+void Foam::KinematicCloud<ParcelType>::moveCollide
+(
+ typename ParcelType::trackData& td
+)
+{
+ td.part() = ParcelType::trackData::tpVelocityHalfStep;
+ Cloud<ParcelType>::move(td);
+
+ td.part() = ParcelType::trackData::tpLinearTrack;
+ Cloud<ParcelType>::move(td);
+
+ // td.part() = ParcelType::trackData::tpRotationalTrack;
+ // Cloud<ParcelType>::move(td);
+
+ this->collision().collide();
+
+ td.part() = ParcelType::trackData::tpVelocityHalfStep;
Cloud<ParcelType>::move(td);
}
@@ -170,6 +222,14 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
*this
)
),
+ collisionModel_
+ (
+ CollisionModel<KinematicCloud<ParcelType> >::New
+ (
+ particleProperties_,
+ *this
+ )
+ ),
patchInteractionModel_
(
PatchInteractionModel<KinematicCloud<ParcelType> >::New
@@ -270,15 +330,34 @@ void Foam::KinematicCloud<ParcelType>::evolve()
template<class ParcelType>
void Foam::KinematicCloud<ParcelType>::info() const
{
+ vector linearMomentum = linearMomentumOfSystem();
+ reduce(linearMomentum, sumOp<vector>());
+
+ scalar linearKineticEnergy = linearKineticEnergyOfSystem();
+ reduce(linearKineticEnergy, sumOp<scalar>());
+
+ scalar rotationalKineticEnergy = rotationalKineticEnergyOfSystem();
+ reduce(rotationalKineticEnergy, sumOp<scalar>());
+
Info<< "Cloud: " << this->name() << nl
<< " Total number of parcels added = "
- << this->injection().parcelsAddedTotal() << nl
+ << returnReduce(this->injection().parcelsAddedTotal(), sumOp<label>())
+ << nl
<< " Total mass introduced = "
- << this->injection().massInjected() << nl
+ << returnReduce(this->injection().massInjected(), sumOp<scalar>())
+ << nl
<< " Current number of parcels = "
<< returnReduce(this->size(), sumOp<label>()) << nl
<< " Current mass in system = "
- << returnReduce(massInSystem(), sumOp<scalar>()) << nl;
+ << returnReduce(massInSystem(), sumOp<scalar>()) << nl
+ << " Linear momentum = "
+ << linearMomentum << nl
+ << " |Linear momentum| = "
+ << mag(linearMomentum) << nl
+ << " Linear kinetic energy = "
+ << linearKineticEnergy << nl
+ << " Rotational kinetic energy = "
+ << rotationalKineticEnergy << nl;
}
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 3bd89a61a32..75d74d343a9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -33,6 +33,7 @@ Description
- Drag model
- Injection model
- Wall interaction model
+ - Collision model
SourceFiles
KinematicCloudI.H
@@ -71,6 +72,9 @@ class DragModel;
template<class CloudType>
class InjectionModel;
+template<class CloudType>
+class CollisionModel;
+
template<class CloudType>
class PostProcessingModel;
@@ -166,6 +170,10 @@ protected:
autoPtr<InjectionModel<KinematicCloud<ParcelType> > >
injectionModel_;
+ //- Collision model
+ autoPtr<CollisionModel<KinematicCloud<ParcelType> > >
+ collisionModel_;
+
//- Patch interaction model
autoPtr<PatchInteractionModel<KinematicCloud<ParcelType> > >
patchInteractionModel_;
@@ -195,6 +203,9 @@ protected:
//- Evolve the cloud
void evolveCloud();
+ //- Move-collide
+ void moveCollide(typename ParcelType::trackData& td);
+
//- Post-evolve
void postEvolve();
@@ -308,6 +319,15 @@ public:
inline InjectionModel<KinematicCloud<ParcelType> >&
injection();
+ //- Return const access to the collision model
+ inline
+ const CollisionModel<KinematicCloud<ParcelType> >&
+ collision() const;
+
+ //- Return reference to the collision model
+ inline CollisionModel<KinematicCloud<ParcelType> >&
+ collision();
+
//- Return const-access to the patch interaction model
inline const PatchInteractionModel<KinematicCloud<ParcelType> >&
patchInteraction() const;
@@ -342,6 +362,15 @@ public:
//- Total mass in system
inline scalar massInSystem() const;
+ //- Total linear momentum of the system
+ inline vector linearMomentumOfSystem() const;
+
+ //- Total linear kinetic energy in the system
+ inline scalar linearKineticEnergyOfSystem() const;
+
+ //- Total rotational kinetic energy in the system
+ inline scalar rotationalKineticEnergyOfSystem() const;
+
//- Print cloud information
void info() const;
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index e65ed157413..06a517c3ee8 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -174,6 +174,22 @@ Foam::KinematicCloud<ParcelType>::injection()
}
+template<class ParcelType>
+inline const Foam::CollisionModel<Foam::KinematicCloud<ParcelType> >&
+Foam::KinematicCloud<ParcelType>::collision() const
+{
+ return collisionModel_();
+}
+
+
+template<class ParcelType>
+inline Foam::CollisionModel<Foam::KinematicCloud<ParcelType> >&
+Foam::KinematicCloud<ParcelType>::collision()
+{
+ return collisionModel_();
+}
+
+
template<class ParcelType>
inline Foam::PostProcessingModel<Foam::KinematicCloud<ParcelType> >&
Foam::KinematicCloud<ParcelType>::postProcessing()
@@ -204,6 +220,59 @@ inline Foam::scalar Foam::KinematicCloud<ParcelType>::massInSystem() const
}
+template<class ParcelType>
+inline Foam::vector
+Foam::KinematicCloud<ParcelType>::linearMomentumOfSystem() const
+{
+ vector linearMomentum(vector::zero);
+
+ forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+ {
+ const ParcelType& p = iter();
+
+ linearMomentum += p.mass()*p.U();
+ }
+
+ return linearMomentum;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::KinematicCloud<ParcelType>::linearKineticEnergyOfSystem() const
+{
+ scalar linearKineticEnergy = 0.0;
+
+ forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+ {
+ const ParcelType& p = iter();
+
+ linearKineticEnergy += 0.5*p.mass()*(p.U() & p.U());
+ }
+
+ return linearKineticEnergy;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::KinematicCloud<ParcelType>::
+rotationalKineticEnergyOfSystem() const
+{
+ scalar rotationalKineticEnergy = 0.0;
+
+ forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+ {
+ const ParcelType& p = iter();
+
+ rotationalKineticEnergy +=
+ 0.5*p.momentOfInertia()*(p.omega() & p.omega());
+ }
+
+ return rotationalKineticEnergy;
+}
+
+
template<class ParcelType>
inline Foam::Random& Foam::KinematicCloud<ParcelType>::rndGen()
{
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 3df450724bf..5d194aad408 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index d3cf593678f..2c6ffc68202 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
index ac0b0291501..8e054edf35a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 8e3317197cd..b3135ce81c9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -35,7 +35,7 @@ License
template<class ParcelType>
void Foam::ThermoCloud<ParcelType>::preEvolve()
{
- InteractingKinematicCloud<ParcelType>::preEvolve();
+ KinematicCloud<ParcelType>::preEvolve();
}
@@ -101,7 +101,7 @@ void Foam::ThermoCloud<ParcelType>::evolveCloud()
template<class ParcelType>
void Foam::ThermoCloud<ParcelType>::postEvolve()
{
- InteractingKinematicCloud<ParcelType>::postEvolve();
+ KinematicCloud<ParcelType>::postEvolve();
}
@@ -118,7 +118,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
bool readFields
)
:
- InteractingKinematicCloud<ParcelType>
+ KinematicCloud<ParcelType>
(
cloudName,
rho,
@@ -186,7 +186,7 @@ void Foam::ThermoCloud<ParcelType>::checkParcelProperties
const bool fullyDescribed
)
{
- InteractingKinematicCloud<ParcelType>::checkParcelProperties
+ KinematicCloud<ParcelType>::checkParcelProperties
(
parcel,
lagrangianDt,
@@ -204,7 +204,7 @@ void Foam::ThermoCloud<ParcelType>::checkParcelProperties
template<class ParcelType>
void Foam::ThermoCloud<ParcelType>::resetSourceTerms()
{
- InteractingKinematicCloud<ParcelType>::resetSourceTerms();
+ KinematicCloud<ParcelType>::resetSourceTerms();
hsTrans_.field() = 0.0;
}
@@ -229,7 +229,7 @@ void Foam::ThermoCloud<ParcelType>::evolve()
template<class ParcelType>
void Foam::ThermoCloud<ParcelType>::info() const
{
- InteractingKinematicCloud<ParcelType>::info();
+ KinematicCloud<ParcelType>::info();
}
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index bae3036a8b9..b5d9f27b8b7 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -40,7 +40,7 @@ SourceFiles
#ifndef ThermoCloud_H
#define ThermoCloud_H
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "thermoCloud.H"
#include "basicThermo.H"
@@ -61,7 +61,7 @@ class HeatTransferModel;
template<class ParcelType>
class ThermoCloud
:
- public InteractingKinematicCloud<ParcelType>,
+ public KinematicCloud<ParcelType>,
public thermoCloud
{
// Private Member Functions
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
index 3a8d69c2ef8..841fb194010 100644
--- a/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.H
deleted file mode 100644
index 0cea71c4b0a..00000000000
--- a/src/lagrangian/intermediate/clouds/derived/basicInteractingKinematicCloud/basicInteractingKinematicCloud.H
+++ /dev/null
@@ -1,54 +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
-
-Class
- Foam::basicInteractingKinematicCloud
-
-Description
- Cloud class to introduce interacting kinematic parcels
-
-SourceFiles
- basicInteractingKinematicCloud.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef basicInteractingKinematicCloud_H
-#define basicInteractingKinematicCloud_H
-
-#include "InteractingKinematicCloud.H"
-#include "basicInteractingKinematicParcel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- typedef InteractingKinematicCloud<basicInteractingKinematicParcel>
- basicInteractingKinematicCloud;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index 3a277e415a9..988322e775e 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -26,7 +26,7 @@ Class
Foam::basicKinematicCloud
Description
- Cloud class to introduce kinematic parcels
+ Cloud class to introduce interacting kinematic parcels
SourceFiles
basicKinematicCloud.C
diff --git a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.C
deleted file mode 100644
index 9220aecf965..00000000000
--- a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.C
+++ /dev/null
@@ -1,441 +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 "InteractingKinematicParcel.H"
-#include "dimensionedConstants.H"
-
-// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * //
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::InteractingKinematicParcel<ParcelType>::setCellValues
-(
- TrackData& td,
- const scalar dt,
- const label cellI
-)
-{
- rhoc_ = td.rhoInterp().interpolate(this->position(), cellI);
- if (rhoc_ < td.constProps().rhoMin())
- {
- WarningIn
- (
- "void Foam::InteractingKinematicParcel<ParcelType>::setCellValues"
- "("
- "TrackData&, "
- "const scalar, "
- "const label"
- ")"
- ) << "Limiting observed density in cell " << cellI << " to "
- << td.constProps().rhoMin() << nl << endl;
-
- rhoc_ = td.constProps().rhoMin();
- }
-
- Uc_ = td.UInterp().interpolate(this->position(), cellI);
-
- muc_ = td.muInterp().interpolate(this->position(), cellI);
-
- // Apply dispersion components to carrier phase velocity
- Uc_ = td.cloud().dispersion().update
- (
- dt,
- cellI,
- U_,
- Uc_,
- UTurb_,
- tTurb_
- );
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::InteractingKinematicParcel<ParcelType>::cellValueSourceCorrection
-(
- TrackData& td,
- const scalar dt,
- const label cellI
-)
-{
- Uc_ += td.cloud().UTrans()[cellI]/massCell(cellI);
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::InteractingKinematicParcel<ParcelType>::calc
-(
- TrackData& td,
- const scalar dt,
- const label cellI
-)
-{
- // Define local properties at beginning of time step
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- const scalar np0 = nParticle_;
- const scalar d0 = d_;
- const vector U0 = U_;
- const scalar rho0 = rho_;
- const scalar mass0 = mass();
-
- // Reynolds number
- const scalar Re = this->Re(U0, d0, rhoc_, muc_);
-
-
- // Sources
- //~~~~~~~~
-
- // Explicit momentum source for particle
- vector Su = vector::zero;
-
-
- // Momentum transfer from the particle to the carrier phase
- vector dUTrans = vector::zero;
-
-
- // Motion
- // ~~~~~~
-
- // Calculate new particle velocity
- vector U1 =
- calcVelocity(td, dt, cellI, Re, muc_, d0, U0, rho0, mass0, Su, dUTrans);
-
-
- // Accumulate carrier phase source terms
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- if (td.cloud().coupled())
- {
- // Update momentum transfer
- td.cloud().UTrans()[cellI] += np0*dUTrans;
- }
-
-
- // Set new particle properties
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
- U_ = U1;
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-const Foam::vector Foam::InteractingKinematicParcel<ParcelType>::calcVelocity
-(
- TrackData& td,
- const scalar dt,
- const label cellI,
- const scalar Re,
- const scalar mu,
- const scalar d,
- const vector& U,
- const scalar rho,
- const scalar mass,
- const vector& Su,
- vector& dUTrans
-) const
-{
- const polyMesh& mesh = this->cloud().pMesh();
-
- // Momentum transfer coefficient
- const scalar utc = td.cloud().drag().utc(Re, d, mu) + ROOTVSMALL;
-
- // Momentum source due to particle forces
- const vector FCoupled =
- mass*td.cloud().forces().calcCoupled(cellI, dt, rhoc_, rho, Uc_, U);
- const vector FNonCoupled =
- mass*td.cloud().forces().calcNonCoupled(cellI, dt, rhoc_, rho, Uc_, U);
-
- // New particle velocity
- //~~~~~~~~~~~~~~~~~~~~~~
-
- // Update velocity - treat as 3-D
- const scalar As = this->areaS(d);
- const vector ap = Uc_ + (FCoupled + FNonCoupled + Su)/(utc*As);
- const scalar bp = 6.0*utc/(rho*d);
-
- IntegrationScheme<vector>::integrationResult Ures =
- td.cloud().UIntegrator().integrate(U, dt, ap, bp);
-
- vector Unew = Ures.value();
-
- dUTrans += dt*(utc*As*(Ures.average() - Uc_) - FCoupled);
-
- // Apply correction to velocity and dUTrans for reduced-D cases
- meshTools::constrainDirection(mesh, mesh.solutionD(), Unew);
- meshTools::constrainDirection(mesh, mesh.solutionD(), dUTrans);
-
- return Unew;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-template <class ParcelType>
-Foam::InteractingKinematicParcel<ParcelType>::InteractingKinematicParcel
-(
- const InteractingKinematicParcel<ParcelType>& p
-)
-:
- Particle<ParcelType>(p),
- typeId_(p.typeId_),
- nParticle_(p.nParticle_),
- d_(p.d_),
- U_(p.U_),
- f_(p.f_),
- pi_(p.pi_),
- tau_(p.tau_),
- rho_(p.rho_),
- tTurb_(p.tTurb_),
- UTurb_(p.UTurb_),
- collisionRecords_(p.collisionRecords_),
- rhoc_(p.rhoc_),
- Uc_(p.Uc_),
- muc_(p.muc_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-template<class ParcelType>
-template<class TrackData>
-bool Foam::InteractingKinematicParcel<ParcelType>::move(TrackData& td)
-{
- ParcelType& p = static_cast<ParcelType&>(*this);
-
- td.switchProcessor = false;
- td.keepParticle = true;
-
- const polyMesh& mesh = td.cloud().pMesh();
- const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
-
- const scalar deltaT = mesh.time().deltaTValue();
-
- switch (td.part())
- {
- case TrackData::tpVelocityHalfStep:
- {
- // First and last leapfrog velocity adjust part, required
- // before and after tracking and force calculation
-
- p.U() += 0.5*deltaT*p.f()/p.mass();
-
- pi_ += 0.5*deltaT*tau_;
-
- break;
- }
-
- case TrackData::tpLinearTrack:
- {
- scalar tEnd = (1.0 - p.stepFraction())*deltaT;
- const scalar dtMax = tEnd;
-
- while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
- {
- // Apply correction to position for reduced-D cases
- meshTools::constrainToMeshCentre(mesh, p.position());
-
- // Set the Lagrangian time-step
- scalar dt = min(dtMax, tEnd);
-
- // Remember which cell the Parcel is in since this
- // will change if a face is hit
- label cellI = p.cell();
-
- dt *= p.trackToFace(p.position() + dt*U_, td);
-
- tEnd -= dt;
- p.stepFraction() = 1.0 - tEnd/deltaT;
-
- // Avoid problems with extremely small timesteps
- if (dt > ROOTVSMALL)
- {
- // Update cell based properties
- p.setCellValues(td, dt, cellI);
-
- if (td.cloud().cellValueSourceCorrection())
- {
- p.cellValueSourceCorrection(td, dt, cellI);
- }
-
- p.calc(td, dt, cellI);
- }
-
- if (p.onBoundary() && td.keepParticle)
- {
- if (isType<processorPolyPatch>(pbMesh[p.patch(p.face())]))
- {
- td.switchProcessor = true;
- }
- }
- }
-
- break;
- }
-
- case TrackData::tpRotationalTrack:
- {
- Info<< "No rotational tracking implementation" << endl;
-
- break;
- }
-
- default:
- {
- FatalErrorIn
- (
- "InteractingKinematicParcel<ParcelType>::move(TrackData& td)"
- ) << td.part()
- << " is an invalid part of the tracking method."
- << abort(FatalError);
- }
- }
-
- return td.keepParticle;
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-bool Foam::InteractingKinematicParcel<ParcelType>::hitPatch
-(
- const polyPatch& pp,
- TrackData& td,
- const label patchI
-)
-{
- ParcelType& p = static_cast<ParcelType&>(*this);
- td.cloud().postProcessing().postPatch(p, patchI);
-
- return td.cloud().patchInteraction().correct
- (
- pp,
- this->face(),
- td.keepParticle,
- U_
- );
-}
-
-
-template<class ParcelType>
-bool Foam::InteractingKinematicParcel<ParcelType>::hitPatch
-(
- const polyPatch& pp,
- int& td,
- const label patchI
-)
-{
- return false;
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::InteractingKinematicParcel<ParcelType>::hitProcessorPatch
-(
- const processorPolyPatch&,
- TrackData& td
-)
-{
- td.switchProcessor = true;
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicParcel<ParcelType>::hitProcessorPatch
-(
- const processorPolyPatch&,
- int&
-)
-{}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::InteractingKinematicParcel<ParcelType>::hitWallPatch
-(
- const wallPolyPatch& wpp,
- TrackData& td
-)
-{
- // Wall interactions handled by generic hitPatch function
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicParcel<ParcelType>::hitWallPatch
-(
- const wallPolyPatch&,
- int&
-)
-{}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::InteractingKinematicParcel<ParcelType>::hitPatch
-(
- const polyPatch&,
- TrackData& td
-)
-{
- td.keepParticle = false;
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicParcel<ParcelType>::hitPatch
-(
- const polyPatch&, int&
-)
-{}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicParcel<ParcelType>::transformProperties
-(
- const tensor& T
-)
-{
- Particle<ParcelType>::transformProperties(T);
- U_ = transform(T, U_);
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicParcel<ParcelType>::transformProperties
-(
- const vector& separation
-)
-{
- Particle<ParcelType>::transformProperties(separation);
-}
-
-
-// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
-
-#include "InteractingKinematicParcelIO.C"
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H
deleted file mode 100644
index 1f1921432bc..00000000000
--- a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.H
+++ /dev/null
@@ -1,660 +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
-
-Class
- Foam::InteractingKinematicParcel
-
-Description
- InteractingKinematic parcel class with one/two-way coupling with
- the continuous phase.
-
- Sub-models include:
- - drag
- - turbulent dispersion
- - wall interactions
-
- Includes many-body collisions and rotational motion. Only
- spherical particles currently supported.
-
-SourceFiles
- InteractingKinematicParcelI.H
- InteractingKinematicParcel.C
- InteractingKinematicParcelIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef InteractingKinematicParcel_H
-#define InteractingKinematicParcel_H
-
-#include "Particle.H"
-#include "IOstream.H"
-#include "autoPtr.H"
-#include "interpolationCellPoint.H"
-#include "contiguous.H"
-
-#include "InteractingKinematicCloud.H"
-#include "CollisionRecordList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<class ParcelType>
-class InteractingKinematicParcel;
-
-// Forward declaration of friend functions
-
-template<class ParcelType>
-Ostream& operator<<
-(
- Ostream&,
- const InteractingKinematicParcel<ParcelType>&
-);
-
-/*---------------------------------------------------------------------------*\
- Class InteractingKinematicParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class ParcelType>
-class InteractingKinematicParcel
-:
- public Particle<ParcelType>
-{
-public:
-
- //- Class to hold interactingKinematic particle constant properties
- class constantProperties
- {
- // Private data
-
- //- Constant properties dictionary
- const dictionary dict_;
-
- //- Minimum density [kg/m3]
- const scalar rhoMin_;
-
- //- Particle density [kg/m3] (constant)
- const scalar rho0_;
-
- //- Minimum particle mass [kg]
- const scalar minParticleMass_;
-
- //- Young's modulus [N/m2]
- const scalar youngsModulus_;
-
- //- Poisson's ratio
- const scalar poissonsRatio_;
-
-
- public:
-
- //- Constructor
- constantProperties(const dictionary& parentDict);
-
- // Member functions
-
- //- Return const access to the constant properties dictionary
- inline const dictionary& dict() const;
-
- //- Return const access to the minimum density
- inline scalar rhoMin() const;
-
- //- Return const access to the particle density
- inline scalar rho0() const;
-
- //- Return const access to the minimum particle mass
- inline scalar minParticleMass() const;
-
- //- Return const access to Young's Modulus
- inline scalar youngsModulus() const;
-
- //- Return const access to Poisson's ratio
- inline scalar poissonsRatio() const;
- };
-
-
- //- Class used to pass interactingKinematic tracking data to the
- // trackToFace function
- class trackData
- :
- public Particle<ParcelType>::trackData
- {
- public:
-
- enum trackPart
- {
- tpVelocityHalfStep,
- tpLinearTrack,
- tpRotationalTrack
- };
-
-
- private:
-
- // Private data
-
- //- Reference to the cloud containing this particle
- InteractingKinematicCloud<ParcelType>& cloud_;
-
- //- Particle constant properties
- const constantProperties& constProps_;
-
- // Interpolators for continuous phase fields
-
- //- Density interpolator
- const interpolation<scalar>& rhoInterp_;
-
- //- Velocity interpolator
- const interpolation<vector>& UInterp_;
-
- //- Dynamic viscosity interpolator
- const interpolation<scalar>& muInterp_;
-
- //- Local gravitational or other body-force acceleration
- const vector& g_;
-
- // label specifying which part of the integration
- // algorithm is taking place
- trackPart part_;
-
-
- public:
-
- // Constructors
-
- //- Construct from components
- inline trackData
- (
- InteractingKinematicCloud<ParcelType>& cloud,
- const constantProperties& constProps,
- const interpolation<scalar>& rhoInterp,
- const interpolation<vector>& UInterp,
- const interpolation<scalar>& muInterp,
- const vector& g,
- trackPart part = tpLinearTrack
- );
-
-
- // Member functions
-
- //- Return access to the owner cloud
- inline InteractingKinematicCloud<ParcelType>& cloud();
-
- //- Return const access to the constant properties
- inline const constantProperties& constProps() const;
-
- //- Return conat access to the interpolator for continuous
- // phase density field
- inline const interpolation<scalar>& rhoInterp() const;
-
- //- Return conat access to the interpolator for continuous
- // phase velocity field
- inline const interpolation<vector>& UInterp() const;
-
- //- Return conat access to the interpolator for continuous
- // phase dynamic viscosity field
- inline const interpolation<scalar>& muInterp() const;
-
- //- Return const access to the gravitational acceleration vector
- inline const vector& g() const;
-
- //- Return the part of the tracking operation taking place
- inline trackPart part() const;
-
- //- Return access to the part of the tracking operation taking place
- inline trackPart& part();
- };
-
-
-protected:
-
- // Protected data
-
- // Parcel properties
-
- //- Parcel type id
- label typeId_;
-
- //- Number of particles in Parcel
- scalar nParticle_;
-
- //- Diameter [m]
- scalar d_;
-
- //- Velocity of Parcel [m/s]
- vector U_;
-
- //- Force on particle due to collisions [N]
- vector f_;
-
- //- Angular momentum of Parcel in global reference frame
- // [kg m2 s-1]
- vector pi_;
-
- //- Torque on particle due to collisions in global
- // reference frame [Nm]
- vector tau_;
-
- //- Density [kg/m3]
- scalar rho_;
-
- //- Time spent in turbulent eddy [s]
- scalar tTurb_;
-
- //- Turbulent velocity fluctuation [m/s]
- vector UTurb_;
-
- //- Particle collision records
- CollisionRecordList<vector> collisionRecords_;
-
-
- // Cell-based quantities
-
- //- Density [kg/m3]
- scalar rhoc_;
-
- //- Velocity [m/s]
- vector Uc_;
-
- //- Viscosity [Pa.s]
- scalar muc_;
-
-
- // Protected member functions
-
- //- Calculate new particle velocity
- template<class TrackData>
- const vector calcVelocity
- (
- TrackData& td,
- const scalar dt, // timestep
- const label cellI, // owner cell
- const scalar Re, // Reynolds number
- const scalar mu, // local carrier viscosity
- const scalar d, // diameter
- const vector& U, // velocity
- const scalar rho, // density
- const scalar mass, // mass
- const vector& Su, // explicit particle momentum source
- vector& dUTrans // momentum transfer to carrier
- ) const;
-
-
-public:
-
- // Static data members
-
- //- String representation of properties
- static string propHeader;
-
- //- Runtime type information
- TypeName("InteractingKinematicParcel");
-
-
- friend class Cloud<ParcelType>;
-
-
- // Constructors
-
- //- Construct from owner, position, and cloud owner
- // Other properties initialised as null
- inline InteractingKinematicParcel
- (
- InteractingKinematicCloud<ParcelType>& owner,
- const vector& position,
- const label cellI
- );
-
- //- Construct from components
- inline InteractingKinematicParcel
- (
- InteractingKinematicCloud<ParcelType>& owner,
- const vector& position,
- const label cellI,
- const label typeId,
- const scalar nParticle0,
- const scalar d0,
- const vector& U0,
- const vector& f0,
- const vector& pi0,
- const vector& tau0,
- const constantProperties& constProps
- );
-
- //- Construct from Istream
- InteractingKinematicParcel
- (
- const Cloud<ParcelType>& c,
- Istream& is,
- bool readFields = true
- );
-
- //- Construct as a copy
- InteractingKinematicParcel(const InteractingKinematicParcel& p);
-
- //- Construct and return a clone
- autoPtr<InteractingKinematicParcel> clone() const
- {
- return autoPtr<InteractingKinematicParcel>
- (
- new InteractingKinematicParcel(*this)
- );
- }
-
-
- // Member Functions
-
- // Access
-
- //- Return const access to type id
- inline label typeId() const;
-
- //- Return const access to number of particles
- inline scalar nParticle() const;
-
- //- Return const access to diameter
- inline scalar d() const;
-
- //- Return const access to velocity
- inline const vector& U() const;
-
- //- Return const access to force
- inline const vector& f() const;
-
- //- Return const access to angular momentum
- inline const vector& pi() const;
-
- //- Return const access to torque
- inline const vector& tau() const;
-
- //- Return const access to density
- inline scalar rho() const;
-
- //- Return const access to time spent in turbulent eddy
- inline scalar tTurb() const;
-
- //- Return const access to turbulent velocity fluctuation
- inline const vector& UTurb() const;
-
- //- Return const access to the collision records
- inline const CollisionRecordList<vector>& collisionRecords() const;
-
-
- // Edit
-
- //- Return access to type id
- inline label typeId();
-
- //- Return access to number of particles
- inline scalar& nParticle();
-
- //- Return access to diameter
- inline scalar& d();
-
- //- Return access to velocity
- inline vector& U();
-
- //- Return access to force
- inline vector& f();
-
- //- Return access to angular momentum
- inline vector& pi();
-
- //- Return access to torque
- inline vector& tau();
-
- //- Return access to density
- inline scalar& rho();
-
- //- Return access to time spent in turbulent eddy
- inline scalar& tTurb();
-
- //- Return access to turbulent velocity fluctuation
- inline vector& UTurb();
-
- //- Return access to collision records
- inline CollisionRecordList<vector>& collisionRecords();
-
-
- // Helper functions
-
- //- The nearest distance to a wall that
- // the particle can be in the n direction
- inline scalar wallImpactDistance(const vector& n) const;
-
- //- Return the index of the face to be used in the interpolation
- // routine
- inline label faceInterpolation() const;
-
- //- Cell owner mass
- inline scalar massCell(const label cellI) const;
-
- //- Particle mass
- inline scalar mass() const;
-
- //- Particle moment of inertia around diameter axis
- inline scalar momentOfInertia() const;
-
- //- Particle angular velocity
- inline vector omega() const;
-
- //- Particle radius
- inline scalar r() const;
-
- //- Particle volume
- inline scalar volume() const;
-
- //- Particle volume for a given diameter
- inline scalar volume(const scalar d) const;
-
- //- Particle projected area
- inline scalar areaP() const;
-
- //- Projected area for given diameter
- inline scalar areaP(const scalar d) const;
-
- //- Particle surface area
- inline scalar areaS() const;
-
- //- Surface area for given diameter
- inline scalar areaS(const scalar d) const;
-
- //- Reynolds number
- inline scalar Re
- (
- const vector& U, // particle velocity
- const scalar d, // particle diameter
- const scalar rhoc, // carrier density
- const scalar muc // carrier dynamic viscosity
- ) const;
-
-
- // Main calculation loop
-
- //- Set cell values
- template<class TrackData>
- void setCellValues
- (
- TrackData& td,
- const scalar dt,
- const label cellI
- );
-
- //- Correct cell values using latest transfer information
- template<class TrackData>
- void cellValueSourceCorrection
- (
- TrackData& td,
- const scalar dt,
- const label cellI
- );
-
- //- Update parcel properties over the time interval
- template<class TrackData>
- void calc
- (
- TrackData& td,
- const scalar dt,
- const label cellI
- );
-
-
- // Tracking
-
- //- Move the parcel
- template<class TrackData>
- bool move(TrackData& td);
-
-
- // Patch interactions
-
- //- Overridable function to handle the particle hitting a patch
- // Executed before other patch-hitting functions
- template<class TrackData>
- bool hitPatch
- (
- const polyPatch& p,
- TrackData& td,
- const label patchI
- );
-
-
- //- Overridable function to handle the particle hitting a patch
- // Executed before other patch-hitting functions without trackData
- bool hitPatch
- (
- const polyPatch& p,
- int& td,
- const label patchI
- );
-
-
- //- Overridable function to handle the particle hitting a
- // processorPatch
- template<class TrackData>
- void hitProcessorPatch
- (
- const processorPolyPatch&,
- TrackData& td
- );
-
- //- Overridable function to handle the particle hitting a
- // processorPatch without trackData
- void hitProcessorPatch
- (
- const processorPolyPatch&,
- int&
- );
-
- //- Overridable function to handle the particle hitting a wallPatch
- template<class TrackData>
- void hitWallPatch
- (
- const wallPolyPatch&,
- TrackData& td
- );
-
- //- Overridable function to handle the particle hitting a wallPatch
- // without trackData
- void hitWallPatch
- (
- const wallPolyPatch&,
- int&
- );
-
- //- Overridable function to handle the particle hitting a polyPatch
- template<class TrackData>
- void hitPatch
- (
- const polyPatch&,
- TrackData& td
- );
-
- //- Overridable function to handle the particle hitting a polyPatch
- //- without trackData
- void hitPatch
- (
- const polyPatch&,
- int&
- );
-
- //- Transform the physical properties of the particle
- // according to the given transformation tensor
- void transformProperties(const tensor& T);
-
- //- Transform the physical properties of the particle
- // according to the given separation vector
- void transformProperties(const vector& separation);
-
-
- // I-O
-
- //- Read
- static void readFields(Cloud<ParcelType>& c);
-
- //- Write
- static void writeFields(const Cloud<ParcelType>& c);
-
-
- // Ostream Operator
-
- friend Ostream& operator<< <ParcelType>
- (
- Ostream&,
- const InteractingKinematicParcel<ParcelType>&
- );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "InteractingKinematicParcelI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#define defineParcelTypeNameAndDebug(Type, DebugSwitch) \
- template<> \
- const Foam::word InteractingKinematicParcel<Type>::typeName(#Type); \
- template<> \
- int InteractingKinematicParcel<Type>::debug \
- ( \
- Foam::debug::debugSwitch(#Type, DebugSwitch) \
- );
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
- #include "InteractingKinematicParcel.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelI.H
deleted file mode 100644
index ab9dd70c08e..00000000000
--- a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelI.H
+++ /dev/null
@@ -1,554 +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 "mathematicalConstants.H"
-
-using namespace Foam::constant;
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-template <class ParcelType>
-inline Foam::InteractingKinematicParcel<ParcelType>::
-constantProperties::constantProperties
-(
- const dictionary& parentDict
-)
-:
- dict_(parentDict.subDict("constantProperties")),
- rhoMin_(dimensionedScalar(dict_.lookup("rhoMin")).value()),
- rho0_(dimensionedScalar(dict_.lookup("rho0")).value()),
- minParticleMass_
- (
- dimensionedScalar(dict_.lookup("minParticleMass")).value()
- ),
- youngsModulus_
- (
- dimensionedScalar(dict_.lookup("youngsModulus")).value()
- ),
- poissonsRatio_
- (
- dimensionedScalar(dict_.lookup("poissonsRatio")).value()
- )
-{}
-
-
-template <class ParcelType>
-inline Foam::InteractingKinematicParcel<ParcelType>::trackData::trackData
-(
- InteractingKinematicCloud<ParcelType>& cloud,
- const constantProperties& constProps,
- const interpolation<scalar>& rhoInterp,
- const interpolation<vector>& UInterp,
- const interpolation<scalar>& muInterp,
- const vector& g,
- trackPart part
-)
-:
- Particle<ParcelType>::trackData(cloud),
- cloud_(cloud),
- constProps_(constProps),
- rhoInterp_(rhoInterp),
- UInterp_(UInterp),
- muInterp_(muInterp),
- g_(g),
- part_(part)
-{}
-
-
-template <class ParcelType>
-inline Foam::InteractingKinematicParcel<ParcelType>::InteractingKinematicParcel
-(
- InteractingKinematicCloud<ParcelType>& owner,
- const vector& position,
- const label cellI
-)
-:
- Particle<ParcelType>(owner, position, cellI),
- typeId_(owner.parcelTypeId()),
- nParticle_(0),
- d_(0.0),
- U_(vector::zero),
- f_(vector::zero),
- pi_(vector::zero),
- tau_(vector::zero),
- rho_(0.0),
- tTurb_(0.0),
- UTurb_(vector::zero),
- collisionRecords_(),
- rhoc_(0.0),
- Uc_(vector::zero),
- muc_(0.0)
-{}
-
-
-template <class ParcelType>
-inline Foam::InteractingKinematicParcel<ParcelType>::InteractingKinematicParcel
-(
- InteractingKinematicCloud<ParcelType>& owner,
- const vector& position,
- const label cellI,
- const label typeId,
- const scalar nParticle0,
- const scalar d0,
- const vector& U0,
- const vector& f0,
- const vector& pi0,
- const vector& tau0,
- const constantProperties& constProps
-)
-:
- Particle<ParcelType>(owner, position, cellI),
- typeId_(typeId),
- nParticle_(nParticle0),
- d_(d0),
- U_(U0),
- f_(f0),
- pi_(pi0),
- tau_(tau0),
- rho_(constProps.rho0()),
- tTurb_(0.0),
- UTurb_(vector::zero),
- collisionRecords_(),
- rhoc_(0.0),
- Uc_(vector::zero),
- muc_(0.0)
-{}
-
-
-// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
-
-template <class ParcelType>
-inline const Foam::dictionary&
-Foam::InteractingKinematicParcel<ParcelType>::constantProperties::dict() const
-{
- return dict_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::constantProperties::rhoMin() const
-{
- return rhoMin_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::constantProperties::rho0() const
-{
- return rho0_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::
-constantProperties::minParticleMass() const
-{
- return minParticleMass_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::
-constantProperties::youngsModulus() const
-{
- return youngsModulus_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::
-constantProperties::poissonsRatio() const
-{
- return poissonsRatio_;
-}
-
-
-// * * * * * * * * * * * trackData Member Functions * * * * * * * * * * * * //
-
-template <class ParcelType>
-inline Foam::InteractingKinematicCloud<ParcelType>&
-Foam::InteractingKinematicParcel<ParcelType>::trackData::cloud()
-{
- return cloud_;
-}
-
-
-template <class ParcelType>
-inline
-const typename Foam::InteractingKinematicParcel<ParcelType>::constantProperties&
-Foam::InteractingKinematicParcel<ParcelType>::trackData::constProps() const
-{
- return constProps_;
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::scalar>&
-Foam::InteractingKinematicParcel<ParcelType>::trackData::rhoInterp() const
-{
- return rhoInterp_;
-}
-
-
-template <class ParcelType>
-inline const Foam::interpolation<Foam::vector>&
-Foam::InteractingKinematicParcel<ParcelType>::trackData::UInterp() const
-{
- return UInterp_;
-}
-
-
-template<class ParcelType>
-inline const Foam::interpolation<Foam::scalar>&
-Foam::InteractingKinematicParcel<ParcelType>::trackData::muInterp() const
-{
- return muInterp_;
-}
-
-
-template<class ParcelType>
-inline const Foam::vector&
-Foam::InteractingKinematicParcel<ParcelType>::trackData::g() const
-{
- return g_;
-}
-
-
-template<class ParcelType>
-inline
-typename Foam::InteractingKinematicParcel<ParcelType>::trackData::trackPart
-Foam::InteractingKinematicParcel<ParcelType>::trackData::part() const
-{
- return part_;
-}
-
-
-template<class ParcelType>
-inline
-typename Foam::InteractingKinematicParcel<ParcelType>::trackData::trackPart&
-Foam::InteractingKinematicParcel<ParcelType>::trackData::part()
-{
- return part_;
-}
-
-
-// * * * * * * * InteractingKinematicParcel Member Functions * * * * * * * //
-
-template <class ParcelType>
-inline Foam::label Foam::InteractingKinematicParcel<ParcelType>::typeId() const
-{
- return typeId_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::nParticle() const
-{
- return nParticle_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::d() const
-{
- return d_;
-}
-
-
-template <class ParcelType>
-inline const Foam::vector&
-Foam::InteractingKinematicParcel<ParcelType>::U() const
-{
- return U_;
-}
-
-
-template <class ParcelType>
-inline const Foam::vector&
-Foam::InteractingKinematicParcel<ParcelType>::f() const
-{
- return f_;
-}
-
-
-template <class ParcelType>
-inline const Foam::vector&
-Foam::InteractingKinematicParcel<ParcelType>::pi() const
-{
- return pi_;
-}
-
-
-template <class ParcelType>
-inline const Foam::vector&
-Foam::InteractingKinematicParcel<ParcelType>::tau() const
-{
- return tau_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::rho() const
-{
- return rho_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::tTurb() const
-{
- return tTurb_;
-}
-
-
-template <class ParcelType>
-inline const Foam::vector&
-Foam::InteractingKinematicParcel<ParcelType>::UTurb() const
-{
- return UTurb_;
-}
-
-
-template <class ParcelType>
-inline const Foam::CollisionRecordList<Foam::vector>&
-Foam::InteractingKinematicParcel<ParcelType>::collisionRecords() const
-{
- return collisionRecords_;
-}
-
-
-template <class ParcelType>
-inline Foam::label Foam::InteractingKinematicParcel<ParcelType>::typeId()
-{
- return typeId_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::InteractingKinematicParcel<ParcelType>::nParticle()
-{
- return nParticle_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::InteractingKinematicParcel<ParcelType>::d()
-{
- return d_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::InteractingKinematicParcel<ParcelType>::U()
-{
- return U_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::InteractingKinematicParcel<ParcelType>::f()
-{
- return f_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::InteractingKinematicParcel<ParcelType>::pi()
-{
- return pi_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::InteractingKinematicParcel<ParcelType>::tau()
-{
- return tau_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::InteractingKinematicParcel<ParcelType>::rho()
-{
- return rho_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::InteractingKinematicParcel<ParcelType>::tTurb()
-{
- return tTurb_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::InteractingKinematicParcel<ParcelType>::UTurb()
-{
- return UTurb_;
-}
-
-
-template <class ParcelType>
-inline Foam::CollisionRecordList<Foam::vector>&
-Foam::InteractingKinematicParcel<ParcelType>::collisionRecords()
-{
- return collisionRecords_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::wallImpactDistance
-(
- const vector&
-) const
-{
- return 0.0;
- // return 0.5*d_;
-}
-
-
-template <class ParcelType>
-inline Foam::label
-Foam::InteractingKinematicParcel<ParcelType>::faceInterpolation() const
-{
- // Use volume-based interpolation if dealing with external faces
- if (this->cloud().internalFace(this->face()))
- {
- return this->face();
- }
- else
- {
- return -1;
- }
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::massCell
-(
- const label cellI
-) const
-{
- return rhoc_*this->cloud().pMesh().cellVolumes()[cellI];
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::mass() const
-{
- return rho_*volume();
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::momentOfInertia() const
-{
- return 0.1*mass()*sqr(d_);
-}
-
-
-template <class ParcelType>
-inline Foam::vector
-Foam::InteractingKinematicParcel<ParcelType>::omega() const
-{
- return pi_/momentOfInertia();
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::r() const
-{
- return 0.5*d_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::volume() const
-{
- return volume(d_);
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::volume(const scalar d) const
-{
- return mathematical::pi/6.0*pow3(d);
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::areaP() const
-{
- return areaP(d_);
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::areaP(const scalar d) const
-{
- return 0.25*areaS(d);
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::InteractingKinematicParcel<ParcelType>::areaS() const
-{
- return areaS(d_);
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::areaS(const scalar d) const
-{
- return mathematical::pi*d*d;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar
-Foam::InteractingKinematicParcel<ParcelType>::Re
-(
- const vector& U,
- const scalar d,
- const scalar rhoc,
- const scalar muc
-) const
-{
- return rhoc*mag(U - Uc_)*d/muc;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C
deleted file mode 100644
index acf8d860b8b..00000000000
--- a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcelIO.C
+++ /dev/null
@@ -1,292 +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 "InteractingKinematicParcel.H"
-#include "IOstreams.H"
-#include "IOField.H"
-#include "Cloud.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-template <class ParcelType>
-Foam::string Foam::InteractingKinematicParcel<ParcelType>::propHeader =
- Particle<ParcelType>::propHeader
- + " typeId"
- + " nParticle"
- + " d"
- + " (Ux Uy Uz)"
- + " (fx fy fz)"
- + " (pix piy piz)"
- + " (taux tauy tauz)"
- + " rho"
- + " tTurb"
- + " UTurb";
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-template <class ParcelType>
-Foam::InteractingKinematicParcel<ParcelType>::InteractingKinematicParcel
-(
- const Cloud<ParcelType>& cloud,
- Istream& is,
- bool readFields
-)
-:
- Particle<ParcelType>(cloud, is, readFields),
- typeId_(0),
- nParticle_(0.0),
- d_(0.0),
- U_(vector::zero),
- f_(vector::zero),
- pi_(vector::zero),
- tau_(vector::zero),
- rho_(0.0),
- tTurb_(0.0),
- UTurb_(vector::zero),
- collisionRecords_(),
- rhoc_(0.0),
- Uc_(vector::zero),
- muc_(0.0)
-{
- if (readFields)
- {
- if (is.format() == IOstream::ASCII)
- {
- typeId_ = readLabel(is);
- nParticle_ = readScalar(is);
- d_ = readScalar(is);
- is >> U_;
- is >> f_;
- is >> pi_;
- is >> tau_;
- rho_ = readScalar(is);
- tTurb_ = readScalar(is);
- is >> UTurb_;
- is >> collisionRecords_;
- }
- else
- {
- is.read
- (
- reinterpret_cast<char*>(&typeId_),
- sizeof(typeId_)
- + sizeof(nParticle_)
- + sizeof(d_)
- + sizeof(U_)
- + sizeof(f_)
- + sizeof(pi_)
- + sizeof(tau_)
- + sizeof(rho_)
- + sizeof(tTurb_)
- + sizeof(UTurb_)
- );
- is >> collisionRecords_;
- }
- }
-
- // Check state of Istream
- is.check
- (
- "InteractingKinematicParcel<ParcelType>::InteractingKinematicParcel"
- "(const Cloud<ParcelType>&, Istream&, bool)"
- );
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicParcel<ParcelType>::readFields
-(
- Cloud<ParcelType>& c
-)
-{
- if (!c.size())
- {
- return;
- }
-
- IOField<label> typeId(c.fieldIOobject("typeId", IOobject::MUST_READ));
- c.checkFieldIOobject(c, typeId);
-
- IOField<scalar>
- nParticle(c.fieldIOobject("nParticle", IOobject::MUST_READ));
- c.checkFieldIOobject(c, nParticle);
-
- IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
- c.checkFieldIOobject(c, d);
-
- IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
- c.checkFieldIOobject(c, U);
-
- IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ));
- c.checkFieldIOobject(c, f);
-
- IOField<vector> pi(c.fieldIOobject("pi", IOobject::MUST_READ));
- c.checkFieldIOobject(c, pi);
-
- IOField<vector> tau(c.fieldIOobject("tau", IOobject::MUST_READ));
- c.checkFieldIOobject(c, tau);
-
- IOField<scalar> rho(c.fieldIOobject("rho", IOobject::MUST_READ));
- c.checkFieldIOobject(c, rho);
-
- IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::MUST_READ));
- c.checkFieldIOobject(c, tTurb);
-
- IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::MUST_READ));
- c.checkFieldIOobject(c, UTurb);
-
- label i = 0;
- forAllIter(typename Cloud<ParcelType>, c, iter)
- {
- ParcelType& p = iter();
-
- p.typeId_ = typeId[i];
- p.nParticle_ = nParticle[i];
- p.d_ = d[i];
- p.U_ = U[i];
- p.f_ = f[i];
- p.pi_ = pi[i];
- p.rho_ = rho[i];
- p.tTurb_ = tTurb[i];
- p.UTurb_ = UTurb[i];
- i++;
- }
-}
-
-
-template<class ParcelType>
-void Foam::InteractingKinematicParcel<ParcelType>::writeFields
-(
- const Cloud<ParcelType>& c
-)
-{
- Particle<ParcelType>::writeFields(c);
-
- label np = c.size();
-
- IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
- IOField<scalar> nParticle
- (
- c.fieldIOobject("nParticle", IOobject::NO_READ),
- np
- );
- IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
- IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
- IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
- IOField<vector> pi(c.fieldIOobject("pi", IOobject::NO_READ), np);
- IOField<vector> tau(c.fieldIOobject("tau", IOobject::NO_READ), np);
- IOField<scalar> rho(c.fieldIOobject("rho", IOobject::NO_READ), np);
- IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
- IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::NO_READ), np);
-
- label i = 0;
- forAllConstIter(typename Cloud<ParcelType>, c, iter)
- {
- const InteractingKinematicParcel<ParcelType>& p = iter();
-
- typeId[i] = p.typeId();
- nParticle[i] = p.nParticle();
- d[i] = p.d();
- U[i] = p.U();
- f[i] = p.f();
- pi[i] = p.pi();
- tau[i] = p.tau();
- rho[i] = p.rho();
- tTurb[i] = p.tTurb();
- UTurb[i] = p.UTurb();
- i++;
- }
-
- typeId.write();
- nParticle.write();
- d.write();
- U.write();
- f.write();
- pi.write();
- tau.write();
- rho.write();
- tTurb.write();
- UTurb.write();
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-template<class ParcelType>
-Foam::Ostream& Foam::operator<<
-(
- Ostream& os,
- const InteractingKinematicParcel<ParcelType>& p
-)
-{
- if (os.format() == IOstream::ASCII)
- {
- os << static_cast<const Particle<ParcelType>&>(p)
- << token::SPACE << p.typeId()
- << token::SPACE << p.nParticle()
- << token::SPACE << p.d()
- << token::SPACE << p.U()
- << token::SPACE << p.f()
- << token::SPACE << p.pi()
- << token::SPACE << p.tau()
- << token::SPACE << p.rho()
- << token::SPACE << p.tTurb()
- << token::SPACE << p.UTurb()
- << token::SPACE << p.collisionRecords();
- }
- else
- {
- os << static_cast<const Particle<ParcelType>&>(p);
- os.write
- (
- reinterpret_cast<const char*>(&p.typeId_),
- sizeof(p.typeId())
- + sizeof(p.nParticle())
- + sizeof(p.d())
- + sizeof(p.U())
- + sizeof(p.f())
- + sizeof(p.pi())
- + sizeof(p.tau())
- + sizeof(p.rho())
- + sizeof(p.tTurb())
- + sizeof(p.UTurb())
- );
- os << p.collisionRecords();
- }
-
- // Check state of Ostream
- os.check
- (
- "Ostream& operator<< "
- "(Ostream&, const InteractingKinematicParcel<ParcelType>&)"
- );
-
- return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/CollisionRecordList/CollisionRecord/CollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.C
similarity index 100%
rename from src/lagrangian/intermediate/CollisionRecordList/CollisionRecord/CollisionRecord.C
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.C
diff --git a/src/lagrangian/intermediate/CollisionRecordList/CollisionRecord/CollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.H
similarity index 100%
rename from src/lagrangian/intermediate/CollisionRecordList/CollisionRecord/CollisionRecord.H
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.H
diff --git a/src/lagrangian/intermediate/CollisionRecordList/CollisionRecord/CollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordI.H
similarity index 100%
rename from src/lagrangian/intermediate/CollisionRecordList/CollisionRecord/CollisionRecordI.H
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordI.H
diff --git a/src/lagrangian/intermediate/CollisionRecordList/CollisionRecord/CollisionRecordIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordIO.C
similarity index 100%
rename from src/lagrangian/intermediate/CollisionRecordList/CollisionRecord/CollisionRecordIO.C
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordIO.C
diff --git a/src/lagrangian/intermediate/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
similarity index 100%
rename from src/lagrangian/intermediate/CollisionRecordList/CollisionRecordList.C
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
diff --git a/src/lagrangian/intermediate/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
similarity index 100%
rename from src/lagrangian/intermediate/CollisionRecordList/CollisionRecordList.H
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 8c020d3739a..580b02b94ed 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -203,9 +203,13 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
nParticle_(p.nParticle_),
d_(p.d_),
U_(p.U_),
+ f_(p.f_),
+ pi_(p.pi_),
+ tau_(p.tau_),
rho_(p.rho_),
tTurb_(p.tTurb_),
UTurb_(p.UTurb_),
+ collisionRecords_(p.collisionRecords_),
rhoc_(p.rhoc_),
Uc_(p.Uc_),
muc_(p.muc_)
@@ -227,46 +231,84 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
const scalar deltaT = mesh.time().deltaTValue();
- scalar tEnd = (1.0 - p.stepFraction())*deltaT;
- const scalar dtMax = tEnd;
- while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
+ switch (td.part())
{
- // Apply correction to position for reduced-D cases
- meshTools::constrainToMeshCentre(mesh, p.position());
-
- // Set the Lagrangian time-step
- scalar dt = min(dtMax, tEnd);
+ case TrackData::tpVelocityHalfStep:
+ {
+ // First and last leapfrog velocity adjust part, required
+ // before and after tracking and force calculation
- // Remember which cell the Parcel is in since this will change if a
- // face is hit
- label cellI = p.cell();
+ p.U() += 0.5*deltaT*p.f()/p.mass();
- dt *= p.trackToFace(p.position() + dt*U_, td);
+ pi_ += 0.5*deltaT*tau_;
- tEnd -= dt;
- p.stepFraction() = 1.0 - tEnd/deltaT;
+ break;
+ }
- // Avoid problems with extremely small timesteps
- if (dt > ROOTVSMALL)
+ case TrackData::tpLinearTrack:
{
- // Update cell based properties
- p.setCellValues(td, dt, cellI);
+ scalar tEnd = (1.0 - p.stepFraction())*deltaT;
+ const scalar dtMax = tEnd;
- if (td.cloud().cellValueSourceCorrection())
+ while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
{
- p.cellValueSourceCorrection(td, dt, cellI);
+ // Apply correction to position for reduced-D cases
+ meshTools::constrainToMeshCentre(mesh, p.position());
+
+ // Set the Lagrangian time-step
+ scalar dt = min(dtMax, tEnd);
+
+ // Remember which cell the Parcel is in since this
+ // will change if a face is hit
+ label cellI = p.cell();
+
+ dt *= p.trackToFace(p.position() + dt*U_, td);
+
+ tEnd -= dt;
+ p.stepFraction() = 1.0 - tEnd/deltaT;
+
+ // Avoid problems with extremely small timesteps
+ if (dt > ROOTVSMALL)
+ {
+ // Update cell based properties
+ p.setCellValues(td, dt, cellI);
+
+ if (td.cloud().cellValueSourceCorrection())
+ {
+ p.cellValueSourceCorrection(td, dt, cellI);
+ }
+
+ p.calc(td, dt, cellI);
+ }
+
+ if (p.onBoundary() && td.keepParticle)
+ {
+ if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
+ {
+ td.switchProcessor = true;
+ }
+ }
}
- p.calc(td, dt, cellI);
+ break;
}
- if (p.onBoundary() && td.keepParticle)
+ case TrackData::tpRotationalTrack:
{
- if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
- {
- td.switchProcessor = true;
- }
+ Info<< "No rotational tracking implementation" << endl;
+
+ break;
+ }
+
+ default:
+ {
+ FatalErrorIn
+ (
+ "KinematicParcel<ParcelType>::move(TrackData& td)"
+ ) << td.part()
+ << " is an invalid part of the tracking method."
+ << abort(FatalError);
}
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index b09cac47908..018e8a22ef2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -26,13 +26,15 @@ Class
Foam::KinematicParcel
Description
- Kinematic parcel class with one/two-way coupling with the continuous
+ Kinematic parcel class with rotational motion (as spherical
+ particles only) and one/two-way coupling with the continuous
phase.
Sub-models include:
- drag
- turbulent dispersion
- wall interactions
+ - many-body collisions
SourceFiles
KinematicParcelI.H
@@ -51,6 +53,7 @@ SourceFiles
#include "contiguous.H"
#include "KinematicCloud.H"
+#include "CollisionRecordList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -97,6 +100,12 @@ public:
//- Minimum particle mass [kg]
const scalar minParticleMass_;
+ //- Young's modulus [N/m2]
+ const scalar youngsModulus_;
+
+ //- Poisson's ratio
+ const scalar poissonsRatio_;
+
public:
@@ -116,6 +125,12 @@ public:
//- Return const access to the minimum particle mass
inline scalar minParticleMass() const;
+
+ //- Return const access to Young's Modulus
+ inline scalar youngsModulus() const;
+
+ //- Return const access to Poisson's ratio
+ inline scalar poissonsRatio() const;
};
@@ -124,6 +139,18 @@ public:
:
public Particle<ParcelType>::trackData
{
+ public:
+
+ enum trackPart
+ {
+ tpVelocityHalfStep,
+ tpLinearTrack,
+ tpRotationalTrack
+ };
+
+
+ private:
+
// Private data
//- Reference to the cloud containing this particle
@@ -147,6 +174,10 @@ public:
//- Local gravitational or other body-force acceleration
const vector& g_;
+ // label specifying which part of the integration
+ // algorithm is taking place
+ trackPart part_;
+
public:
@@ -160,7 +191,8 @@ public:
const interpolation<scalar>& rhoInterp,
const interpolation<vector>& UInterp,
const interpolation<scalar>& muInterp,
- const vector& g
+ const vector& g,
+ trackPart part = tpLinearTrack
);
@@ -186,6 +218,12 @@ public:
// Return const access to the gravitational acceleration vector
inline const vector& g() const;
+
+ //- Return the part of the tracking operation taking place
+ inline trackPart part() const;
+
+ //- Return access to the part of the tracking operation taking place
+ inline trackPart& part();
};
@@ -207,6 +245,17 @@ protected:
//- Velocity of Parcel [m/s]
vector U_;
+ //- Force on particle due to collisions [N]
+ vector f_;
+
+ //- Angular momentum of Parcel in global reference frame
+ // [kg m2/s]
+ vector pi_;
+
+ //- Torque on particle due to collisions in global
+ // reference frame [Nm]
+ vector tau_;
+
//- Density [kg/m3]
scalar rho_;
@@ -216,6 +265,9 @@ protected:
//- Turbulent velocity fluctuation [m/s]
vector UTurb_;
+ //- Particle collision records
+ CollisionRecordList<vector> collisionRecords_;
+
// Cell-based quantities
@@ -284,6 +336,9 @@ public:
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const constantProperties& constProps
);
@@ -321,6 +376,15 @@ public:
//- Return const access to velocity
inline const vector& U() const;
+ //- Return const access to force
+ inline const vector& f() const;
+
+ //- Return const access to angular momentum
+ inline const vector& pi() const;
+
+ //- Return const access to torque
+ inline const vector& tau() const;
+
//- Return const access to density
inline scalar rho() const;
@@ -330,6 +394,9 @@ public:
//- Return const access to turbulent velocity fluctuation
inline const vector& UTurb() const;
+ //- Return const access to the collision records
+ inline const CollisionRecordList<vector>& collisionRecords() const;
+
// Edit
@@ -345,6 +412,15 @@ public:
//- Return access to velocity
inline vector& U();
+ //- Return access to force
+ inline vector& f();
+
+ //- Return access to angular momentum
+ inline vector& pi();
+
+ //- Return access to torque
+ inline vector& tau();
+
//- Return access to density
inline scalar& rho();
@@ -354,6 +430,9 @@ public:
//- Return access to turbulent velocity fluctuation
inline vector& UTurb();
+ //- Return access to collision records
+ inline CollisionRecordList<vector>& collisionRecords();
+
// Helper functions
@@ -371,6 +450,12 @@ public:
//- Particle mass
inline scalar mass() const;
+ //- Particle moment of inertia around diameter axis
+ inline scalar momentOfInertia() const;
+
+ //- Particle angular velocity
+ inline vector omega() const;
+
//- Particle volume
inline scalar volume() const;
@@ -566,4 +651,3 @@ public:
#endif
// ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index f7b485f2650..14ce7276f64 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -26,7 +26,7 @@ License
#include "mathematicalConstants.H"
-using namespace Foam::constant::mathematical;
+using namespace Foam::constant;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -42,6 +42,14 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
minParticleMass_
(
dimensionedScalar(dict_.lookup("minParticleMass")).value()
+ ),
+ youngsModulus_
+ (
+ dimensionedScalar(dict_.lookup("youngsModulus")).value()
+ ),
+ poissonsRatio_
+ (
+ dimensionedScalar(dict_.lookup("poissonsRatio")).value()
)
{}
@@ -54,7 +62,8 @@ inline Foam::KinematicParcel<ParcelType>::trackData::trackData
const interpolation<scalar>& rhoInterp,
const interpolation<vector>& UInterp,
const interpolation<scalar>& muInterp,
- const vector& g
+ const vector& g,
+ trackPart part
)
:
Particle<ParcelType>::trackData(cloud),
@@ -63,7 +72,8 @@ inline Foam::KinematicParcel<ParcelType>::trackData::trackData
rhoInterp_(rhoInterp),
UInterp_(UInterp),
muInterp_(muInterp),
- g_(g)
+ g_(g),
+ part_(part)
{}
@@ -80,9 +90,13 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
nParticle_(0),
d_(0.0),
U_(vector::zero),
+ f_(vector::zero),
+ pi_(vector::zero),
+ tau_(vector::zero),
rho_(0.0),
tTurb_(0.0),
UTurb_(vector::zero),
+ collisionRecords_(),
rhoc_(0.0),
Uc_(vector::zero),
muc_(0.0)
@@ -99,6 +113,9 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const constantProperties& constProps
)
:
@@ -107,9 +124,13 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
nParticle_(nParticle0),
d_(d0),
U_(U0),
+ f_(f0),
+ pi_(pi0),
+ tau_(tau0),
rho_(constProps.rho0()),
tTurb_(0.0),
UTurb_(vector::zero),
+ collisionRecords_(),
rhoc_(0.0),
Uc_(vector::zero),
muc_(0.0)
@@ -150,6 +171,24 @@ Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const
}
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::
+constantProperties::youngsModulus() const
+{
+ return youngsModulus_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::
+constantProperties::poissonsRatio() const
+{
+ return poissonsRatio_;
+}
+
+
// * * * * * * * * * * * trackData Member Functions * * * * * * * * * * * * //
template <class ParcelType>
@@ -200,7 +239,25 @@ Foam::KinematicParcel<ParcelType>::trackData::g() const
}
-// * * * * * * * * * * KinematicParcel Member Functions * * * * * * * * * * //
+template<class ParcelType>
+inline
+typename Foam::KinematicParcel<ParcelType>::trackData::trackPart
+Foam::KinematicParcel<ParcelType>::trackData::part() const
+{
+ return part_;
+}
+
+
+template<class ParcelType>
+inline
+typename Foam::KinematicParcel<ParcelType>::trackData::trackPart&
+Foam::KinematicParcel<ParcelType>::trackData::part()
+{
+ return part_;
+}
+
+
+// * * * * * * * KinematicParcel Member Functions * * * * * * * //
template <class ParcelType>
inline Foam::label Foam::KinematicParcel<ParcelType>::typeId() const
@@ -230,6 +287,30 @@ inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
}
+template <class ParcelType>
+inline const Foam::vector&
+Foam::KinematicParcel<ParcelType>::f() const
+{
+ return f_;
+}
+
+
+template <class ParcelType>
+inline const Foam::vector&
+Foam::KinematicParcel<ParcelType>::pi() const
+{
+ return pi_;
+}
+
+
+template <class ParcelType>
+inline const Foam::vector&
+Foam::KinematicParcel<ParcelType>::tau() const
+{
+ return tau_;
+}
+
+
template <class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
{
@@ -251,6 +332,14 @@ inline const Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb() const
}
+template <class ParcelType>
+inline const Foam::CollisionRecordList<Foam::vector>&
+Foam::KinematicParcel<ParcelType>::collisionRecords() const
+{
+ return collisionRecords_;
+}
+
+
template <class ParcelType>
inline Foam::label Foam::KinematicParcel<ParcelType>::typeId()
{
@@ -279,6 +368,27 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
}
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::f()
+{
+ return f_;
+}
+
+
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::pi()
+{
+ return pi_;
+}
+
+
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::tau()
+{
+ return tau_;
+}
+
+
template <class ParcelType>
inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
{
@@ -300,13 +410,28 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
}
+template <class ParcelType>
+inline Foam::CollisionRecordList<Foam::vector>&
+Foam::KinematicParcel<ParcelType>::collisionRecords()
+{
+ return collisionRecords_;
+}
+
+
template <class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::wallImpactDistance
(
const vector&
) const
{
- return 0.5*d_;
+ // Do not use a wall impact distance to allow proper multiple face
+ // collisions. In a twisted mesh the particle can be within range
+ // of a wall but not in the cell attached to a wall face, hence
+ // miss the interaction.
+
+ return 0.0;
+
+ // return 0.5*d_;
}
@@ -342,6 +467,22 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::mass() const
}
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::momentOfInertia() const
+{
+ return 0.1*mass()*sqr(d_);
+}
+
+
+template <class ParcelType>
+inline Foam::vector
+Foam::KinematicParcel<ParcelType>::omega() const
+{
+ return pi_/momentOfInertia();
+}
+
+
template <class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
{
@@ -353,7 +494,7 @@ template <class ParcelType>
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::volume(const scalar d) const
{
- return pi/6.0*pow3(d);
+ return mathematical::pi/6.0*pow3(d);
}
@@ -383,7 +524,7 @@ template <class ParcelType>
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::areaS(const scalar d) const
{
- return pi*d*d;
+ return mathematical::pi*d*d;
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index d9b9eedab66..845d1dde818 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -38,6 +38,9 @@ Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
+ " nParticle"
+ " d"
+ " (Ux Uy Uz)"
+ + " (fx fy fz)"
+ + " (pix piy piz)"
+ + " (taux tauy tauz)"
+ " rho"
+ " tTurb"
+ " (UTurbx UTurby UTurbz)";
@@ -58,9 +61,13 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
nParticle_(0.0),
d_(0.0),
U_(vector::zero),
+ f_(vector::zero),
+ pi_(vector::zero),
+ tau_(vector::zero),
rho_(0.0),
tTurb_(0.0),
UTurb_(vector::zero),
+ collisionRecords_(),
rhoc_(0.0),
Uc_(vector::zero),
muc_(0.0)
@@ -73,9 +80,13 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
nParticle_ = readScalar(is);
d_ = readScalar(is);
is >> U_;
+ is >> f_;
+ is >> pi_;
+ is >> tau_;
rho_ = readScalar(is);
tTurb_ = readScalar(is);
is >> UTurb_;
+ is >> collisionRecords_;
}
else
{
@@ -86,10 +97,14 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
+ sizeof(nParticle_)
+ sizeof(d_)
+ sizeof(U_)
+ + sizeof(f_)
+ + sizeof(pi_)
+ + sizeof(tau_)
+ sizeof(rho_)
+ sizeof(tTurb_)
+ sizeof(UTurb_)
);
+ is >> collisionRecords_;
}
}
@@ -125,6 +140,15 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
c.checkFieldIOobject(c, U);
+ IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ));
+ c.checkFieldIOobject(c, f);
+
+ IOField<vector> pi(c.fieldIOobject("pi", IOobject::MUST_READ));
+ c.checkFieldIOobject(c, pi);
+
+ IOField<vector> tau(c.fieldIOobject("tau", IOobject::MUST_READ));
+ c.checkFieldIOobject(c, tau);
+
IOField<scalar> rho(c.fieldIOobject("rho", IOobject::MUST_READ));
c.checkFieldIOobject(c, rho);
@@ -143,6 +167,8 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
p.nParticle_ = nParticle[i];
p.d_ = d[i];
p.U_ = U[i];
+ p.f_ = f[i];
+ p.pi_ = pi[i];
p.rho_ = rho[i];
p.tTurb_ = tTurb[i];
p.UTurb_ = UTurb[i];
@@ -166,6 +192,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
);
IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
+ IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
+ IOField<vector> pi(c.fieldIOobject("pi", IOobject::NO_READ), np);
+ IOField<vector> tau(c.fieldIOobject("tau", IOobject::NO_READ), np);
IOField<scalar> rho(c.fieldIOobject("rho", IOobject::NO_READ), np);
IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::NO_READ), np);
@@ -179,6 +208,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
nParticle[i] = p.nParticle();
d[i] = p.d();
U[i] = p.U();
+ f[i] = p.f();
+ pi[i] = p.pi();
+ tau[i] = p.tau();
rho[i] = p.rho();
tTurb[i] = p.tTurb();
UTurb[i] = p.UTurb();
@@ -189,6 +221,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
nParticle.write();
d.write();
U.write();
+ f.write();
+ pi.write();
+ tau.write();
rho.write();
tTurb.write();
UTurb.write();
@@ -211,9 +246,13 @@ Foam::Ostream& Foam::operator<<
<< token::SPACE << p.nParticle()
<< token::SPACE << p.d()
<< token::SPACE << p.U()
+ << token::SPACE << p.f()
+ << token::SPACE << p.pi()
+ << token::SPACE << p.tau()
<< token::SPACE << p.rho()
<< token::SPACE << p.tTurb()
- << token::SPACE << p.UTurb();
+ << token::SPACE << p.UTurb()
+ << token::SPACE << p.collisionRecords();
}
else
{
@@ -225,10 +264,14 @@ Foam::Ostream& Foam::operator<<
+ sizeof(p.nParticle())
+ sizeof(p.d())
+ sizeof(p.U())
+ + sizeof(p.f())
+ + sizeof(p.pi())
+ + sizeof(p.tau())
+ sizeof(p.rho())
+ sizeof(p.tTurb())
+ sizeof(p.UTurb())
);
+ os << p.collisionRecords();
}
// Check state of Ostream
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 8d32c6a7099..81b0a360a4f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 3951688cc30..a77b1337185 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -304,6 +304,9 @@ public:
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const scalarField& Y0,
const scalarField& YGas0,
const scalarField& YLiquid0,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index c512c557284..86e19538f68 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -111,6 +111,9 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const scalarField& Y0,
const scalarField& YGas0,
const scalarField& YLiquid0,
@@ -127,6 +130,8 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
nParticle0,
d0,
U0,
+ f0,
+ U0,
Y0,
constProps
),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index 04747d9420b..a646fc35c7a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 1c7ed466d2c..b90eeec10cc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -258,6 +258,9 @@ public:
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const scalarField& Y0,
const constantProperties& constProps
);
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 55aa90eb7e5..9e580bfde4c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -96,6 +96,9 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const scalarField& Y0,
const constantProperties& constProps
)
@@ -109,6 +112,9 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
nParticle0,
d0,
U0,
+ f0,
+ pi0,
+ tau0,
constProps
),
mass0_(0.0),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index d282da9e6af..a87342c6fe1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -40,7 +40,7 @@ void Foam::ThermoParcel<ParcelType>::setCellValues
const label cellI
)
{
- InteractingKinematicParcel<ParcelType>::setCellValues(td, dt, cellI);
+ KinematicParcel<ParcelType>::setCellValues(td, dt, cellI);
cpc_ = td.cpInterp().interpolate(this->position(), cellI);
@@ -272,7 +272,7 @@ Foam::ThermoParcel<ParcelType>::ThermoParcel
const ThermoParcel<ParcelType>& p
)
:
- InteractingKinematicParcel<ParcelType>(p),
+ KinematicParcel<ParcelType>(p),
T_(p.T_),
cp_(p.cp_),
Tc_(p.Tc_),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 778d45090cb..024081e1168 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -27,7 +27,7 @@ Class
Description
Thermodynamic parcel class with one/two-way coupling with the continuous
- phase. Includes InteractingKinematic parcel sub-models, plus:
+ phase. Includes Kinematic parcel sub-models, plus:
- heat transfer
SourceFiles
@@ -45,7 +45,7 @@ SourceFiles
#include "interpolationCellPoint.H"
#include "contiguous.H"
-#include "InteractingKinematicParcel.H"
+#include "KinematicParcel.H"
#include "ThermoCloud.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -70,14 +70,14 @@ Ostream& operator<<
template<class ParcelType>
class ThermoParcel
:
- public InteractingKinematicParcel<ParcelType>
+ public KinematicParcel<ParcelType>
{
public:
//- Class to hold thermo particle constant properties
class constantProperties
:
- public InteractingKinematicParcel<ParcelType>::constantProperties
+ public KinematicParcel<ParcelType>::constantProperties
{
// Private data
@@ -136,7 +136,7 @@ public:
//- Class used to pass thermo tracking data to the trackToFace function
class trackData
:
- public InteractingKinematicParcel<ParcelType>::trackData
+ public KinematicParcel<ParcelType>::trackData
{
// Private data
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index 06a439ad367..7ad292fb317 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -32,7 +32,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
const dictionary& parentDict
)
:
- InteractingKinematicParcel<ParcelType>::constantProperties(parentDict),
+ KinematicParcel<ParcelType>::constantProperties(parentDict),
T0_(dimensionedScalar(this->dict().lookup("T0")).value()),
TMin_(dimensionedScalar(this->dict().lookup("TMin")).value()),
cp0_(dimensionedScalar(this->dict().lookup("cp0")).value()),
@@ -55,7 +55,7 @@ inline Foam::ThermoParcel<ParcelType>::trackData::trackData
const vector& g
)
:
- InteractingKinematicParcel<ParcelType>::trackData
+ KinematicParcel<ParcelType>::trackData
(
cloud,
constProps,
@@ -79,7 +79,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
const label cellI
)
:
- InteractingKinematicParcel<ParcelType>(owner, position, cellI),
+ KinematicParcel<ParcelType>(owner, position, cellI),
T_(0.0),
cp_(0.0),
Tc_(0.0),
@@ -103,7 +103,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
const constantProperties& constProps
)
:
- InteractingKinematicParcel<ParcelType>
+ KinematicParcel<ParcelType>
(
owner,
position,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index da42e2995b8..b0a075af069 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -31,7 +31,7 @@ License
template <class ParcelType>
Foam::string Foam::ThermoParcel<ParcelType>::propHeader =
- InteractingKinematicParcel<ParcelType>::propHeader
+ KinematicParcel<ParcelType>::propHeader
+ " T"
+ " cp";
@@ -46,7 +46,7 @@ Foam::ThermoParcel<ParcelType>::ThermoParcel
bool readFields
)
:
- InteractingKinematicParcel<ParcelType>(cloud, is, readFields),
+ KinematicParcel<ParcelType>(cloud, is, readFields),
T_(0.0),
cp_(0.0),
Tc_(0.0),
@@ -86,7 +86,7 @@ void Foam::ThermoParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
return;
}
- InteractingKinematicParcel<ParcelType>::readFields(c);
+ KinematicParcel<ParcelType>::readFields(c);
IOField<scalar> T(c.fieldIOobject("T", IOobject::MUST_READ));
c.checkFieldIOobject(c, T);
@@ -110,7 +110,7 @@ void Foam::ThermoParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
template<class ParcelType>
void Foam::ThermoParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
{
- InteractingKinematicParcel<ParcelType>::writeFields(c);
+ KinematicParcel<ParcelType>::writeFields(c);
label np = c.size();
@@ -143,13 +143,13 @@ Foam::Ostream& Foam::operator<<
{
if (os.format() == IOstream::ASCII)
{
- os << static_cast<const InteractingKinematicParcel<ParcelType>&>(p)
+ os << static_cast<const KinematicParcel<ParcelType>&>(p)
<< token::SPACE << p.T()
<< token::SPACE << p.cp();
}
else
{
- os << static_cast<const InteractingKinematicParcel<ParcelType>&>(p);
+ os << static_cast<const KinematicParcel<ParcelType>&>(p);
os.write
(
reinterpret_cast<const char*>(&p.T_),
diff --git a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
index 2974454658e..6a47a4c49b9 100644
--- a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
index e78b15347d4..984e8783652 100644
--- a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
index 2189d8d8be9..cb8114bcca8 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -55,6 +55,9 @@ Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const scalarField& YGas0,
const scalarField& YLiquid0,
const scalarField& YSolid0,
@@ -73,6 +76,9 @@ Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
nParticle0,
d0,
U0,
+ f0,
+ pi0,
+ tau0,
YGas0,
YLiquid0,
YSolid0,
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
index f216f8f5478..c3922dacf9b 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -88,6 +88,9 @@ public:
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const scalarField& YGas0,
const scalarField& YLiquid0,
const scalarField& YSolid0,
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
index d73d63e9dd6..5d4dbac04ba 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
index af613ed87eb..4dd8cee2600 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
index d2b00fdf73f..c5831e79d9e 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
@@ -50,6 +50,9 @@ Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const scalarField& Y0,
const typename ReactingParcel<BasicReactingParcel<ThermoType> >::
constantProperties& constProps
@@ -64,6 +67,9 @@ Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
nParticle0,
d0,
U0,
+ f0,
+ pi0,
+ tau0,
Y0,
constProps
)
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
index b8b44eb237e..7a4ed3ccf43 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
@@ -87,6 +87,9 @@ public:
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const scalarField& Y0,
const typename ReactingParcel<BasicReactingParcel>::
constantProperties& constProps
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C
index b8bbbeffd4d..1a31aca4ac3 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/basicInteractingKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/basicInteractingKinematicParcel.C
deleted file mode 100644
index f0fc1183693..00000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/basicInteractingKinematicParcel.C
+++ /dev/null
@@ -1,120 +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 "basicInteractingKinematicParcel.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
- defineTypeNameAndDebug(basicInteractingKinematicParcel, 0);
- defineParticleTypeNameAndDebug(basicInteractingKinematicParcel, 0);
- defineParcelTypeNameAndDebug(basicInteractingKinematicParcel, 0);
-};
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::basicInteractingKinematicParcel::basicInteractingKinematicParcel
-(
- InteractingKinematicCloud<basicInteractingKinematicParcel>& owner,
- const vector& position,
- const label cellI
-)
-:
- InteractingKinematicParcel<basicInteractingKinematicParcel>
- (
- owner,
- position,
- cellI
- )
-{}
-
-
-Foam::basicInteractingKinematicParcel::basicInteractingKinematicParcel
-(
- InteractingKinematicCloud<basicInteractingKinematicParcel>& owner,
- const vector& position,
- const label cellI,
- const label typeId,
- const scalar nParticle0,
- const scalar d0,
- const vector& U0,
- const vector& f0,
- const vector& pi0,
- const vector& tau0,
- const constantProperties& constProps
-)
-:
- InteractingKinematicParcel<basicInteractingKinematicParcel>
- (
- owner,
- position,
- cellI,
- typeId,
- nParticle0,
- d0,
- U0,
- f0,
- pi0,
- tau0,
- constProps
- )
-{}
-
-
-Foam::basicInteractingKinematicParcel::basicInteractingKinematicParcel
-(
- const Cloud<basicInteractingKinematicParcel>& cloud,
- Istream& is,
- bool readFields
-)
-:
- InteractingKinematicParcel<basicInteractingKinematicParcel>
- (
- cloud,
- is,
- readFields
- )
-{}
-
-
-Foam::basicInteractingKinematicParcel::basicInteractingKinematicParcel
-(
- const basicInteractingKinematicParcel& p
-)
-:
- InteractingKinematicParcel<basicInteractingKinematicParcel>(p)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * //
-
-Foam::basicInteractingKinematicParcel::~basicInteractingKinematicParcel()
-{}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/basicInteractingKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/basicInteractingKinematicParcel.H
deleted file mode 100644
index 3d39f4f2e16..00000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/basicInteractingKinematicParcel.H
+++ /dev/null
@@ -1,133 +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
-
-Class
- Foam::basicInteractingKinematicParcel
-
-Description
-
-
-SourceFiles
- basicInteractingKinematicParcel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef basicInteractingKinematicParcel_H
-#define basicInteractingKinematicParcel_H
-
-#include "InteractingKinematicParcel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
- Class basicInteractingKinematicParcel Declaration
-\*---------------------------------------------------------------------------*/
-
-class basicInteractingKinematicParcel
-:
- public InteractingKinematicParcel<basicInteractingKinematicParcel>
-{
-
-public:
-
- //- Run-time type information
- TypeName("basicInteractingKinematicParcel");
-
-
- // Constructors
-
- //- Construct from owner, position, and cloud owner
- // Other properties initialised as null
- basicInteractingKinematicParcel
- (
- InteractingKinematicCloud<basicInteractingKinematicParcel>& owner,
- const vector& position,
- const label cellI
- );
-
- //- Construct from components
- basicInteractingKinematicParcel
- (
- InteractingKinematicCloud<basicInteractingKinematicParcel>& owner,
- const vector& position,
- const label cellI,
- const label typeId,
- const scalar nParticle0,
- const scalar d0,
- const vector& U0,
- const vector& f0,
- const vector& pi0,
- const vector& tau0,
- const constantProperties& constProps
- );
-
- //- Construct from Istream
- basicInteractingKinematicParcel
- (
- const Cloud<basicInteractingKinematicParcel>& c,
- Istream& is,
- bool readFields = true
- );
-
- //- Construct as a copy
- basicInteractingKinematicParcel
- (
- const basicInteractingKinematicParcel& p
- );
-
- //- Construct and return a clone
- autoPtr<basicInteractingKinematicParcel> clone() const
- {
- return
- autoPtr<basicInteractingKinematicParcel>
- (
- new basicInteractingKinematicParcel(*this)
- );
- }
-
-
- //- Destructor
- virtual ~basicInteractingKinematicParcel();
-};
-
-
-template<>
-inline bool contiguous<basicInteractingKinematicParcel>()
-{
- return true;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/defineBasicInteractingKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/defineBasicInteractingKinematicParcel.C
deleted file mode 100644
index 48d9ec6b93d..00000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/defineBasicInteractingKinematicParcel.C
+++ /dev/null
@@ -1,43 +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 "basicInteractingKinematicParcel.H"
-#include "InteractingKinematicCloud.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- defineTemplateTypeNameAndDebug(Cloud<basicInteractingKinematicParcel>, 0);
-
- defineParcelTypeNameAndDebug
- (
- InteractingKinematicCloud<basicInteractingKinematicParcel>, 0
- );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/makeBasicInteractingKinematicParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/makeBasicInteractingKinematicParcelSubmodels.C
deleted file mode 100644
index d6db2f41589..00000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/makeBasicInteractingKinematicParcelSubmodels.C
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2008-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 "basicInteractingKinematicParcel.H"
-
-// Kinematic
-#include "makeParcelDispersionModels.H"
-#include "makeParcelDragModels.H"
-#include "makeParcelInjectionModels.H"
-#include "makeParcelCollisionModels.H"
-#include "makeParcelPatchInteractionModels.H"
-#include "makeParcelPostProcessingModels.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- // InteractingKinematic sub-models
- makeParcelDispersionModels(basicInteractingKinematicParcel);
- makeParcelDragModels(basicInteractingKinematicParcel);
- makeParcelInjectionModels(basicInteractingKinematicParcel);
- makeParcelCollisionModels(basicInteractingKinematicParcel);
- makeParcelPatchInteractionModels(basicInteractingKinematicParcel);
- makeParcelPostProcessingModels(basicInteractingKinematicParcel);
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
index e7f883dcfda..9cd1958a463 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
@@ -58,6 +58,9 @@ Foam::basicKinematicParcel::basicKinematicParcel
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const constantProperties& constProps
)
:
@@ -70,6 +73,9 @@ Foam::basicKinematicParcel::basicKinematicParcel
nParticle0,
d0,
U0,
+ f0,
+ pi0,
+ tau0,
constProps
)
{}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index 18b43cbbadc..3a6a849e6df 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -79,6 +79,9 @@ public:
const scalar nParticle0,
const scalar d0,
const vector& U0,
+ const vector& f0,
+ const vector& pi0,
+ const vector& tau0,
const constantProperties& constProps
);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
index 6aaa63f9c06..61e39324309 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,6 +30,7 @@ License
#include "makeParcelDispersionModels.H"
#include "makeParcelDragModels.H"
#include "makeParcelInjectionModels.H"
+#include "makeParcelCollisionModels.H"
#include "makeParcelPatchInteractionModels.H"
#include "makeParcelPostProcessingModels.H"
@@ -41,6 +42,7 @@ namespace Foam
makeParcelDispersionModels(basicKinematicParcel);
makeParcelDragModels(basicKinematicParcel);
makeParcelInjectionModels(basicKinematicParcel);
+ makeParcelCollisionModels(basicKinematicParcel);
makeParcelPatchInteractionModels(basicKinematicParcel);
makeParcelPostProcessingModels(basicKinematicParcel);
};
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
index bc059a4f5cd..9e588e5ec26 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,17 +33,11 @@ namespace Foam
{
defineTemplateTypeNameAndDebug(Cloud<basicThermoParcel>, 0);
- defineParcelTypeNameAndDebug
- (
- InteractingKinematicParcel<basicThermoParcel>, 0
- );
+ defineParcelTypeNameAndDebug(KinematicParcel<basicThermoParcel>, 0);
defineParcelTypeNameAndDebug(ThermoParcel<basicThermoParcel>, 0);
defineTemplateTypeNameAndDebug(ThermoParcel<basicThermoParcel>, 0);
- defineParcelTypeNameAndDebug
- (
- InteractingKinematicCloud<basicThermoParcel>, 0
- );
+ defineParcelTypeNameAndDebug(KinematicCloud<basicThermoParcel>, 0);
defineParcelTypeNameAndDebug(ThermoCloud<basicThermoParcel>, 0);
};
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
index c9ce6199002..2f31362ce50 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H b/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
index 4bef0629a47..9688e487694 100644
--- a/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
+++ b/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -58,14 +58,10 @@ License
defineTemplateTypeNameAndDebug(Particle<ParcelType##ThermoType>, 0); \
defineTemplateTypeNameAndDebug(Cloud<ParcelType##ThermoType>, 0); \
\
- defineParcelTypeNameAndDebug \
- ( \
- InteractingKinematicParcel<ParcelType##ThermoType>, \
- 0 \
- ); \
+ defineParcelTypeNameAndDebug(KinematicParcel<ParcelType##ThermoType>, 0); \
defineTemplateTypeNameAndDebug \
( \
- InteractingKinematicParcel<ParcelType##ThermoType>, \
+ KinematicParcel<ParcelType##ThermoType>, \
0 \
); \
defineParcelTypeNameAndDebug(ThermoParcel<ParcelType##ThermoType>, 0); \
@@ -83,11 +79,7 @@ License
0 \
); \
\
- defineParcelTypeNameAndDebug \
- ( \
- InteractingKinematicCloud<ParcelType##ThermoType>, \
- 0 \
- ); \
+ defineParcelTypeNameAndDebug(KinematicCloud<ParcelType##ThermoType>, 0); \
defineParcelTypeNameAndDebug(ThermoCloud<ParcelType##ThermoType>, 0); \
defineParcelTypeNameAndDebug(ReactingCloud<ParcelType##ThermoType>, 0); \
defineParcelTypeNameAndDebug \
diff --git a/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H b/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
index b39329ba09e..f8991c49ee4 100644
--- a/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
+++ b/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,14 +46,10 @@ License
defineTemplateTypeNameAndDebug(Particle<ParcelType##ThermoType>, 0); \
defineTemplateTypeNameAndDebug(Cloud<ParcelType##ThermoType>, 0); \
\
- defineParcelTypeNameAndDebug \
- ( \
- InteractingKinematicParcel<ParcelType##ThermoType>, \
- 0 \
- ); \
+ defineParcelTypeNameAndDebug(KinematicParcel<ParcelType##ThermoType>, 0); \
defineTemplateTypeNameAndDebug \
( \
- InteractingKinematicParcel<ParcelType##ThermoType>, \
+ KinematicParcel<ParcelType##ThermoType>, \
0 \
); \
defineParcelTypeNameAndDebug(ThermoParcel<ParcelType##ThermoType>, 0); \
@@ -61,11 +57,7 @@ License
defineParcelTypeNameAndDebug(ReactingParcel<ParcelType##ThermoType>, 0); \
defineTemplateTypeNameAndDebug(ReactingParcel<ParcelType##ThermoType>, 0);\
\
- defineParcelTypeNameAndDebug \
- ( \
- InteractingKinematicCloud<ParcelType##ThermoType>, \
- 0 \
- ); \
+ defineParcelTypeNameAndDebug(KinematicCloud<ParcelType##ThermoType>, 0); \
defineParcelTypeNameAndDebug(ThermoCloud<ParcelType##ThermoType>, 0); \
defineParcelTypeNameAndDebug(ReactingCloud<ParcelType##ThermoType>, 0);
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
index afdb46430fc..c4e58c7a113 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "NoCollision.H"
#include "PairCollision.H"
@@ -42,42 +42,41 @@ License
#define makeParcelCollisionModels(ParcelType) \
\
- makeCollisionModel(InteractingKinematicCloud<ParcelType>); \
+ makeCollisionModel(KinematicCloud<ParcelType>); \
\
makeCollisionModelType \
( \
NoCollision, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
\
makeCollisionModelType \
( \
PairCollision, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
\
- makePairModel(InteractingKinematicCloud<ParcelType>); \
+ makePairModel(KinematicCloud<ParcelType>); \
\
makePairModelType \
( \
PairSpringSliderDashpot, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
\
- makeWallModel(InteractingKinematicCloud<ParcelType>); \
+ makeWallModel(KinematicCloud<ParcelType>); \
\
makeWallModelType \
( \
WallSpringSliderDashpot, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
);
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
index 5a6e4d414bd..56bd4798045 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "NoDispersion.H"
#include "GradientDispersionRAS.H"
@@ -39,30 +39,30 @@ License
#define makeParcelDispersionModels(ParcelType) \
\
- makeDispersionModel(InteractingKinematicCloud<ParcelType>); \
+ makeDispersionModel(KinematicCloud<ParcelType>); \
\
defineNamedTemplateTypeNameAndDebug \
( \
- DispersionRASModel<InteractingKinematicCloud<ParcelType> >, \
+ DispersionRASModel<KinematicCloud<ParcelType> >, \
0 \
); \
\
makeDispersionModelType \
( \
NoDispersion, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makeDispersionModelType \
( \
GradientDispersionRAS, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makeDispersionModelType \
( \
StochasticDispersionRAS, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H
index e0b46457336..e9e4b2b7e26 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "NoDrag.H"
#include "SphereDrag.H"
@@ -38,10 +38,10 @@ License
#define makeParcelDragModels(ParcelType) \
\
- makeDragModel(InteractingKinematicCloud<ParcelType>); \
+ makeDragModel(KinematicCloud<ParcelType>); \
\
- makeDragModelType(NoDrag, InteractingKinematicCloud, ParcelType); \
- makeDragModelType(SphereDrag, InteractingKinematicCloud, ParcelType);
+ makeDragModelType(NoDrag, KinematicCloud, ParcelType); \
+ makeDragModelType(SphereDrag, KinematicCloud, ParcelType);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
index 3206b1616d0..b6d8433be00 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
index 0ab13169452..11cdad6f851 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "ConeInjection.H"
#include "ConeInjectionMP.H"
@@ -43,48 +43,48 @@ License
#define makeParcelInjectionModels(ParcelType) \
\
- makeInjectionModel(InteractingKinematicCloud<ParcelType>); \
+ makeInjectionModel(KinematicCloud<ParcelType>); \
\
makeInjectionModelType \
( \
ConeInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makeInjectionModelType \
( \
ConeInjectionMP, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makeInjectionModelType \
( \
FieldActivatedInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makeInjectionModelType \
( \
KinematicLookupTableInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makeInjectionModelType \
( \
ManualInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makeInjectionModelType \
( \
NoInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makeInjectionModelType \
( \
PatchInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
index 2902a3f52e4..c8818e23da3 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "LocalInteraction.H"
#include "Rebound.H"
@@ -39,24 +39,24 @@ License
#define makeParcelPatchInteractionModels(ParcelType) \
\
- makePatchInteractionModel(InteractingKinematicCloud<ParcelType>); \
+ makePatchInteractionModel(KinematicCloud<ParcelType>); \
\
makePatchInteractionModelType \
( \
LocalInteraction, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makePatchInteractionModelType \
( \
Rebound, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makePatchInteractionModelType \
( \
StandardWallInteraction, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
index b205052e1d9..fb29023af10 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "NoPostProcessing.H"
#include "PatchPostProcessing.H"
@@ -38,18 +38,18 @@ License
#define makeParcelPostProcessingModels(ParcelType) \
\
- makePostProcessingModel(InteractingKinematicCloud<ParcelType>); \
+ makePostProcessingModel(KinematicCloud<ParcelType>); \
\
makePostProcessingModelType \
( \
NoPostProcessing, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
); \
makePostProcessingModelType \
( \
PatchPostProcessing, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
index 4f703d49676..f043a0828c9 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
index d293222c5b5..4f236da5ede 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
index a9055f2cfea..8a298a8a760 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoPhysicsTypes.H"
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "ConeInjection.H"
#include "ConeInjectionMP.H"
@@ -65,54 +65,54 @@ License
#define makeReactingMultiphaseInjectionModelThermoType(ParcelType, ThermoType)\
\
- makeInjectionModel(InteractingKinematicCloud<ParcelType<ThermoType> >); \
+ makeInjectionModel(KinematicCloud<ParcelType<ThermoType> >); \
\
makeInjectionModelThermoType \
( \
ConeInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
ConeInjectionMP, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
FieldActivatedInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
ManualInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
NoInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
PatchInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
ReactingMultiphaseLookupTableInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
index 47bbdcefb3d..93f4f508fd2 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H
index 05a702020ca..32d3a884263 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoPhysicsTypes.H"
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "NoCollision.H"
#include "PairCollision.H"
@@ -64,12 +64,12 @@ License
#define makeReactingCollisionModelThermoType(ParcelType, ThermoType) \
\
- makeCollisionModel(InteractingKinematicCloud<ParcelType<ThermoType> >); \
+ makeCollisionModel(KinematicCloud<ParcelType<ThermoType> >); \
\
makeCollisionModelThermoType \
( \
NoCollision, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
@@ -77,33 +77,32 @@ License
makeCollisionModelThermoType \
( \
PairCollision, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
\
- makePairModel(InteractingKinematicCloud<ParcelType<ThermoType> >); \
+ makePairModel(KinematicCloud<ParcelType<ThermoType> >); \
\
makePairModelThermoType \
( \
PairSpringSliderDashpot, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
\
- makeWallModel(InteractingKinematicCloud<ParcelType<ThermoType> >); \
+ makeWallModel(KinematicCloud<ParcelType<ThermoType> >); \
\
makeWallModelThermoType \
( \
WallSpringSliderDashpot, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
);
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
index d20439fccb8..0497bd2e66f 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H
index 99e8cdff6a6..9058aefa792 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoPhysicsTypes.H"
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "NoDispersion.H"
#include "GradientDispersionRAS.H"
@@ -61,35 +61,32 @@ License
#define makeReactingDispersionModelThermoType(ParcelType, ThermoType) \
\
- makeDispersionModel(InteractingKinematicCloud<ParcelType<ThermoType> >); \
+ makeDispersionModel(KinematicCloud<ParcelType<ThermoType> >); \
\
defineNamedTemplateTypeNameAndDebug \
( \
- DispersionRASModel \
- < \
- InteractingKinematicCloud<ParcelType<ThermoType> > \
- >, \
+ DispersionRASModel<KinematicCloud<ParcelType<ThermoType> > >, \
0 \
); \
\
makeDispersionModelThermoType \
( \
NoDispersion, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeDispersionModelThermoType \
( \
GradientDispersionRAS, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeDispersionModelThermoType \
( \
StochasticDispersionRAS, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H
index 198f795008d..5ab36532dd0 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoPhysicsTypes.H"
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "NoDrag.H"
#include "SphereDrag.H"
@@ -58,19 +58,19 @@ License
#define makeReactingDragModelThermoType(ParcelType, ThermoType) \
\
- makeDragModel(InteractingKinematicCloud<ParcelType<ThermoType> >); \
+ makeDragModel(KinematicCloud<ParcelType<ThermoType> >); \
\
makeDragModelThermoType \
( \
NoDrag, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeDragModelThermoType \
( \
SphereDrag, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H
index 25843df08e2..50363763964 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
index 52c1c428a76..52ac4b52aa4 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoPhysicsTypes.H"
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "ConeInjection.H"
#include "ConeInjectionMP.H"
@@ -65,54 +65,54 @@ License
#define makeReactingInjectionModelThermoType(ParcelType, ThermoType) \
\
- makeInjectionModel(InteractingKinematicCloud<ParcelType<ThermoType> >); \
+ makeInjectionModel(KinematicCloud<ParcelType<ThermoType> >); \
\
makeInjectionModelThermoType \
( \
ConeInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
ConeInjectionMP, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
FieldActivatedInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
ManualInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
NoInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
PatchInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makeInjectionModelThermoType \
( \
ReactingLookupTableInjection, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H
index cf3ff96c920..7facd090501 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoPhysicsTypes.H"
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "LocalInteraction.H"
#include "Rebound.H"
@@ -61,29 +61,26 @@ License
#define makeReactingPatchInteractionModelThermoType(ParcelType, ThermoType) \
\
- makePatchInteractionModel \
- ( \
- InteractingKinematicCloud<ParcelType<ThermoType> > \
- ); \
+ makePatchInteractionModel(KinematicCloud<ParcelType<ThermoType> >); \
\
makePatchInteractionModelThermoType \
( \
LocalInteraction, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makePatchInteractionModelThermoType \
( \
- Rebound, \
- InteractingKinematicCloud, \
+ Rebound, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makePatchInteractionModelThermoType \
( \
StandardWallInteraction, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
);
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
index 57a067198ee..def27ddcb5d 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H
index 50c59d93540..b913690974b 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoPhysicsTypes.H"
-#include "InteractingKinematicCloud.H"
+#include "KinematicCloud.H"
#include "NoPostProcessing.H"
#include "PatchPostProcessing.H"
@@ -60,22 +60,19 @@ License
#define makeReactingPostProcessingModelThermoType(ParcelType, ThermoType) \
\
- makePostProcessingModel \
- ( \
- InteractingKinematicCloud<ParcelType<ThermoType> > \
- ); \
+ makePostProcessingModel(KinematicCloud<ParcelType<ThermoType> >); \
\
makePostProcessingModelThermoType \
( \
NoPostProcessing, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
); \
makePostProcessingModelThermoType \
( \
PatchPostProcessing, \
- InteractingKinematicCloud, \
+ KinematicCloud, \
ParcelType, \
ThermoType \
);
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C
index c962be1df21..2b3938fa2be 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.C
+++ b/src/lagrangian/intermediate/particleForces/particleForces.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -189,3 +189,4 @@ Foam::vector Foam::particleForces::calcNonCoupled
// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H
index f0be4863816..db516362dbe 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.H
+++ b/src/lagrangian/intermediate/particleForces/particleForces.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 5f04d57d306..d651301f77a 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index eaa44b6afb5..0b158336ba8 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index f738cf26836..5d862eda1f1 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
index 2d3f7ce7add..ace1552b2a9 100644
--- a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
index 50f6c62ebd6..58efa839d0b 100644
--- a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
index 6726b8c55f9..fdfd1a67d83 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
index ccebe5f994d..f6bbe8da001 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
index 6b40fd80049..155c7ffe1bd 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C
index 2650715b0f5..66b6540ee4e 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) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
index 2fa997cdbdc..8d65f4b5689 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) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelI.H
index e5261f9bf77..ef0f65b1f87 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/NewCollisionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/NewCollisionModel.C
index 1a3a84ab08e..9c62eb921cd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/NewCollisionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/NewCollisionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
index 7a02cc42a03..398745df8ad 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -58,7 +58,7 @@ Foam::label Foam::NoCollision<CloudType>::nSubCycles() const
template<class CloudType>
bool Foam::NoCollision<CloudType>::active() const
{
- return true;
+ return false;
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
index 5bca953adcc..d4892af2030 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index b655ba1a759..3e41c946ba5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -189,6 +189,8 @@ void Foam::PairCollision<CloudType>::wallInteraction()
const point& pos = p.position();
+ scalar r = p.d()/2;
+
// real wallFace interactions
forAll(realWallFaces, realWallFaceI)
@@ -201,7 +203,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
mesh.points()
);
- if (nearest.distance() < p.r())
+ if (nearest.distance() < r)
{
vector normal = mesh.faceAreas()[realFaceI];
@@ -225,7 +227,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
(
flatSites,
nearPt,
- sqr(p.r()*flatWallDuplicateExclusion)
+ sqr(r*flatWallDuplicateExclusion)
)
)
{
@@ -233,7 +235,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
flatSiteExclusionDistancesSqr.append
(
- sqr(p.r()) - sqr(nearest.distance())
+ sqr(r) - sqr(nearest.distance())
);
}
}
@@ -265,7 +267,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
refCell.points()
);
- if (nearest.distance() < p.r())
+ if (nearest.distance() < r)
{
vector normal = refCell.faceAreas()[refFaceI];
@@ -289,7 +291,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
(
flatSites,
nearPt,
- sqr(p.r()*flatWallDuplicateExclusion)
+ sqr(r*flatWallDuplicateExclusion)
)
)
{
@@ -297,7 +299,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
flatSiteExclusionDistancesSqr.append
(
- sqr(p.r()) - sqr(nearest.distance())
+ sqr(r) - sqr(nearest.distance())
);
}
}
@@ -357,7 +359,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
sharpSiteExclusionDistancesSqr.append
(
- sqr(p.r()) - sqr(otherSiteDistances[orderedIndex])
+ sqr(r) - sqr(otherSiteDistances[orderedIndex])
);
}
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
index d0ad288b212..8cab2a9932e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/NewPairModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/NewPairModel.C
index 0e76917090a..b474b7261d9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/NewPairModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/NewPairModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.C
index 574e1835f99..ca64d90e6fd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
index ddf7dc098d7..067d6ed73a1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
index 4a1505dd93d..60018d4f6f7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,7 +52,7 @@ void Foam::PairSpringSliderDashpot<CloudType>::findMinMaxProperties
UMagMax = max
(
- mag(p.U()) + mag(p.omega())*p.r(),
+ mag(p.U()) + mag(p.omega())*p.d()/2,
UMagMax
);
}
@@ -186,8 +186,8 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
vector USlip_AB =
U_AB - (U_AB & rHat_AB)*rHat_AB
- + (pA.omega() ^ (pA.r()*-rHat_AB))
- - (pB.omega() ^ (pB.r()*rHat_AB));
+ + (pA.omega() ^ (pA.d()/2*-rHat_AB))
+ - (pB.omega() ^ (pB.d()/2*rHat_AB));
scalar deltaT = this->owner().mesh().time().deltaTValue();
@@ -242,8 +242,8 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
pA.f() += fT_AB;
pB.f() += -fT_AB;
- pA.tau() += (pA.r()*-rHat_AB) ^ fT_AB;
- pB.tau() += (pB.r()*rHat_AB) ^ -fT_AB;
+ pA.tau() += (pA.d()/2*-rHat_AB) ^ fT_AB;
+ pB.tau() += (pB.d()/2*rHat_AB) ^ -fT_AB;
}
}
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
index 33ebccc991b..13f619db156 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/NewWallModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/NewWallModel.C
index ba3cf9b54cd..6c4042c8048 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/NewWallModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/NewWallModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
index 788c0ed5a3c..e7cb8b1c199 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
index a79d4ab9e4f..3cb70bc5384 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
index 6de5824b85c..1cb5ae6fdff 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,7 +51,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::findMinMaxProperties
UMagMax = max
(
- mag(p.U()) + mag(p.omega())*p.r(),
+ mag(p.U()) + mag(p.omega())*p.d()/2,
UMagMax
);
}
@@ -148,13 +148,13 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
scalar Estar = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu_))/E_);
- scalar kN = (4.0/3.0)*sqrt(p.r())*Estar;
+ scalar kN = (4.0/3.0)*sqrt(p.d()/2)*Estar;
forAll(flatSites, siteI)
{
vector r_PW = p.position() - flatSites[siteI];
- scalar normalOverlapMag = p.r() - mag(r_PW);
+ scalar normalOverlapMag = p.d()/2 - mag(r_PW);
vector rHat_PW = r_PW/(mag(r_PW) + VSMALL);
@@ -173,7 +173,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
{
vector r_PW = p.position() - sharpSites[siteI];
- scalar normalOverlapMag = p.r() - mag(r_PW);
+ scalar normalOverlapMag = p.d()/2 - mag(r_PW);
vector rHat_PW = r_PW/(mag(r_PW) + VSMALL);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
index c1bcf453725..ee964f64cb3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
index e59eba322e2..7f9fd24da83 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
index 238d0463ef9..efca3a18100 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index a1353be80c4..7e92a050b33 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index c2f1e3cef43..6b2642c7c00 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
index 31587079e67..d8d8dc9827b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index b7dffffe997..0a2a4a7247b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 3beaa8abafa..50800e4ad36 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
index 902c4316e56..ffd8ce1e571 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
index 20887aa230f..f586d09eaa1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
index b300ea55251..625e6d65a00 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index cf9eb2b05cd..5ca82fdc5a5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
index 7c62bfda6ee..a8c36ef9097 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
index 3980ff9c4d9..e5075b863c2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index fcf8f04a2fa..18311fd5780 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
index ab1f198bdc9..cb3298ae594 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
index b1842b858a1..0ac996643f5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
index 6328cc67212..d780982511c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
index 49d69f7d7d2..4e46c4c1081 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
index af8c37f21bb..4852d663372 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
index f060eabc4b9..944438c08d1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
index 563ceebec24..91316269658 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
index 15d429493fe..83a6fc9f0dc 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
index 311169aa3aa..028e0a33fe7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H
index 0a95224da50..a7249189efd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index e06b4925bef..44330afe4f2 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) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index a3a8e9c724a..4d5370258c2 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) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
index 1c9b9a11db1..34761ede486 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
index 64240eab73e..430f7782e45 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
index 3555f616f74..87881dde40d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
index 5be1ce0a495..5c10e0863c6 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
index f7fda36a908..e2d3d9a6259 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index 5497d67bd61..4abb0eb1183 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index 51882ee3784..365d02ceb9b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index d8d522ff90b..eae76319b16 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index b787a9b2825..9418e34bf40 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
index 4239eb19958..baec172c139 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index b7edc60275d..a50ceb4eead 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
index 471fee8aabc..c65c99cf78a 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
index 0961826a23c..95b2fdcb65c 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index 687978a0a2a..57e850a8bd6 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index 6f95dd54f94..1247e405ba9 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 48fec17b833..330e31a88b6 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index 377b1330778..829d32697de 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index f7599b2fa78..8e78de0f9e8 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index 92478200242..57c71375a00 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index 0a8d88f271a..0f36d350381 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
--
GitLab