songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STYLE: line breaks and spelling

Browse Source
This commit is contained in:
Mark Olesen 2020-11-11 10:02:11 +01:00
parent 30ea7d6134
commit ef2ea9629c
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.C
View File

@ -218,7 +218,7 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::calc
if if
( (
cloud.constProps().volUpdateType() cloud.constProps().volUpdateType()
== constantProperties::volumeUpadteType::mUndefined == constantProperties::volumeUpdateType::mUndefined
) )
{ {
if (cloud.constProps().constantVolume()) if (cloud.constProps().constantVolume())
@ -234,17 +234,17 @@ void Foam::ReactingHeterogeneousParcel<ParcelType>::calc
{ {
switch (cloud.constProps().volUpdateType()) switch (cloud.constProps().volUpdateType())
{ {
case constantProperties::volumeUpadteType::mConstRho : case constantProperties::volumeUpdateType::mConstRho :
{ {
this->d_ = cbrt(mass1/this->rho_*6/pi); this->d_ = cbrt(mass1/this->rho_*6/pi);
break; break;
} }
case constantProperties::volumeUpadteType::mConstVol : case constantProperties::volumeUpdateType::mConstVol :
{ {
this->rho_ = mass1/this->volume(); this->rho_ = mass1/this->volume();
break; break;
} }
case constantProperties::volumeUpadteType::mUpdateRhoAndVol : case constantProperties::volumeUpdateType::mUpdateRhoAndVol :
{ {
scalar deltaVol = scalar deltaVol =
updatedDeltaVolume updatedDeltaVolume

8
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
View File

@ -431,7 +431,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
if if
( (
cloud.constProps().volUpdateType() cloud.constProps().volUpdateType()
== constantProperties::volumeUpadteType::mUndefined == constantProperties::volumeUpdateType::mUndefined
) )
{ {
if (cloud.constProps().constantVolume()) if (cloud.constProps().constantVolume())
@ -447,17 +447,17 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
{ {
switch (cloud.constProps().volUpdateType()) switch (cloud.constProps().volUpdateType())
{ {
case constantProperties::volumeUpadteType::mConstRho : case constantProperties::volumeUpdateType::mConstRho :
{ {
this->d_ = cbrt(mass1/this->rho_*6/pi); this->d_ = cbrt(mass1/this->rho_*6/pi);
break; break;
} }
case constantProperties::volumeUpadteType::mConstVol : case constantProperties::volumeUpdateType::mConstVol :
{ {
this->rho_ = mass1/this->volume(); this->rho_ = mass1/this->volume();
break; break;
} }
case constantProperties::volumeUpadteType::mUpdateRhoAndVol : case constantProperties::volumeUpdateType::mUpdateRhoAndVol :
{ {
scalar deltaVol = scalar deltaVol =
updatedDeltaVolume updatedDeltaVolume

8
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
View File

@ -517,7 +517,7 @@ void Foam::ReactingParcel<ParcelType>::calc
if if
( (
cloud.constProps().volUpdateType() cloud.constProps().volUpdateType()
== constantProperties::volumeUpadteType::mUndefined == constantProperties::volumeUpdateType::mUndefined
) )
{ {
// Update particle density or diameter // Update particle density or diameter
@ -534,17 +534,17 @@ void Foam::ReactingParcel<ParcelType>::calc
{ {
switch (cloud.constProps().volUpdateType()) switch (cloud.constProps().volUpdateType())
{ {
case constantProperties::volumeUpadteType::mConstRho : case constantProperties::volumeUpdateType::mConstRho :
{ {
this->d_ = cbrt(mass1/this->rho_*6/pi); this->d_ = cbrt(mass1/this->rho_*6/pi);
break; break;
} }
case constantProperties::volumeUpadteType::mConstVol : case constantProperties::volumeUpdateType::mConstVol :
{ {
this->rho_ = mass1/this->volume(); this->rho_ = mass1/this->volume();
break; break;
} }
case constantProperties::volumeUpadteType::mUpdateRhoAndVol : case constantProperties::volumeUpdateType::mUpdateRhoAndVol :
{ {
scalar deltaVol = scalar deltaVol =
updatedDeltaVolume updatedDeltaVolume

3
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
View File

@ -85,11 +85,10 @@ public:
: :
public ParcelType::constantProperties public ParcelType::constantProperties
{ {
public: public:
//- Type of activity coefficient models //- Type of activity coefficient models
enum volumeUpadteType enum volumeUpdateType
{ {
mConstRho, mConstRho,
mConstVol, mConstVol,

7
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
View File

@ -61,7 +61,12 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
ParcelType::constantProperties(parentDict), ParcelType::constantProperties(parentDict),
pMin_(this->dict_, "pMin", 1000.0), pMin_(this->dict_, "pMin", 1000.0),
constantVolume_(this->dict_, "constantVolume", false), constantVolume_(this->dict_, "constantVolume", false),
volUpdateType_(this->dict_, "volumeUpdateMethod", volumeUpadteType::mConstRho) volUpdateType_
(
this->dict_,
"volumeUpdateMethod",
volumeUpdateType::mConstRho
)
{ {
// If constantVolume found use it // If constantVolume found use it
if (this->dict_.found("constantVolume")) if (this->dict_.found("constantVolume"))