diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index 9d6d91d37522b48c7b0be9e6416aef47fbe9a732..d25391cb54c00e7ffcc92139dd2d5b52be98c704 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -228,13 +228,6 @@ Foam::functionObjects::pressure::pressure
rhoInfInitialised_(false)
{
read(dict);
-
- dimensionSet pDims(dimPressure);
-
- if (calcCoeff_)
- {
- pDims /= dimPressure;
- }
}
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index 0019687c560ac2379313a9c75a11c1a9e66c54f9..be0c99a2b28a70a7dd2fa08aecae9c1ac24ba10a 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -183,48 +183,39 @@ bool Foam::functionObjects::wallShearStress::execute()
volVectorField& wallShearStress =
mesh_.lookupObjectRef<volVectorField>(type());
- bool ok = false;
-
- // compressible
- if (!ok)
+ // Compressible
{
typedef compressible::turbulenceModel turbType;
const turbType* modelPtr =
findObject<turbType>(turbulenceModel::propertiesName);
- ok = modelPtr;
-
- if (ok)
+ if (modelPtr)
{
calcShearStress(modelPtr->devRhoReff(), wallShearStress);
+ return true;
}
}
- // incompressible
- if (!ok)
+ // Incompressible
{
typedef incompressible::turbulenceModel turbType;
const turbType* modelPtr =
findObject<turbType>(turbulenceModel::propertiesName);
- ok = modelPtr;
-
- if (ok)
+ if (modelPtr)
{
calcShearStress(modelPtr->devReff(), wallShearStress);
+ return true;
}
}
- if (!ok)
- {
- FatalErrorInFunction
- << "Unable to find turbulence model in the "
- << "database" << exit(FatalError);
- }
+ FatalErrorInFunction
+ << "Unable to find turbulence model in the "
+ << "database" << exit(FatalError);
- return ok;
+ return false;
}
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index 6f4d85cf1f7d5d0f5c505a853ddfa21d318d31ee..fd37963f475f02bb54a21a3bab625aa3c6035483 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -308,12 +308,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
actualTypeName_(ptf.actualTypeName_),
dict_(ptf.dict_)
{
- forAllConstIter
- (
- HashPtrTable<scalarField>,
- ptf.scalarFields_,
- iter
- )
+ forAllConstIters(ptf.scalarFields_, iter)
{
scalarFields_.insert
(
@@ -322,12 +317,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
);
}
- forAllConstIter
- (
- HashPtrTable<vectorField>,
- ptf.vectorFields_,
- iter
- )
+ forAllConstIters(ptf.vectorFields_, iter)
{
vectorFields_.insert
(
@@ -336,12 +326,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
);
}
- forAllConstIter
- (
- HashPtrTable<sphericalTensorField>,
- ptf.sphericalTensorFields_,
- iter
- )
+ forAllConstIters(ptf.sphericalTensorFields_, iter)
{
sphericalTensorFields_.insert
(
@@ -350,12 +335,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
);
}
- forAllConstIter
- (
- HashPtrTable<symmTensorField>,
- ptf.symmTensorFields_,
- iter
- )
+ forAllConstIters(ptf.symmTensorFields_, iter)
{
symmTensorFields_.insert
(
@@ -364,12 +344,7 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
);
}
- forAllConstIter
- (
- HashPtrTable<tensorField>,
- ptf.tensorFields_,
- iter
- )
+ forAllConstIters(ptf.tensorFields_, iter)
{
tensorFields_.insert
(
@@ -406,52 +381,27 @@ void Foam::genericPointPatchField<Type>::autoMap
const pointPatchFieldMapper& m
)
{
- forAllIter
- (
- HashPtrTable<scalarField>,
- scalarFields_,
- iter
- )
+ forAllIters(scalarFields_, iter)
{
iter()->autoMap(m);
}
- forAllIter
- (
- HashPtrTable<vectorField>,
- vectorFields_,
- iter
- )
+ forAllIters(vectorFields_, iter)
{
iter()->autoMap(m);
}
- forAllIter
- (
- HashPtrTable<sphericalTensorField>,
- sphericalTensorFields_,
- iter
- )
+ forAllIters(sphericalTensorFields_, iter)
{
iter()->autoMap(m);
}
- forAllIter
- (
- HashPtrTable<symmTensorField>,
- symmTensorFields_,
- iter
- )
+ forAllIters(symmTensorFields_, iter)
{
iter()->autoMap(m);
}
- forAllIter
- (
- HashPtrTable<tensorField>,
- tensorFields_,
- iter
- )
+ forAllIters(tensorFields_, iter)
{
iter()->autoMap(m);
}
@@ -468,76 +418,51 @@ void Foam::genericPointPatchField<Type>::rmap
const genericPointPatchField<Type>& dptf =
refCast<const genericPointPatchField<Type>>(ptf);
- forAllIter
- (
- HashPtrTable<scalarField>,
- scalarFields_,
- iter
- )
+ forAllIters(scalarFields_, iter)
{
HashPtrTable<scalarField>::const_iterator dptfIter =
dptf.scalarFields_.find(iter.key());
- if (dptfIter != scalarFields_.end())
+ if (dptfIter.found())
{
iter()->rmap(*dptfIter(), addr);
}
}
- forAllIter
- (
- HashPtrTable<vectorField>,
- vectorFields_,
- iter
- )
+ forAllIters(vectorFields_, iter)
{
HashPtrTable<vectorField>::const_iterator dptfIter =
dptf.vectorFields_.find(iter.key());
- if (dptfIter != vectorFields_.end())
+ if (dptfIter.found())
{
iter()->rmap(*dptfIter(), addr);
}
}
- forAllIter
- (
- HashPtrTable<sphericalTensorField>,
- sphericalTensorFields_,
- iter
- )
+ forAllIters(sphericalTensorFields_, iter)
{
HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
dptf.sphericalTensorFields_.find(iter.key());
- if (dptfIter != sphericalTensorFields_.end())
+ if (dptfIter.found())
{
iter()->rmap(*dptfIter(), addr);
}
}
- forAllIter
- (
- HashPtrTable<symmTensorField>,
- symmTensorFields_,
- iter
- )
+ forAllIters(symmTensorFields_, iter)
{
HashPtrTable<symmTensorField>::const_iterator dptfIter =
dptf.symmTensorFields_.find(iter.key());
- if (dptfIter != symmTensorFields_.end())
+ if (dptfIter.found())
{
iter()->rmap(*dptfIter(), addr);
}
}
- forAllIter
- (
- HashPtrTable<tensorField>,
- tensorFields_,
- iter
- )
+ forAllIters(tensorFields_, iter)
{
HashPtrTable<tensorField>::const_iterator dptfIter =
dptf.tensorFields_.find(iter.key());
@@ -578,28 +503,23 @@ void Foam::genericPointPatchField<Type>::write(Ostream& os) const
{
if (scalarFields_.found(key))
{
- scalarFields_.find(key)()
- ->writeEntry(key, os);
+ scalarFields_.find(key)()->writeEntry(key, os);
}
else if (vectorFields_.found(key))
{
- vectorFields_.find(key)()
- ->writeEntry(key, os);
+ vectorFields_.find(key)()->writeEntry(key, os);
}
else if (sphericalTensorFields_.found(key))
{
- sphericalTensorFields_.find(key)()
- ->writeEntry(key, os);
+ sphericalTensorFields_.find(key)()->writeEntry(key, os);
}
else if (symmTensorFields_.found(key))
{
- symmTensorFields_.find(key)()
- ->writeEntry(key, os);
+ symmTensorFields_.find(key)()->writeEntry(key, os);
}
else if (tensorFields_.found(key))
{
- tensorFields_.find(key)()
- ->writeEntry(key, os);
+ tensorFields_.find(key)()->writeEntry(key, os);
}
}
else
diff --git a/src/lagrangian/distributionModels/general/general.C b/src/lagrangian/distributionModels/general/general.C
index 9f96ff7b808426d8c9d78059e2e3cfba0944dd57..75a83bdc1e375ca90c78c57091bdf2fb6438131e 100644
--- a/src/lagrangian/distributionModels/general/general.C
+++ b/src/lagrangian/distributionModels/general/general.C
@@ -151,6 +151,7 @@ Foam::distributionModels::general::general(const general& p)
:
distributionModel(p),
xy_(p.xy_),
+ meanValue_(p.meanValue_),
integral_(p.integral_)
{}
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 166150a988495e66c0c2e42808d6a20cd5ec8984..104c76e9195c325fa17e4c9464c6dff610cf8876 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -626,6 +626,7 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
nSector_(pc.nSector_),
radius_(pc.radius_),
coordSys_(pc.coordSys_),
+ area_(pc.area_),
normal_(pc.normal_),
negateParcelsOppositeNormal_(pc.negateParcelsOppositeNormal_),
surfaceFormat_(pc.surfaceFormat_),
diff --git a/src/randomProcesses/windowModels/windowModel/windowModelNew.C b/src/randomProcesses/windowModels/windowModel/windowModelNew.C
index 18a9ce5001584baeb1434658a5867520a7157cdb..de0ceeb32aa25f31cff73361a65131309b415150 100644
--- a/src/randomProcesses/windowModels/windowModel/windowModelNew.C
+++ b/src/randomProcesses/windowModels/windowModel/windowModelNew.C
@@ -1,4 +1,4 @@
-#/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |