From ef2ea9629c78888765ea32181596c16995d64808 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 11 Nov 2020 10:02:11 +0100
Subject: [PATCH] STYLE: line breaks and spelling
---
.../ReactingHeterogeneousParcel.C | 8 ++++----
.../ReactingMultiphaseParcel/ReactingMultiphaseParcel.C | 8 ++++----
.../parcels/Templates/ReactingParcel/ReactingParcel.C | 8 ++++----
.../parcels/Templates/ReactingParcel/ReactingParcel.H | 3 +--
.../parcels/Templates/ReactingParcel/ReactingParcelI.H | 7 ++++++-
5 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.C
index 20886adfb57..4ab5953337d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.C
@@ -218,7 +218,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::calc
if
(
cloud.constProps().volUpdateType()
- == constantProperties::volumeUpadteType::mUndefined
+ == constantProperties::volumeUpdateType::mUndefined
)
{
if (cloud.constProps().constantVolume())
@@ -234,17 +234,17 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::calc
{
switch (cloud.constProps().volUpdateType())
{
- case constantProperties::volumeUpadteType::mConstRho :
+ case constantProperties::volumeUpdateType::mConstRho :
{
this->d_ = cbrt(mass1/this->rho_*6/pi);
break;
}
- case constantProperties::volumeUpadteType::mConstVol :
+ case constantProperties::volumeUpdateType::mConstVol :
{
this->rho_ = mass1/this->volume();
break;
}
- case constantProperties::volumeUpadteType::mUpdateRhoAndVol :
+ case constantProperties::volumeUpdateType::mUpdateRhoAndVol :
{
scalar deltaVol =
updatedDeltaVolume
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 60084c87ef3..8df9c2fe0b2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -431,7 +431,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
if
(
cloud.constProps().volUpdateType()
- == constantProperties::volumeUpadteType::mUndefined
+ == constantProperties::volumeUpdateType::mUndefined
)
{
if (cloud.constProps().constantVolume())
@@ -447,17 +447,17 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
{
switch (cloud.constProps().volUpdateType())
{
- case constantProperties::volumeUpadteType::mConstRho :
+ case constantProperties::volumeUpdateType::mConstRho :
{
this->d_ = cbrt(mass1/this->rho_*6/pi);
break;
}
- case constantProperties::volumeUpadteType::mConstVol :
+ case constantProperties::volumeUpdateType::mConstVol :
{
this->rho_ = mass1/this->volume();
break;
}
- case constantProperties::volumeUpadteType::mUpdateRhoAndVol :
+ case constantProperties::volumeUpdateType::mUpdateRhoAndVol :
{
scalar deltaVol =
updatedDeltaVolume
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 23f2c1b41d4..778b60f53ec 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -517,7 +517,7 @@ void Foam::ReactingParcel<ParcelType>::calc
if
(
cloud.constProps().volUpdateType()
- == constantProperties::volumeUpadteType::mUndefined
+ == constantProperties::volumeUpdateType::mUndefined
)
{
// Update particle density or diameter
@@ -534,17 +534,17 @@ void Foam::ReactingParcel<ParcelType>::calc
{
switch (cloud.constProps().volUpdateType())
{
- case constantProperties::volumeUpadteType::mConstRho :
+ case constantProperties::volumeUpdateType::mConstRho :
{
this->d_ = cbrt(mass1/this->rho_*6/pi);
break;
}
- case constantProperties::volumeUpadteType::mConstVol :
+ case constantProperties::volumeUpdateType::mConstVol :
{
this->rho_ = mass1/this->volume();
break;
}
- case constantProperties::volumeUpadteType::mUpdateRhoAndVol :
+ case constantProperties::volumeUpdateType::mUpdateRhoAndVol :
{
scalar deltaVol =
updatedDeltaVolume
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index f6d53e4b180..4491c506cc0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -85,11 +85,10 @@ public:
:
public ParcelType::constantProperties
{
-
public:
//- Type of activity coefficient models
- enum volumeUpadteType
+ enum volumeUpdateType
{
mConstRho,
mConstVol,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index f625bc50d31..a3b6e46c772 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -61,7 +61,12 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
ParcelType::constantProperties(parentDict),
pMin_(this->dict_, "pMin", 1000.0),
constantVolume_(this->dict_, "constantVolume", false),
- volUpdateType_(this->dict_, "volumeUpdateMethod", volumeUpadteType::mConstRho)
+ volUpdateType_
+ (
+ this->dict_,
+ "volumeUpdateMethod",
+ volumeUpdateType::mConstRho
+ )
{
// If constantVolume found use it
if (this->dict_.found("constantVolume"))
--
GitLab