From c71610aa761251e30172037c3a2edd13b15f468d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 2 Jan 2014 18:20:42 +0000
Subject: [PATCH] ENH: Code formatting improvements/corrections
---
.../AveragingMethod/AveragingMethod.C | 13 +++++++------
.../submodels/MPPIC/AveragingMethods/Dual/Dual.H | 4 ++--
.../MPPIC/AveragingMethods/Moment/Moment.H | 4 ++--
.../CorrectionLimitingMethod.C | 3 +--
.../CorrectionLimitingMethod.H | 4 ++--
.../CorrectionLimitingMethods/absolute/absolute.H | 4 ++--
.../noCorrectionLimiting/noCorrectionLimiting.H | 4 ++--
.../CorrectionLimitingMethods/relative/relative.H | 4 ++--
.../IsotropyModels/IsotropyModel/IsotropyModel.H | 14 +++++++-------
.../MPPIC/PackingModels/Implicit/Implicit.H | 4 ++--
.../ParticleStressModel/ParticleStressModel.H | 4 ++--
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index 21cb38d2ed6..cc29f5810b6 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -91,7 +91,8 @@ Foam::AveragingMethod<Type>::New
(
"Foam::AveragingMethod<Type>::New"
"("
- "const dictionary&"
+ "const IOobject&, "
+ "const dictionary&, "
"const fvMesh&"
")"
) << "Unknown averaging method " << averageType
@@ -243,10 +244,10 @@ bool Foam::AveragingMethod<Type>::write() const
pointGrad.internalField() /= pointVolume;
// write
- if(!cellValue.write()) return false;
- if(!cellGrad.write()) return false;
- if(!pointValue.write()) return false;
- if(!pointGrad.write()) return false;
+ if (!cellValue.write()) return false;
+ if (!cellGrad.write()) return false;
+ if (!pointValue.write()) return false;
+ if (!pointGrad.write()) return false;
return true;
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
index 537c1270b96..0c905e003eb 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -58,7 +58,7 @@ namespace AveragingMethods
{
/*---------------------------------------------------------------------------*\
- Class Dual Declaration
+ Class Dual Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
index 67aec06b582..e429ed43ec4 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -55,7 +55,7 @@ namespace AveragingMethods
{
/*---------------------------------------------------------------------------*\
- Class Moment Declaration
+ Class Moment Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
index 84545e76405..3c6b0ca885d 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -69,7 +69,6 @@ Foam::CorrectionLimitingMethod::New
(
"CorrectionLimitingMethod::New"
"("
- "const word&, "
"const dictionary&"
")"
) << "Unknown correction limiter type " << modelType
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H
index a478d47e912..18978b5a0f9 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -45,7 +45,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class CorrectionLimitingMethod Declaration
+ Class CorrectionLimitingMethod Declaration
\*---------------------------------------------------------------------------*/
class CorrectionLimitingMethod
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.H b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.H
index 637d99ec44d..742746b5e36 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,7 +50,7 @@ namespace CorrectionLimitingMethods
{
/*---------------------------------------------------------------------------*\
- Class absolute Declaration
+ Class absolute Declaration
\*---------------------------------------------------------------------------*/
class absolute
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/noCorrectionLimiting/noCorrectionLimiting.H b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/noCorrectionLimiting/noCorrectionLimiting.H
index b1656e20435..f601491cea9 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/noCorrectionLimiting/noCorrectionLimiting.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/noCorrectionLimiting/noCorrectionLimiting.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ namespace CorrectionLimitingMethods
{
/*---------------------------------------------------------------------------*\
- Class noCorrectionLimiting Declaration
+ Class noCorrectionLimiting Declaration
\*---------------------------------------------------------------------------*/
class noCorrectionLimiting
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.H b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.H
index 0d84e4eb395..e7d9f2233fa 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,7 +50,7 @@ namespace CorrectionLimitingMethods
{
/*---------------------------------------------------------------------------*\
- Class relative Declaration
+ Class relative Declaration
\*---------------------------------------------------------------------------*/
class relative
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
index 08f20f1256a..103b748dc98 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,7 +51,7 @@ namespace Foam
class TimeScaleModel;
/*---------------------------------------------------------------------------*\
- Class IsotropyModel Declaration
+ Class IsotropyModel Declaration
\*---------------------------------------------------------------------------*/
template<class CloudType>
@@ -129,27 +129,27 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeIsotropyModel(CloudType) \
+#define makeIsotropyModel(CloudType) \
\
typedef CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- IsotropyModel<MPPICCloudType>, \
+ IsotropyModel<MPPICCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
- IsotropyModel<MPPICCloudType>, \
+ IsotropyModel<MPPICCloudType>, \
dictionary \
);
-#define makeIsotropyModelType(SS, CloudType) \
+#define makeIsotropyModelType(SS, CloudType) \
\
typedef CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<MPPICCloudType>, 0); \
\
- IsotropyModel<MPPICCloudType>:: \
+ IsotropyModel<MPPICCloudType>:: \
adddictionaryConstructorToTable<SS<MPPICCloudType> > \
add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
index c3064d73f24..ae8bb681359 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,7 +50,7 @@ namespace PackingModels
{
/*---------------------------------------------------------------------------*\
- Class Implicit Declaration
+ Class Implicit Declaration
\*---------------------------------------------------------------------------*/
template<class CloudType>
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
index 3338f3a94b6..d5f5ebb6cee 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -45,7 +45,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class ParticleStressModel Declaration
+ Class ParticleStressModel Declaration
\*---------------------------------------------------------------------------*/
class ParticleStressModel
--
GitLab