zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean up whitespaces

Browse Source 
no tabs, no extra whitespaces!
This commit is contained in:
danielque
2019-02-21 14:53:31 +01:00
parent c8eb21bedc
commit c441753ff9
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.H
View File

@ -48,24 +48,24 @@ class SyamlalThermCond
: :
public thermCondModel public thermCondModel
{ {
private: private:
dictionary propsDict_; dictionary propsDict_;
word voidfractionFieldName_; word voidfractionFieldName_;
const volScalarField& voidfraction_; const volScalarField& voidfraction_;
word rhoFieldName_; word rhoFieldName_;
const volScalarField& rho_; const volScalarField& rho_;
word wallQFactorName_; word wallQFactorName_;
// ratio of half-cell-size and near-wall film // ratio of half-cell-size and near-wall film
mutable volScalarField wallQFactor_; mutable volScalarField wallQFactor_;
bool hasWallQFactor_; bool hasWallQFactor_;
public: public:
@ -89,12 +89,11 @@ public:
// Member Functions // Member Functions
tmp<volScalarField> thermCond() const; tmp<volScalarField> thermCond() const;
tmp<volScalarField> thermDiff() const; tmp<volScalarField> thermDiff() const;
}; };

2
src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C
View File

@ -62,7 +62,7 @@ ZehnerSchluenderThermCond::ZehnerSchluenderThermCond
), ),
sm.mesh(), sm.mesh(),
dimensionedScalar("one", dimensionSet(1, 1, -3, -1,0,0,0), 1.0), dimensionedScalar("one", dimensionSet(1, 1, -3, -1,0,0,0), 1.0),
"zeroGradient" "zeroGradient"
), ),
voidfractionFieldName_(propsDict_.lookupOrDefault<word>("voidfractionFieldName","voidfraction")), voidfractionFieldName_(propsDict_.lookupOrDefault<word>("voidfractionFieldName","voidfraction")),
voidfraction_(sm.mesh().lookupObject<volScalarField> (voidfractionFieldName_)), voidfraction_(sm.mesh().lookupObject<volScalarField> (voidfractionFieldName_)),

27
src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.H
View File

@ -49,26 +49,26 @@ class ZehnerSchluenderThermCond
: :
public thermCondModel public thermCondModel
{ {
private: private:
dictionary propsDict_; dictionary propsDict_;
mutable volScalarField partKsField_; mutable volScalarField partKsField_;
word voidfractionFieldName_; word voidfractionFieldName_;
const volScalarField& voidfraction_; const volScalarField& voidfraction_;
scalarList typeKs_; scalarList typeKs_;
mutable double **partKs_; mutable double **partKs_;
word wallQFactorName_; word wallQFactorName_;
// ratio of half-cell-size and near-wall film // ratio of half-cell-size and near-wall film
mutable volScalarField wallQFactor_; mutable volScalarField wallQFactor_;
bool hasWallQFactor_; bool hasWallQFactor_;
void allocateMyArrays() const; void allocateMyArrays() const;
@ -96,12 +96,11 @@ public:
// Member Functions // Member Functions
tmp<volScalarField> thermCond() const; tmp<volScalarField> thermCond() const;
tmp<volScalarField> thermDiff() const; tmp<volScalarField> thermDiff() const;
}; };

1
src/lagrangian/cfdemParticle/subModels/thermCondModel/noTherm/noThermCond.C
View File

@ -22,6 +22,7 @@ License
#include "noThermCond.H" #include "noThermCond.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam

25
src/lagrangian/cfdemParticle/subModels/thermCondModel/thermCondModel/thermCondModel.H
View File

@ -33,6 +33,7 @@ SourceFiles
#include "fvCFD.H" #include "fvCFD.H"
#include "cfdemCloud.H" #include "cfdemCloud.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
@ -51,13 +52,13 @@ protected:
const dictionary& dict_; const dictionary& dict_;
cfdemCloud& particleCloud_; cfdemCloud& particleCloud_;
IOdictionary transportProperties_; IOdictionary transportProperties_;
dimensionedScalar kf0_; dimensionedScalar kf0_;
dimensionedScalar Cp_; dimensionedScalar Cp_;
public: public:
@ -104,11 +105,11 @@ public:
// Member Functions // Member Functions
virtual tmp<volScalarField> thermCond() const = 0; virtual tmp<volScalarField> thermCond() const = 0;
virtual tmp<volScalarField> thermDiff() const = 0; virtual tmp<volScalarField> thermDiff() const = 0;
}; };