zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STY: Headers and code style

Browse Source
This commit is contained in:
sergio
2020-09-04 10:15:27 -07:00
committed by Andrew Heather
parent 11d17fec5f
commit 274bb0740e
31 changed files with 71 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
);
// Limit phase change mass by availability of each specie
forAll (Y, i)
forAll(Y, i)
{
// evaporation
if (dMassPC[i] > 0)
@ -497,7 +497,7 @@ void Foam::ReactingParcel<ParcelType>::calc
0,
1.0,
Y_,
scalarField(0),
scalarField(),
dMassPC,
Sh,
Ne,

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

@ -99,7 +99,8 @@ public:
private:
// Private data
// Private Data
//- Minimum pressure [Pa]
demandDrivenEntry<scalar> pMin_;

12
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
View File

@ -556,7 +556,7 @@ Foam::scalar Foam::CompositionModel<CloudType>::rho
scalarField Xgas(Ygas.size(), 0);
scalar WInv = 0;
forAll (Ygas, i)
forAll(Ygas, i)
{
label cid = phaseProps_[idGas()].carrierIds()[i];
Xgas[i] = YMix[idGas()]*Ygas[i]/carrier.W(cid);
@ -564,14 +564,14 @@ Foam::scalar Foam::CompositionModel<CloudType>::rho
}
scalarField Xliq(Yliq.size(), 0);
forAll (Yliq, i)
forAll(Yliq, i)
{
Xliq[i] = YMix[idLiquid()]*Yliq[i]/thermo.liquids().properties()[i].W();
WInv += Xliq[i];
}
scalarField Xsol(Ysol.size(), 0);
forAll (Ysol, i)
forAll(Ysol, i)
{
Xsol[i] = YMix[idSolid()]*Ysol[i]/thermo.solids().properties()[i].W();
WInv += Xsol[i];
@ -583,16 +583,16 @@ Foam::scalar Foam::CompositionModel<CloudType>::rho
scalar rho = 0;
forAll (Xgas, i)
forAll(Xgas, i)
{
label cid = phaseProps_[idGas()].carrierIds()[i];
rho += Xgas[i]*carrier.rho(cid, p, T);
}
forAll (Xliq, i)
forAll(Xliq, i)
{
rho += Xliq[i]*thermo.liquids().properties()[i].rho(p, T);
}
forAll (Xsol, i)
forAll(Xsol, i)
{
rho += Xsol[i]*thermo.solids().properties()[i].rho();
}

17
src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvapFuchsKnudsen/LiquidEvapFuchsKnudsen.C
View File

@ -128,7 +128,7 @@ Foam::LiquidEvapFuchsKnudsen<CloudType>::LiquidEvapFuchsKnudsen
{
FatalErrorInFunction
<< "Solution is not well defined. It should be (liquid solid)"
<< nl << endl;
<< nl << exit(FatalError);
}
else
{
@ -149,16 +149,16 @@ Foam::LiquidEvapFuchsKnudsen<CloudType>::LiquidEvapFuchsKnudsen
solToSolMap_ =
owner.composition().localId(idSolid, solution_[1]);
const word activityCoefficientype
const word activityCoefficienType
(
this->coeffDict().getWord("activityCoefficient")
);
if (activityCoefficientype == "Hoff")
if (activityCoefficienType == "Hoff")
{
method_ = pHoff;
}
else if (activityCoefficientype == "UNIFAC")
else if (activityCoefficienType == "UNIFAC")
{
method_ = pUNIFAC;
}
@ -190,13 +190,6 @@ Foam::LiquidEvapFuchsKnudsen<CloudType>::LiquidEvapFuchsKnudsen
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class CloudType>
Foam::LiquidEvapFuchsKnudsen<CloudType>::~LiquidEvapFuchsKnudsen()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class CloudType>
@ -229,7 +222,7 @@ void Foam::LiquidEvapFuchsKnudsen<CloudType>::calculate
const scalar YeInf = this->owner().thermo().carrier().Y()[gid][celli];
scalar sigma = liquids_.properties()[lid].sigma(pc, Ts);
const scalar sigma = liquids_.properties()[lid].sigma(pc, Ts);
// Kelvin effect
const scalar Ke = exp(4*sigma*W/(RR*rho*d*T));

2
src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvapFuchsKnudsen/LiquidEvapFuchsKnudsen.H
View File

@ -155,7 +155,7 @@ public:
//- Destructor
virtual ~LiquidEvapFuchsKnudsen();
virtual ~LiquidEvapFuchsKnudsen() = default;
// Member Functions

6
src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
View File

@ -111,7 +111,7 @@ Foam::scalar Foam::liquidMixtureProperties::Tc(const scalarField& X) const
vTc += x1*properties_[i].Tc();
}
return vTc/ (vc + ROOTVSMALL);
return vTc/(vc + ROOTVSMALL);
}
@ -471,7 +471,7 @@ Foam::scalar Foam::liquidMixtureProperties::kappa
phii /= (pSum + ROOTVSMALL);
scalar K = 0.0;
scalar K = 0;
forAll(properties_, i)
{
@ -514,7 +514,7 @@ Foam::scalar Foam::liquidMixtureProperties::D
}
}
return 1.0/(Dinv + ROOTVSMALL);
return 1/(Dinv + ROOTVSMALL);
}

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

6
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -29,7 +29,7 @@ boundaryField
{
type inletOutlet;
inletValue uniform 0.19;
value uniform 0.2;
value uniform 0.19;
}
inlet
{

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: plus.master.develop |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

2
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/Allrun
View File

@ -9,7 +9,7 @@ runApplication blockMesh
runApplication potentialFoam
# Remove incompatible (volumetric) flux field
\rm -f 0/phi 2>/dev/null
rm -f 0/phi 2>/dev/null
runApplication $(getApplication)

6
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -22,7 +22,5 @@ chemistryType
chemistry off;
initialChemicalTimeStep 1e-07; // NOT USED
// ************************************************************************* //

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

6
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "system";
location "system";
object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -27,7 +27,7 @@ endTime 15;
deltaT 8.13e-3;
writeControl adjustableRunTime;
writeControl adjustable;
writeInterval 0.5;
@ -51,9 +51,5 @@ maxCo 1.0;
maxDeltaT 1;
functions
{
}
// ************************************************************************* //

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1806 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / O peration | Version: v2006 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile