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

ENH: Consistency updates after Foundation merge and code tidying

Browse Source
This commit is contained in:
Andrew Heather
2016-04-25 16:46:56 +01:00
parent d3157ac905
commit b9313ef2fe
242 changed files with 923 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.C
View File

@ -64,9 +64,9 @@ void Foam::fluxSummary::initialiseFaceZone
(
const word& faceZoneName,
DynamicList<word>& faceZoneNames,
DynamicList<List<label> >& faceID,
DynamicList<List<label> >& facePatchID,
DynamicList<List<scalar> >& faceSign
DynamicList<List<label>>& faceID,
DynamicList<List<label>>& facePatchID,
DynamicList<List<scalar>>& faceSign
) const
{
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -155,9 +155,9 @@ void Foam::fluxSummary::initialiseFaceZoneAndDirection
const vector& dir,
DynamicList<vector>& zoneRefDir,
DynamicList<word>& faceZoneNames,
DynamicList<List<label> >& faceID,
DynamicList<List<label> >& facePatchID,
DynamicList<List<scalar> >& faceSign
DynamicList<List<label>>& faceID,
DynamicList<List<label>>& facePatchID,
DynamicList<List<scalar>>& faceSign
) const
{
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -264,9 +264,9 @@ void Foam::fluxSummary::initialiseCellZoneAndDirection
const vector& dir,
DynamicList<vector>& zoneRefDir,
DynamicList<word>& faceZoneNames,
DynamicList<List<label> >& faceID,
DynamicList<List<label> >& facePatchID,
DynamicList<List<scalar> >& faceSign
DynamicList<List<label>>& faceID,
DynamicList<List<label>>& facePatchID,
DynamicList<List<scalar>>& faceSign
) const
{
const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -490,9 +490,9 @@ void Foam::fluxSummary::initialiseCellZoneAndDirection
// collect the data per region
label nRegion = regionI;
List<DynamicList<label> > regionFaceIDs(nRegion);
List<DynamicList<label> > regionFacePatchIDs(nRegion);
List<DynamicList<scalar> > regionFaceSigns(nRegion);
List<DynamicList<label>> regionFaceIDs(nRegion);
List<DynamicList<label>> regionFacePatchIDs(nRegion);
List<DynamicList<scalar>> regionFaceSigns(nRegion);
forAll(allFaceInfo, faceI)
{
@ -641,9 +641,9 @@ void Foam::fluxSummary::read(const dictionary& dict)
// initialise with capacity of 10 faceZones
DynamicList<vector> refDir(10);
DynamicList<word> faceZoneName(refDir.size());
DynamicList<List<label> > faceID(refDir.size());
DynamicList<List<label> > facePatchID(refDir.size());
DynamicList<List<scalar> > faceSign(refDir.size());
DynamicList<List<label>> faceID(refDir.size());
DynamicList<List<label>> facePatchID(refDir.size());
DynamicList<List<scalar>> faceSign(refDir.size());
switch (mode_)
{
@ -666,7 +666,7 @@ void Foam::fluxSummary::read(const dictionary& dict)
}
case mdFaceZoneAndDirection:
{
List<Tuple2<word, vector> >
List<Tuple2<word, vector>>
zoneAndDirection(dict.lookup("faceZoneAndDirection"));
forAll(zoneAndDirection, i)
@ -686,7 +686,7 @@ void Foam::fluxSummary::read(const dictionary& dict)
}
case mdCellZoneAndDirection:
{
List<Tuple2<word, vector> >
List<Tuple2<word, vector>>
zoneAndDirection(dict.lookup("cellZoneAndDirection"));
forAll(zoneAndDirection, i)

24
src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.H
View File

@ -161,13 +161,13 @@ protected:
List<vector> refDir_;
//- Face IDs
List<List<label> > faceID_;
List<List<label>> faceID_;
//- Face patch IDs
List<List<label> > facePatchID_;
List<List<label>> facePatchID_;
//- Face flip map signs
List<List<scalar> > faceSign_;
List<List<scalar>> faceSign_;
//- Sum of face areas
List<scalar> faceArea_;
@ -187,9 +187,9 @@ protected:
(
const word& faceZoneName,
DynamicList<word>& faceZoneNames,
DynamicList<List<label> >& faceID,
DynamicList<List<label> >& facePatchID,
DynamicList<List<scalar> >& faceSign
DynamicList<List<label>>& faceID,
DynamicList<List<label>>& facePatchID,
DynamicList<List<scalar>>& faceSign
) const;
//- Initialise face set from face zone and direction
@ -199,9 +199,9 @@ protected:
const vector& refDir,
DynamicList<vector>& dir,
DynamicList<word>& faceZoneNames,
DynamicList<List<label> >& faceID,
DynamicList<List<label> >& facePatchID,
DynamicList<List<scalar> >& faceSign
DynamicList<List<label>>& faceID,
DynamicList<List<label>>& facePatchID,
DynamicList<List<scalar>>& faceSign
) const;
//- Initialise face set from cell zone and direction
@ -211,9 +211,9 @@ protected:
const vector& refDir,
DynamicList<vector>& dir,
DynamicList<word>& faceZoneNames,
DynamicList<List<label> >& faceID,
DynamicList<List<label> >& facePatchID,
DynamicList<List<scalar> >& faceSign
DynamicList<List<label>>& faceID,
DynamicList<List<label>>& facePatchID,
DynamicList<List<scalar>>& faceSign
) const;
//- Initialise the total area per derived faceZone

118
src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
View File

@ -211,23 +211,14 @@ Foam::scalarTransport::~scalarTransport()
void Foam::scalarTransport::read(const dictionary& dict)
{
<<<<<<< HEAD
if (active_)
{
log_.readIfPresent("log", dict);
log_.readIfPresent("log", dict);
if (log_) Info<< type() << " " << name_ << " output:" << nl;
if (log_) Info<< type() << " " << name_ << " output:" << nl;
dict.readIfPresent("phiName", phiName_);
dict.readIfPresent("UName", UName_);
dict.readIfPresent("rhoName", rhoName_);
=======
Info<< type() << ":" << nl;
dict.readIfPresent("phiName", phiName_);
dict.readIfPresent("UName", UName_);
dict.readIfPresent("rhoName", rhoName_);
phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
UName_ = dict.lookupOrDefault<word>("UName", "U");
rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
>>>>>>> foundation
userDT_ = false;
if (dict.readIfPresent("DT", DT_))
@ -235,17 +226,9 @@ void Foam::scalarTransport::read(const dictionary& dict)
userDT_ = true;
}
<<<<<<< HEAD
dict.readIfPresent("nCorr", nCorr_);
dict.lookup("resetOnStartUp") >> resetOnStartUp_;
dict.lookup("autoSchemes") >> autoSchemes_;
=======
dict.lookup("resetOnStartUp") >> resetOnStartUp_;
dict.readIfPresent("nCorr", nCorr_);
dict.lookup("resetOnStartUp") >> resetOnStartUp_;
dict.lookup("autoSchemes") >> autoSchemes_;
>>>>>>> foundation
fvOptions_.reset(dict.subDict("fvOptions"));
}
@ -253,45 +236,27 @@ void Foam::scalarTransport::read(const dictionary& dict)
void Foam::scalarTransport::execute()
{
<<<<<<< HEAD
if (active_)
{
if (log_) Info<< type() << " " << name_ << " output:" << nl;
=======
Info<< type() << " output:" << endl;
>>>>>>> foundation
if (log_) Info<< type() << " " << name_ << " output:" << nl;
const surfaceScalarField& phi =
mesh_.lookupObject<surfaceScalarField>(phiName_);
<<<<<<< HEAD
volScalarField& T = transportedField();
volScalarField& T = transportedField();
// calculate the diffusivity
volScalarField DT(this->DT(phi));
// set schemes
word schemeVar = T.name();
if (autoSchemes_)
{
schemeVar = UName_;
}
=======
// calculate the diffusivity
// Calculate the diffusivity
volScalarField DT(this->DT(phi));
// set schemes
word schemeVar = T_.name();
// Set schemes
word schemeVar = T.name();
if (autoSchemes_)
{
schemeVar = UName_;
}
>>>>>>> foundation
word divScheme("div(phi," + schemeVar + ")");
word laplacianScheme("laplacian(" + DT.name() + "," + schemeVar + ")");
// set under-relaxation coeff
// Set under-relaxation coeff
scalar relaxCoeff = 0.0;
if (mesh_.relaxEquation(schemeVar))
{
@ -303,31 +268,17 @@ void Foam::scalarTransport::execute()
const volScalarField& rho =
mesh_.lookupObject<volScalarField>(rhoName_);
<<<<<<< HEAD
// solve
for (label i = 0; i <= nCorr_; i++)
{
fvScalarMatrix TEqn
(
fvm::ddt(rho, T)
+ fvm::div(phi, T, divScheme)
- fvm::laplacian(DT, T, laplacianScheme)
==
fvOptions_(rho, T)
);
=======
// solve
// Solve
for (label i = 0; i <= nCorr_; i++)
{
fvScalarMatrix TEqn
(
fvm::ddt(rho, T_)
+ fvm::div(phi, T_, divScheme)
- fvm::laplacian(DT, T_, laplacianScheme)
fvm::ddt(rho, T)
+ fvm::div(phi, T, divScheme)
- fvm::laplacian(DT, T, laplacianScheme)
==
fvOptions_(rho, T_)
fvOptions_(rho, T)
);
>>>>>>> foundation
TEqn.relax(relaxCoeff);
@ -338,31 +289,17 @@ void Foam::scalarTransport::execute()
}
else if (phi.dimensions() == dimVolume/dimTime)
{
// solve
// Solve
for (label i = 0; i <= nCorr_; i++)
{
<<<<<<< HEAD
// solve
for (label i = 0; i <= nCorr_; i++)
{
fvScalarMatrix TEqn
(
fvm::ddt(T)
+ fvm::div(phi, T, divScheme)
- fvm::laplacian(DT, T, laplacianScheme)
==
fvOptions_(T)
);
=======
fvScalarMatrix TEqn
(
fvm::ddt(T_)
+ fvm::div(phi, T_, divScheme)
- fvm::laplacian(DT, T_, laplacianScheme)
fvm::ddt(T)
+ fvm::div(phi, T, divScheme)
- fvm::laplacian(DT, T, laplacianScheme)
==
fvOptions_(T_)
fvOptions_(T)
);
>>>>>>> foundation
TEqn.relax(relaxCoeff);
@ -370,11 +307,6 @@ void Foam::scalarTransport::execute()
TEqn.solve(mesh_.solverDict(schemeVar));
}
<<<<<<< HEAD
if (log_) Info<< endl;
=======
>>>>>>> foundation
}
else
{
@ -384,17 +316,13 @@ void Foam::scalarTransport::execute()
<< dimVolume/dimTime << endl;
}
Info<< endl;
if (log_) Info<< endl;
}
void Foam::scalarTransport::end()
{
<<<<<<< HEAD
// Do nothing
=======
execute();
>>>>>>> foundation
}

3
src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
View File

@ -120,6 +120,9 @@ class scalarTransport
//- Reference to the mesh database
const fvMesh& mesh_;
//- On/off switch
bool active_;
//- Name of flux field (optional)
word phiName_;