diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index d84e44bbbabcd3af27cd2862e03020d1370dfeb4..15697136b2d9b2888bfc7dc663fde21d20458548 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 1cefd5ef5971730405bc7c97a29f7b233133f439..93726d261fd4fd404b0767d48ef7e94be7ca0e7a 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 121ad0cf9d5b92c29ec3494d19e247e6760c3e85..d88a191de663ee0faaf38344a40d1763defb3069 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
@@ -38,7 +38,7 @@ Foam::IntegrationScheme<Type>::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<Type>::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 df79528a6b0795a3c9f468feffd434b25884f8d5..1d8ef2e66757c844ca71385b6836e52c2e50388d 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 78f07c01084940d769cfb2a2d8d332a755d361df..6f986e20edb67303e82d6212fc2bf1365c5dac46 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<CloudType>::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<CloudType>::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 4c1e660c772c970d2d3046b97fbc2c8c67a5fe31..d21a34463abb451b8276e060343d4f83b54617b4 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 9ba5743b5db6a67d7fa8bc14a9e3dd44f360f0bd..fd809cb6f58d44f75024900d4d138811f5937a89 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 2cee6e898106a00e8d1cddb8f4d57643f5964075..d0a08c78481e86299026e013ea4e7f914cced99c 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<CloudType>::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<CloudType>::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 9fba1b35e7e776417b76f7e572c4fc2a56c126b9..d2c9071ae386d8d6cdbeab7b9e62a7bdd2b470de 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 4062c9928cb8846b1ce9602d6fd5055cfa45592a..700ce321abdfac0f021a1da37e91228a83f52773 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 9d79d5e56d00d91e767846d917334171ed201a5d..cd06ec0b89f7991e9fe758f715d669c645cfab71 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 3cb4cc24d49022e814a349955dc287d709d29882..ec83515e6275acf45226a9cc4d73f613071fe6fb 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<CloudType>::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<CloudType>::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 e11ac0127af4f2031bcfb6eeea0181c6b2d0610c..10010c60c31ce5238720894e82ef9c42424ee22c 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 90dbb5e8bf1fdda9a6b77689e1e10f6c4a995c3a..63ad6f094582ca58a24425f7cbd5a8316904a2a2 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<CloudType>, 0); \
+ defineTemplateTypeNameAndDebug(DispersionModel<CloudType>, 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 75e1b5c9f687cfc75ffd10b3b8f0c0500a807057..c611ed54d2d9144001b43a825d30f9ebd6842d01 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<CloudType>::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<CloudType>::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 2f337915dd30799b1d32ff8c7b346ab37d3375c5..2978469249ebf873d81ebcbb3b946b18087a4722 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 4b741bb41fe6b74aa05cdb6007a1d9b583ce2db2..e2cfcda7db5b325dc9e71837a4712c18140a998c 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 5ac6cdb1a5722c4a94dd5b2185633556128cef5b..28f7659f662b8058f760ed390eeba32d8540f33d 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 c76fcf11b9932b3602c4e46a97f6606b4c1b888e..a5c9b61d9d98373b6e41e6bfa86a7259b0fe8424 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 cf5b0239956671abebae90fd87a56d4fd7ea31aa..12c5d6c62ef5faec83c34c7a3244b0be5436e880 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 ab3f3d182201f948ce5c81407e33aa658b7ea26f..dea47778915d1d6b63c93d8f9403e5e90a8c4082 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 4759c35615036f9a8f530d58b4c2fcad42a112e6..edd4d726f617e8d68f04c75e49d5e0f9eb9c874a 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 189704dca3a984b7df133f7fe8a4822897d88808..a67593f6f4c26bb31c8358ed5425322e64d98e73 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<CloudType>::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<CloudType>::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 0c84e17ffba72f0db325b5656ed89728686b56b5..242797a12023c9820f096382740783d1b60bd87a 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 c741179e1d6608d6b122b828f26ee5c32a5efb85..a6437e1f94bbdfa834401237c2adcaf90ef7ab92 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 2c1092bc21f6892380b276aac807378e50dbdfe8..c32181e3766be91353776ed596a04931d79bf5e7 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 7360b66f16ee0245f2c46244748c0310b7c34d0f..42b641aeab2b29cc36c0ad451bce1e1420e7d768 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 a56b794481c94321504e32c1baf65f64b89e8a50..f95a9802bb8c89be8c590d8a7a05855397ccd3ba 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 e8b8f4fd99bdef22fd0f92e8092d03306838b9bb..3080a13013f5dfb4c17cb00de9286be0edd84bf2 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<CloudType>::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<CloudType>::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 a79ea75824aa5c085a5687b7eac657a0b1db3c76..a2fe59b0e1d8e1120222414c1353e305a9fb275d 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 60421a08c7aa5eea16bc5b22ccbbb5d452880ddb..80e29e1a949acb9d1c1862f1d5445d0275b577a3 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 6bdb3d7478ea8d82d31763409e5032fdabb14975..1e1265ff3d61f19dc23bfc28e34453b832a8466a 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 1d1a95d7eefb6c02f4731034e9fff4a3f10096c0..df075084d4609f15c6717b5766417c038911c9ef 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 44830bd479aea8f11901947ae6494ae57dbf4ce8..bb1352302c9e9440a4f069e39719db131b1d1e1f 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 111d6bcbeed44ac0685ceea6a4e941f48f84b2cd..d74ec053539dcd2f6b187841b58454adf8cea30c 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<CloudType>::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<CloudType>::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 5d60c7b3b5d9fe23f342f5f1634e9b56f895c511..fe4de983b973516f7cb86db7acbdf8f44515b870 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 4916a99e2d30eca64b47d3eaef7e04d1691d1d7a..527bf0b36eb93c9ddc47ef885af36b345015b2b8 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<CloudType>::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<CloudType>::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 fe42c546724aca2220a369840bd2f026e4287620..2f38ff6a154455988b5fd0afb0eaf63e0284a30d 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 e97728a6c81b004c3c6c924e180cce333119ef25..e66ff5d54eedc07b92f383d00eb0b9c13d598da6 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<CloudType>::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<CloudType>::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 5b1186b3d1dfadb15fa5840524feade4ab85f200..b3d659b64b46b03f41fe1e5f70b13d47a4cd389a 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 0c58c923c70749702807b7b394806e88d51fdfe5..06ea62c261eedf6d66dca00f7d4d1f3ba2d7a4b1 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 a65a19588c6f159e100770a23c88892d33d3c8d3..d132886b1acd384677bc751dff1a740f82c54436 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 a3e43aa9319a9967a0f3d411607bac7a00723366..224aa08eae749f0b9ccbddc8be876fd11cd85dc0 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 416e5f5b91f1dccabfba4956ab1698a21af4db64..e0e161c8463695261f1c0378e965e0d088a354f7 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 9931cc93ab559fd68597ce3d8d3e412e6eb54ab3..1922dd04ea21d118de5c31a51fd21ab99a3129d9 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<CloudType>::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<CloudType>::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 98f664a5b08d98d8299e636bf5b7be2fd64da9a4..ac7a3a6bd91656b9184bcba63af2f00d73b8c643 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 f82897ec08490d482a2cc6fe4a35daf18532a7f0..697c5ce76b3d5f0c42f89b1b6a640d4362045db8 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 2ae1ee3b2a830c167262f229a0363599ddc54422..eef80d948bf2da6409c68dee181381530da879a0 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<CloudType>::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<CloudType>::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 c0534b9f5e9c8c4345f10f3ac92a6e941c792fb6..55483674a40427d7b109efc781276bd998dd5488 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 807630b2c2b9ce9e5248c08f3ba05ae29ff21229..00c8c187343d04500983b6041f409edc00328ff3 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 47c439439d3764159f3407350ae94038a12699c7..a8b975c1376270ee954f18c3bd459ac54cd9f0e7 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 3369cf5b08e99b99ccccdd3f2e08017c765a8592..9c93a2d80a61434480b52181104185d0976b79fb 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<CloudType>::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<CloudType>::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 3535dda395cc63a2bfddf01ef4bfadbf015092d3..9769f809411627f7c5e1b32fda3abbaa392ca1a8 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 bcb6c2e4f2b235b2b320f761730d19a4a882eaf3..cb051e87e9b33dc3f7624ada40cd54a3f15a522d 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<CloudType>::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<CloudType>::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 cf7277428f2ad4d785c36609ed5ac40badd22093..d3d5dfb9292747799273458cf6445daf208910ef 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 fa1b6a1af23025c8fe0d0e9e2b5fdc064da78d5f..8aa316a6d5ce8e5914d29b0e87c35207acdcafe1 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 f5e1c5ec0cd9fe4ee16059ef3f3a656322b5b3fc..28429e4b88887c7be2f7a433f7b4d3afba790b50 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 37dea4cfe0fa9af988b873a5001ebbde939ba942..ffd13e92f1bafa84f34a85644f78493bd7a6316d 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;