STY: Headers and code style

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

View File

@ -497,7 +497,7 @@ void Foam::ReactingParcel<ParcelType>::calc
0, 0,
1.0, 1.0,
Y_, Y_,
scalarField(0), scalarField(),
dMassPC, dMassPC,
Sh, Sh,
Ne, Ne,

View File

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

View File

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

View File

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

View File

@ -471,7 +471,7 @@ Foam::scalar Foam::liquidMixtureProperties::kappa
phii /= (pSum + ROOTVSMALL); phii /= (pSum + ROOTVSMALL);
scalar K = 0.0; scalar K = 0;
forAll(properties_, i) forAll(properties_, i)
{ {
@ -514,7 +514,7 @@ Foam::scalar Foam::liquidMixtureProperties::D
} }
} }
return 1.0/(Dinv + ROOTVSMALL); return 1/(Dinv + ROOTVSMALL);
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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