From 12909926c25ca1cbe30b2bc137a4de75f6733b4b Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 25 Feb 2011 14:17:59 +0000 Subject: [PATCH] STYLE: Updated capitalisation of cloud models --- .../IntegrationScheme/Analytical/Analytical.H | 2 +- .../IntegrationScheme/IntegrationScheme.H | 2 +- .../IntegrationScheme/IntegrationSchemeNew.C | 6 ++-- .../CollisionModel/CollisionModel.H | 2 +- .../CollisionModel/CollisionModelNew.C | 10 +++--- .../PairCollision/PairCollision.H | 4 +-- .../PairModel/PairModel/PairModel.H | 2 +- .../PairModel/PairModel/PairModelNew.C | 11 +++--- .../PairSpringSliderDashpot.H | 4 +-- .../WallLocalSpringSliderDashpot.H | 4 +-- .../WallModel/WallModel/WallModel.H | 2 +- .../WallModel/WallModel/WallModelNew.C | 12 +++---- .../WallSpringSliderDashpot.H | 4 +-- .../DispersionModel/DispersionModel.H | 4 +-- .../DispersionModel/DispersionModelNew.C | 8 ++--- .../DispersionRASModel/DispersionRASModel.H | 2 +- .../GradientDispersionRAS.H | 2 +- .../StochasticDispersionRAS.H | 2 +- .../ConeInjection/ConeInjection.H | 2 +- .../FieldActivatedInjection.H | 2 +- .../InflationInjection/InflationInjection.H | 2 +- .../InjectionModel/InjectionModel.H | 2 +- .../InjectionModel/InjectionModelNew.C | 8 ++--- .../KinematicLookupTableInjection.H | 4 +-- .../ManualInjection/ManualInjection.H | 2 +- .../PatchInjection/PatchInjection.H | 2 +- .../LocalInteraction/LocalInteraction.H | 2 +- .../PatchInteractionModel.H | 2 +- .../PatchInteractionModelNew.C | 10 +++--- .../PatchInteractionModel/Rebound/Rebound.H | 2 +- .../StandardWallInteraction.H | 2 +- .../ParticleTracks/ParticleTracks.H | 4 +-- .../PatchPostProcessing/PatchPostProcessing.H | 2 +- .../PostProcessingModel/PostProcessingModel.H | 2 +- .../PostProcessingModelNew.C | 10 +++--- .../SurfaceFilmModel/SurfaceFilmModel.H | 2 +- .../SurfaceFilmModel/SurfaceFilmModelNew.C | 10 +++--- .../CompositionModel/CompositionModel.H | 2 +- .../CompositionModel/CompositionModelNew.C | 10 +++--- .../SingleMixtureFraction.H | 4 +-- .../SinglePhaseMixture/SinglePhaseMixture.H | 4 +-- .../ReactingLookupTableInjection.H | 4 +-- .../LiquidEvaporation/LiquidEvaporation.H | 2 +- .../PhaseChangeModel/PhaseChangeModel.H | 2 +- .../PhaseChangeModel/PhaseChangeModelNew.C | 10 +++--- .../ConstantRateDevolatilisation.H | 4 +-- .../DevolatilisationModel.H | 2 +- .../DevolatilisationModelNew.C | 10 +++--- .../SingleKineticRateDevolatilisation.H | 4 +-- .../ReactingMultiphaseLookupTableInjection.H | 4 +-- .../SurfaceReactionModel.H | 2 +- .../SurfaceReactionModelNew.C | 8 ++--- .../HeatTransferModel/HeatTransferModel.H | 2 +- .../HeatTransferModel/HeatTransferModelNew.C | 8 ++--- .../ThermoLookupTableInjection.H | 4 +-- .../ThermoSurfaceFilm/ThermoSurfaceFilm.H | 4 +-- .../constant/coalCloud1Properties | 34 +++++++++---------- .../constant/limestoneCloud1Properties | 20 +++++------ 58 files changed, 146 insertions(+), 153 deletions(-) diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H index d84e44bbba..15697136b2 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H +++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H @@ -51,7 +51,7 @@ class Analytical public: //- Runtime type information - TypeName("Analytical"); + TypeName("analytical"); // Constructors diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H index 1cefd5ef59..93726d261f 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H +++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H @@ -128,7 +128,7 @@ private: public: //- Runtime type information - TypeName("IntegrationScheme"); + TypeName("integrationScheme"); //- Declare runtime constructor selection table diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C index 121ad0cf9d..d88a191de6 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C +++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C @@ -38,7 +38,7 @@ Foam::IntegrationScheme::New { const word schemeName(dict.lookup(phiName)); - Info<< "Selecting " << phiName << " IntegrationScheme " + Info<< "Selecting " << phiName << " integration scheme " << schemeName << endl; typename dictionaryConstructorTable::iterator cstrIter = @@ -49,9 +49,9 @@ Foam::IntegrationScheme::New FatalErrorIn ( "IntegrationScheme::New(const dictionary&)" - ) << "Unknown IntegrationScheme type " + ) << "Unknown integration scheme type " << schemeName << nl << nl - << "Valid IntegrationScheme types are:" << nl + << "Valid integration scheme types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H index df79528a6b..1d8ef2e667 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H @@ -64,7 +64,7 @@ class CollisionModel public: //- Runtime type information - TypeName("CollisionModel"); + TypeName("collisionModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C index 78f07c0108..6f986e20ed 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,9 +35,9 @@ Foam::CollisionModel::New CloudType& owner ) { - word modelType(dict.lookup("CollisionModel")); + word modelType(dict.lookup("collisionModel")); - Info<< "Selecting CollisionModel " << modelType << endl; + Info<< "Selecting collision model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::CollisionModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown CollisionModelType type " << modelType + ) << "Unknown collision model type " << modelType << ", constructor not in hash table" << nl << nl - << " Valid CollisionModel types are:" << nl + << " Valid collision model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H index 4c1e660c77..d21a34463a 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) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -142,7 +142,7 @@ class PairCollision public: //- Runtime type information - TypeName("PairCollision"); + TypeName("pairCollision"); // Constructors 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 9ba5743b5d..fd809cb6f5 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 @@ -67,7 +67,7 @@ class PairModel public: //- Runtime type information - TypeName("PairModel"); + TypeName("pairModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C index 2cee6e8981..d0a08c7848 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,10 +35,9 @@ Foam::PairModel::New CloudType& owner ) { - word PairModelType(dict.lookup("PairModel")); + word PairModelType(dict.lookup("pairModel")); - Info<< "Selecting PairModel " << PairModelType - << endl; + Info<< "Selecting pair model " << PairModelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(PairModelType); @@ -52,10 +51,10 @@ Foam::PairModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown PairModelType type " + ) << "Unknown pair model type " << PairModelType << ", constructor not in hash table" << nl << nl - << " Valid PairModel types are:" << nl + << " Valid pair model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } 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 9fba1b35e7..d2c9071ae3 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,7 +108,7 @@ class PairSpringSliderDashpot public: //- Runtime type information - TypeName("PairSpringSliderDashpot"); + TypeName("pairSpringSliderDashpot"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H index 4062c9928c..700ce321ab 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -122,7 +122,7 @@ class WallLocalSpringSliderDashpot public: //- Runtime type information - TypeName("WallLocalSpringSliderDashpot"); + TypeName("wallLocalSpringSliderDashpot"); // Constructors 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 9d79d5e56d..cd06ec0b89 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 @@ -68,7 +68,7 @@ class WallModel public: //- Runtime type information - TypeName("WallModel"); + TypeName("wallModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C index 3cb4cc24d4..ec83515e62 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,10 +35,9 @@ Foam::WallModel::New CloudType& owner ) { - word WallModelType(dict.lookup("WallModel")); + word WallModelType(dict.lookup("wallModel")); - Info<< "Selecting WallModel " << WallModelType - << endl; + Info<< "Selecting wall model " << WallModelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(WallModelType); @@ -52,10 +51,9 @@ Foam::WallModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown WallModelType type " - << WallModelType + ) << "Unknown wall model type type " << WallModelType << ", constructor not in hash table" << nl << nl - << " Valid WallModel types are:" << nl + << " Valid wall model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } 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 e11ac0127a..10010c60c3 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -117,7 +117,7 @@ class WallSpringSliderDashpot public: //- Runtime type information - TypeName("WallSpringSliderDashpot"); + TypeName("wallSpringSliderDashpot"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H index 90dbb5e8bf..63ad6f0945 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H @@ -53,7 +53,7 @@ class DispersionModel public: //- Runtime type information - TypeName("DispersionModel"); + TypeName("dispersionModel"); // Declare runtime constructor selection table @@ -132,7 +132,7 @@ public: #define makeDispersionModel(CloudType) \ \ - defineNamedTemplateTypeNameAndDebug(DispersionModel, 0); \ + defineTemplateTypeNameAndDebug(DispersionModel, 0); \ \ defineTemplateRunTimeSelectionTable \ ( \ diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C index 75e1b5c9f6..c611ed54d2 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C @@ -35,9 +35,9 @@ Foam::DispersionModel::New CloudType& owner ) { - const word modelType(dict.lookup("DispersionModel")); + const word modelType(dict.lookup("dispersionModel")); - Info<< "Selecting DispersionModel " << modelType << endl; + Info<< "Selecting dispersion model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::DispersionModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown DispersionModel type " + ) << "Unknown dispersion model type " << modelType << nl << nl - << "Valid DispersionModel types are:" << nl + << "Valid dispersion model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H index 2f337915dd..2978469249 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H @@ -74,7 +74,7 @@ protected: public: //- Runtime type information - TypeName("DispersionRASModel"); + TypeName("dispersionRASModel"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H index 4b741bb41f..e2cfcda7db 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H @@ -66,7 +66,7 @@ protected: public: //- Runtime type information - TypeName("GradientDispersionRAS"); + TypeName("gradientDispersionRAS"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H index 5ac6cdb1a5..28f7659f66 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H @@ -53,7 +53,7 @@ class StochasticDispersionRAS public: //- Runtime type information - TypeName("StochasticDispersionRAS"); + TypeName("stochasticDispersionRAS"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index c76fcf11b9..a5c9b61d9d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -127,7 +127,7 @@ protected: public: //- Runtime type information - TypeName("ConeInjection"); + TypeName("coneInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H index cf5b023995..12c5d6c62e 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H @@ -129,7 +129,7 @@ protected: public: //- Runtime type information - TypeName("FieldActivatedInjection"); + TypeName("fieldActivatedInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H index ab3f3d1822..dea4777891 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H @@ -125,7 +125,7 @@ protected: public: //- Runtime type information - TypeName("InflationInjection"); + TypeName("inflationInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H index 4759c35615..edd4d726f6 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H @@ -193,7 +193,7 @@ protected: public: //- Runtime type information - TypeName("InjectionModel"); + TypeName("injectionModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C index 189704dca3..a67593f6f4 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C @@ -35,9 +35,9 @@ Foam::InjectionModel::New CloudType& owner ) { - const word modelType(dict.lookup("InjectionModel")); + const word modelType(dict.lookup("injectionModel")); - Info<< "Selecting InjectionModel " << modelType << endl; + Info<< "Selecting injection model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::InjectionModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown InjectionModel type " + ) << "Unknown injection model type " << modelType << nl << nl - << "Valid InjectionModel types are:" << nl + << "Valid injection model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H index 0c84e17ffb..242797a120 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,7 +105,7 @@ protected: public: //- Runtime type information - TypeName("KinematicLookupTableInjection"); + TypeName("kinematicLookupTableInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H index c741179e1d..a6437e1f94 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H @@ -99,7 +99,7 @@ protected: public: //- Runtime type information - TypeName("ManualInjection"); + TypeName("manualInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H index 2c1092bc21..c32181e376 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H @@ -108,7 +108,7 @@ protected: public: //- Runtime type information - TypeName("PatchInjection"); + TypeName("patchInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H index 7360b66f16..42b641aeab 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H @@ -108,7 +108,7 @@ class LocalInteraction public: //- Runtime type information - TypeName("LocalInteraction"); + TypeName("localInteraction"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H index a56b794481..f95a9802bb 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H @@ -85,7 +85,7 @@ private: public: //- Runtime type information - TypeName("PatchInteractionModel"); + TypeName("patchInteractionModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C index e8b8f4fd99..3080a13013 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,9 +35,9 @@ Foam::PatchInteractionModel::New CloudType& owner ) { - const word modelType(dict.lookup("PatchInteractionModel")); + const word modelType(dict.lookup("patchInteractionModel")); - Info<< "Selecting PatchInteractionModel " << modelType << endl; + Info<< "Selecting patch interaction model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::PatchInteractionModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown PatchInteractionModel type " + ) << "Unknown patch interaction model type " << modelType << nl << nl - << "Valid PatchInteractionModel types are:" << nl + << "Valid patch interaction model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H index a79ea75824..a2fe59b0e1 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H @@ -57,7 +57,7 @@ class Rebound public: //- Runtime type information - TypeName("Rebound"); + TypeName("rebound"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H index 60421a08c7..80e29e1a94 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H @@ -77,7 +77,7 @@ protected: public: //- Runtime type information - TypeName("StandardWallInteraction"); + TypeName("standardWallInteraction"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H index 6bdb3d7478..1e1265ff3d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -89,7 +89,7 @@ protected: public: //- Runtime type information - TypeName("ParticleTracks"); + TypeName("particleTracks"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H index 1d1a95d7ee..df075084d4 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H @@ -85,7 +85,7 @@ protected: public: //- Runtime type information - TypeName("PatchPostProcessing"); + TypeName("patchPostProcessing"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H index 44830bd479..bb1352302c 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H @@ -64,7 +64,7 @@ class PostProcessingModel public: //- Runtime type information - TypeName("PostProcessingModel"); + TypeName("postProcessingModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C index 111d6bcbee..d74ec05353 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,9 +35,9 @@ Foam::PostProcessingModel::New CloudType& owner ) { - const word modelType(dict.lookup("PostProcessingModel")); + const word modelType(dict.lookup("postProcessingModel")); - Info<< "Selecting PostProcessingModel " << modelType << endl; + Info<< "Selecting post-processing model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::PostProcessingModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown PostProcessingModel type " + ) << "Unknown post-processing model type " << modelType << nl << nl - << "Valid PostProcessingModel types are:" << nl + << "Valid post-processing model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H index 5d60c7b3b5..fe4de983b9 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H @@ -128,7 +128,7 @@ protected: public: //- Runtime type information - TypeName("SurfaceFilmModel"); + TypeName("surfaceFilmModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C index 4916a99e2d..527bf0b36e 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,9 +36,9 @@ Foam::SurfaceFilmModel::New const dimensionedVector& g ) { - const word modelType(dict.lookup("SurfaceFilmModel")); + const word modelType(dict.lookup("surfaceFilmModel")); - Info<< "Selecting SurfaceFilmModel " << modelType << endl; + Info<< "Selecting surface film model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -52,9 +52,9 @@ Foam::SurfaceFilmModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown SurfaceFilmModel type " + ) << "Unknown surface film model type " << modelType << nl << nl - << "Valid SurfaceFilmModel types are:" << nl + << "Valid surface film model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H index fe42c54672..2f38ff6a15 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H @@ -72,7 +72,7 @@ class CompositionModel public: //- Runtime type information - TypeName("CompositionModel"); + TypeName("compositionModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C index e97728a6c8..e66ff5d54e 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,9 +35,9 @@ Foam::CompositionModel::New CloudType& owner ) { - const word modelType(dict.lookup("CompositionModel")); + const word modelType(dict.lookup("compositionModel")); - Info<< "Selecting CompositionModel " << modelType << endl; + Info<< "Selecting composition model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::CompositionModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown CompositionModel type " + ) << "Unknown composition model type " << modelType << nl << nl - << "Valid CompositionModel types are:" << nl + << "Valid composition model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H index 5b1186b3d1..b3d659b64b 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,7 +81,7 @@ class SingleMixtureFraction public: //- Runtime type information - TypeName("SingleMixtureFraction"); + TypeName("singleMixtureFraction"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H index 0c58c923c7..06ea62c261 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ class SinglePhaseMixture public: //- Runtime type information - TypeName("SinglePhaseMixture"); + TypeName("singlePhaseMixture"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H index a65a19588c..d132886b1a 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,7 +108,7 @@ protected: public: //- Runtime type information - TypeName("ReactingLookupTableInjection"); + TypeName("reactingLookupTableInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H index a3e43aa931..224aa08eae 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H @@ -78,7 +78,7 @@ protected: public: //- Runtime type information - TypeName("LiquidEvaporation"); + TypeName("liquidEvaporation"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H index 416e5f5b91..e0e161c846 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H @@ -90,7 +90,7 @@ protected: public: //- Runtime type information - TypeName("PhaseChangeModel"); + TypeName("phaseChangeModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C index 9931cc93ab..1922dd04ea 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,9 +35,9 @@ Foam::PhaseChangeModel::New CloudType& owner ) { - const word modelType(dict.lookup("PhaseChangeModel")); + const word modelType(dict.lookup("phaseChangeModel")); - Info<< "Selecting PhaseChangeModel " << modelType << endl; + Info<< "Selecting phase change model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::PhaseChangeModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown PhaseChangeModel type " + ) << "Unknown phase change model type " << modelType << nl << nl - << "Valid PhaseChangeModel types are:" << nl + << "Valid phase change model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H index 98f664a5b0..ac7a3a6bd9 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,7 +70,7 @@ class ConstantRateDevolatilisation public: //- Runtime type information - TypeName("ConstantRateDevolatilisation"); + TypeName("constantRateDevolatilisation"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H index f82897ec08..697c5ce76b 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H @@ -58,7 +58,7 @@ class DevolatilisationModel public: //- Runtime type information - TypeName("DevolatilisationModel"); + TypeName("devolatilisationModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C index 2ae1ee3b2a..eef80d948b 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,9 +35,9 @@ Foam::DevolatilisationModel::New CloudType& owner ) { - const word modelType(dict.lookup("DevolatilisationModel")); + const word modelType(dict.lookup("devolatilisationModel")); - Info<< "Selecting DevolatilisationModel " << modelType << endl; + Info<< "Selecting devolatilisation model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::DevolatilisationModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown DevolatilisationModel type " + ) << "Unknown devolatilisation model type " << modelType << nl << nl - << "Valid DevolatilisationModel types are:" << nl + << "Valid devolatilisation model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H index c0534b9f5e..55483674a4 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -191,7 +191,7 @@ class SingleKineticRateDevolatilisation public: //- Runtime type information - TypeName("SingleKineticRateDevolatilisation"); + TypeName("singleKineticRateDevolatilisation"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H index 807630b2c2..00c8c18734 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,7 +111,7 @@ protected: public: //- Runtime type information - TypeName("ReactingMultiphaseLookupTableInjection"); + TypeName("reactingMultiphaseLookupTableInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H index 47c439439d..a8b975c137 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H @@ -59,7 +59,7 @@ class SurfaceReactionModel public: //-Runtime type information - TypeName("SurfaceReactionModel"); + TypeName("surfaceReactionModel"); //- Declare runtime constructor selection table diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C index 3369cf5b08..9c93a2d80a 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C @@ -35,9 +35,9 @@ Foam::SurfaceReactionModel::New CloudType& owner ) { - const word modelType(dict.lookup("SurfaceReactionModel")); + const word modelType(dict.lookup("surfaceReactionModel")); - Info<< "Selecting SurfaceReactionModel " << modelType << endl; + Info<< "Selecting surface reaction model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::SurfaceReactionModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown SurfaceReactionModel type " + ) << "Unknown surface reaction model type " << modelType << nl << nl - << "Valid SurfaceReactionModel types are:" << nl + << "Valid surface reaction model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H index 3535dda395..9769f80941 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H @@ -64,7 +64,7 @@ class HeatTransferModel public: //- Runtime type information - TypeName("HeatTransferModel"); + TypeName("heatTransferModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C index bcb6c2e4f2..cb051e87e9 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C @@ -35,9 +35,9 @@ Foam::HeatTransferModel::New CloudType& owner ) { - const word modelType(dict.lookup("HeatTransferModel")); + const word modelType(dict.lookup("heatTransferModel")); - Info<< "Selecting HeatTransferModel " << modelType << endl; + Info<< "Selecting heat transfer model " << modelType << endl; typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); @@ -51,9 +51,9 @@ Foam::HeatTransferModel::New "const dictionary&, " "CloudType&" ")" - ) << "Unknown HeatTransferModel type " + ) << "Unknown heat transfer model type " << modelType << nl << nl - << "Valid HeatTransferModel types are:" << nl + << "Valid heat transfer model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H index cf7277428f..d3d5dfb929 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-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,7 +107,7 @@ protected: public: //- Runtime type information - TypeName("ThermoLookupTableInjection"); + TypeName("thermoLookupTableInjection"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H index fa1b6a1af2..8aa316a6d5 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -242,7 +242,7 @@ protected: public: //- Runtime type information - TypeName("ThermoSurfaceFilm"); + TypeName("thermoSurfaceFilm"); // Constructors diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index f5e1c5ec0c..28429e4b88 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -56,7 +56,7 @@ solution integrationSchemes { U Euler; - T Analytical; + T analytical; } } @@ -99,31 +99,29 @@ subModels ); } - InjectionModel ManualInjection; + injectionModel manualInjection; - DispersionModel StochasticDispersionRAS; + dispersionModel stochasticDispersionRAS; - PatchInteractionModel StandardWallInteraction; + patchInteractionModel standardWallInteraction; - HeatTransferModel RanzMarshall; + heatTransferModel RanzMarshall; - CompositionModel SingleMixtureFraction; + compositionModel singleMixtureFraction; - PhaseChangeModel LiquidEvaporation; + phaseChangeModel liquidEvaporation; - DevolatilisationModel ConstantRateDevolatilisation; + devolatilisationModel constantRateDevolatilisation; - SurfaceReactionModel COxidationKineticDiffusionLimitedRate; + surfaceReactionModel COxidationKineticDiffusionLimitedRate; - PostProcessingModel none; + postProcessingModel none; - CollisionModel none; - - SurfaceFilmModel none; + surfaceFilmModel none; radiation on; - ManualInjectionCoeffs + manualInjectionCoeffs { massTotal 0.0001; parcelBasisType mass; @@ -143,7 +141,7 @@ subModels } } - StandardWallInteractionCoeffs + standardWallInteractionCoeffs { type rebound; e 1; @@ -155,7 +153,7 @@ subModels BirdCorrection true; } - SingleMixtureFractionCoeffs + singleMixtureFractionCoeffs { phases ( @@ -180,7 +178,7 @@ subModels YSolidTot0 0.763; } - LiquidEvaporationCoeffs + liquidEvaporationCoeffs { enthalpyTransfer enthalpyDifference; @@ -190,7 +188,7 @@ subModels ); } - ConstantRateDevolatilisationCoeffs + constantRateDevolatilisationCoeffs { volatileData ( diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 37dea4cfe0..ffd13e92f1 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -47,7 +47,7 @@ solution integrationSchemes { U Euler; - T Analytical; + T analytical; } } @@ -83,23 +83,21 @@ subModels ); } - InjectionModel ManualInjection; + injectionModel manualInjection; - DispersionModel StochasticDispersionRAS; + dispersionModel stochasticDispersionRAS; - PatchInteractionModel StandardWallInteraction; + patchInteractionModel standardWallInteraction; - HeatTransferModel RanzMarshall; + heatTransferModel RanzMarshall; - PostProcessingModel none; + postProcessingModel none; - CollisionModel none; - - SurfaceFilmModel none; + surfaceFilmModel none; radiation on; - ManualInjectionCoeffs + manualInjectionCoeffs { massTotal 0.0001; parcelBasisType mass; @@ -119,7 +117,7 @@ subModels } } - StandardWallInteractionCoeffs + standardWallInteractionCoeffs { type rebound; e 1;