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

2
src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
View File

@ -204,7 +204,7 @@ void Foam::fieldAverage::readAveragingProperties()
totalTime_.clear();
totalTime_.setSize(faItems_.size(), obr_.time().deltaTValue());
if (log_ && (resetOnRestart_ || resetOnOutput_))
if (log_ && (restartOnRestart_ || restartOnOutput_))
{
Info<< " Starting averaging at time " << obr_.time().timeName()
<< nl;

20
src/postProcessing/functionObjects/field/streamLine/streamLineBase.C
View File

@ -99,9 +99,9 @@ void Foam::streamLineBase::initInterpolations
const label nSeeds,
label& UIndex,
PtrList<volScalarField>& vsFlds,
PtrList<interpolation<scalar> >& vsInterp,
PtrList<interpolation<scalar>>& vsInterp,
PtrList<volVectorField>& vvFlds,
PtrList<interpolation<vector> >& vvInterp
PtrList<interpolation<vector>>& vvInterp
)
{
const Time& runTime = obr_.time();
@ -316,9 +316,9 @@ void Foam::streamLineBase::trimToBox
(
const treeBoundBox& bb,
const label trackI,
PtrList<DynamicList<point> >& newTracks,
PtrList<DynamicList<scalarList> >& newScalars,
PtrList<DynamicList<vectorList> >& newVectors
PtrList<DynamicList<point>>& newTracks,
PtrList<DynamicList<scalarList>>& newScalars,
PtrList<DynamicList<vectorList>>& newVectors
) const
{
const List<point>& track = allTracks_[trackI];
@ -471,9 +471,9 @@ void Foam::streamLineBase::trimToBox(const treeBoundBox& bb)
{
// Storage for new tracks. Per track, per sample the coordinate (newTracks)
// or values for all the sampled fields (newScalars, newVectors)
PtrList<DynamicList<point> > newTracks;
PtrList<DynamicList<scalarList> > newScalars;
PtrList<DynamicList<vectorList> > newVectors;
PtrList<DynamicList<point>> newTracks;
PtrList<DynamicList<scalarList>> newScalars;
PtrList<DynamicList<vectorList>> newVectors;
forAll(allTracks_, trackI)
{
@ -854,7 +854,7 @@ void Foam::streamLineBase::write()
if (allScalars_.size() > 0)
{
List<List<scalarField> > scalarValues(allScalars_.size());
List<List<scalarField>> scalarValues(allScalars_.size());
forAll(allScalars_, scalarI)
{
@ -908,7 +908,7 @@ void Foam::streamLineBase::write()
if (allVectors_.size() > 0)
{
List<List<vectorField> > vectorValues(allVectors_.size());
List<List<vectorField>> vectorValues(allVectors_.size());
forAll(allVectors_, vectorI)
{

24
src/postProcessing/functionObjects/field/streamLine/streamLineBase.H
View File

@ -124,22 +124,22 @@ protected:
word sampledSetAxis_;
//- File writer for scalar data
autoPtr<writer<scalar> > scalarFormatterPtr_;
autoPtr<writer<scalar>> scalarFormatterPtr_;
//- File writer for vector data
autoPtr<writer<vector> > vectorFormatterPtr_;
autoPtr<writer<vector>> vectorFormatterPtr_;
// Generated data
//- All tracks. Per track the points it passed through
DynamicList<List<point> > allTracks_;
DynamicList<List<point>> allTracks_;
//- Per scalarField, per track, the sampled values
List<DynamicList<scalarList> > allScalars_;
List<DynamicList<scalarList>> allScalars_;
//- Per vectorField, per track, the sampled values
List<DynamicList<vectorList> > allVectors_;
List<DynamicList<vectorList>> allVectors_;
//- Construct patch out of all wall patch faces
@ -151,9 +151,9 @@ protected:
const label nSeeds,
label& UIndex,
PtrList<volScalarField>& vsFlds,
PtrList<interpolation<scalar> >& vsInterp,
PtrList<interpolation<scalar>>& vsInterp,
PtrList<volVectorField>& vvFlds,
PtrList<interpolation<vector> >& vvInterp
PtrList<interpolation<vector>>& vvInterp
);
//- Generate point and values by interpolating from existing values
@ -166,8 +166,8 @@ protected:
const label rightI,
DynamicList<point>& newTrack,
DynamicList<List<scalar> >& newScalars,
DynamicList<List<vector> >& newVectors
DynamicList<List<scalar>>& newScalars,
DynamicList<List<vector>>& newVectors
) const;
//- Trim and possibly split a track
@ -175,9 +175,9 @@ protected:
(
const treeBoundBox& bb,
const label trackI,
PtrList<DynamicList<point> >& newTracks,
PtrList<DynamicList<scalarList> >& newScalars,
PtrList<DynamicList<vectorList> >& newVectors
PtrList<DynamicList<point>>& newTracks,
PtrList<DynamicList<scalarList>>& newScalars,
PtrList<DynamicList<vectorList>>& newVectors
) const;
//- Trim tracks to bounding box

10
src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
View File

@ -147,7 +147,7 @@ void Foam::forceCoeffs::writeBinHeader
void Foam::forceCoeffs::writeIntegratedData
(
const word& title,
const List<Field<scalar> >& coeff
const List<Field<scalar>>& coeff
) const
{
scalar pressure = sum(coeff[0]);
@ -174,7 +174,7 @@ void Foam::forceCoeffs::writeIntegratedData
void Foam::forceCoeffs::writeBinData
(
const List<Field<scalar> > coeffs,
const List<Field<scalar>> coeffs,
Ostream& os
) const
{
@ -315,9 +315,9 @@ void Foam::forceCoeffs::execute()
scalar pDyn = 0.5*rhoRef_*magUInf_*magUInf_;
// Storage for pressure, viscous and porous contributions to coeffs
List<Field<scalar> > momentCoeffs(3);
List<Field<scalar> > dragCoeffs(3);
List<Field<scalar> > liftCoeffs(3);
List<Field<scalar>> momentCoeffs(3);
List<Field<scalar>> dragCoeffs(3);
List<Field<scalar>> liftCoeffs(3);
forAll(liftCoeffs, i)
{
momentCoeffs[i].setSize(nBin_);

4
src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
View File

@ -194,11 +194,11 @@ protected:
void writeIntegratedData
(
const word& title,
const List<Field<scalar> >& coeff
const List<Field<scalar>>& coeff
) const;
//- Write binned data
void writeBinData(const List<Field<scalar> > coeffs, Ostream& os) const;
void writeBinData(const List<Field<scalar>> coeffs, Ostream& os) const;
public:

4
src/postProcessing/functionObjects/forces/forces/forces.C
View File

@ -667,7 +667,7 @@ void Foam::forces::writeForces()
void Foam::forces::writeBinnedForceMoment
(
const List<Field<vector> >& fm,
const List<Field<vector>>& fm,
autoPtr<OFstream>& osPtr
) const
{
@ -676,7 +676,7 @@ void Foam::forces::writeBinnedForceMoment
return;
}
List<Field<vector> > f(fm);
List<Field<vector>> f(fm);
if (binCumulative_)
{

2
src/postProcessing/functionObjects/forces/forces/forces.H
View File

@ -351,7 +351,7 @@ protected:
//- Helper function to write binned forces and moments
void writeBinnedForceMoment
(
const List<Field<vector> >& fm,
const List<Field<vector>>& fm,
autoPtr<OFstream>& osPtr
) const;

2
src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometryBase.H
View File

@ -99,7 +99,7 @@ protected:
renderModeType renderMode_;
//- Opacity
autoPtr<DataEntry<scalar> > opacity_;
autoPtr<DataEntry<scalar>> opacity_;
//- Reference to the colours
const HashPtrTable<DataEntry<vector>, word>& colours_;

2
src/postProcessing/functionObjects/graphics/runTimePostProcessing/pathline.H
View File

@ -92,7 +92,7 @@ protected:
scalar tubeRadius_;
//- Line colour
autoPtr<DataEntry<vector> > lineColour_;
autoPtr<DataEntry<vector>> lineColour_;
// Protected Member Functions

2
src/postProcessing/functionObjects/graphics/runTimePostProcessing/pointData.H
View File

@ -90,7 +90,7 @@ protected:
scalar maxGlyphLength_;
//- Point colour
autoPtr<DataEntry<vector> > pointColour_;
autoPtr<DataEntry<vector>> pointColour_;
// Protected Member Functions

10
src/postProcessing/functionObjects/graphics/runTimePostProcessing/scene.H
View File

@ -108,19 +108,19 @@ protected:
modeType mode_;
//- Position
autoPtr<DataEntry<point> > cameraPosition_;
autoPtr<DataEntry<point>> cameraPosition_;
//- Focal point
autoPtr<DataEntry<point> > cameraFocalPoint_;
autoPtr<DataEntry<point>> cameraFocalPoint_;
//- Up direction
autoPtr<DataEntry<vector> > cameraUp_;
autoPtr<DataEntry<vector>> cameraUp_;
//- Zoom level
autoPtr<DataEntry<scalar> > cameraZoom_;
autoPtr<DataEntry<scalar>> cameraZoom_;
//- View angle
autoPtr<DataEntry<scalar> > cameraViewAngle_;
autoPtr<DataEntry<scalar>> cameraViewAngle_;
// Scene management

4
src/postProcessing/functionObjects/graphics/runTimePostProcessing/surface.H
View File

@ -95,10 +95,10 @@ protected:
bool featureEdges_;
//- Surface colour
autoPtr<DataEntry<vector> > surfaceColour_;
autoPtr<DataEntry<vector>> surfaceColour_;
//- Edge colour
autoPtr<DataEntry<vector> > edgeColour_;
autoPtr<DataEntry<vector>> edgeColour_;
//- Surface actor
vtkSmartPointer<vtkActor> surfaceActor_;

2
src/postProcessing/functionObjects/graphics/runTimePostProcessing/text.H
View File

@ -77,7 +77,7 @@ protected:
scalar size_;
//- Colour
autoPtr<DataEntry<vector> > colour_;
autoPtr<DataEntry<vector>> colour_;
//- Bold flag
bool bold_;

2
src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.H
View File

@ -275,7 +275,7 @@ class externalCoupledFunctionObject
//- Helper: append data from all processors onto master
template<class Type>
static tmp<Field<Type> > gatherAndCombine(const Field<Type>& fld);
static tmp<Field<Type>> gatherAndCombine(const Field<Type>& fld);
static void checkOrder(const wordList&);

24
src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObjectTemplates.C
View File

@ -143,7 +143,7 @@ bool Foam::externalCoupledFunctionObject::readData
// additional processing by derived type.
pf.patchFieldType::evaluate();
}
else if (isA<mixedFvPatchField<Type> >(bf[patchI]))
else if (isA<mixedFvPatchField<Type>>(bf[patchI]))
{
// Read columns from file for
// value, snGrad, refValue, refGrad, valueFraction
@ -159,7 +159,7 @@ bool Foam::externalCoupledFunctionObject::readData
mixedFvPatchField<Type>& pf =
const_cast<mixedFvPatchField<Type>&>
(
refCast<const mixedFvPatchField<Type> >
refCast<const mixedFvPatchField<Type>>
(
bf[patchI]
)
@ -195,7 +195,7 @@ bool Foam::externalCoupledFunctionObject::readData
// additional processing by derived type.
pf.mixedFvPatchField<Type>::evaluate();
}
else if (isA<fixedGradientFvPatchField<Type> >(bf[patchI]))
else if (isA<fixedGradientFvPatchField<Type>>(bf[patchI]))
{
// Read columns for value and gradient
List<scalarField> data;
@ -210,7 +210,7 @@ bool Foam::externalCoupledFunctionObject::readData
fixedGradientFvPatchField<Type>& pf =
const_cast<fixedGradientFvPatchField<Type>&>
(
refCast<const fixedGradientFvPatchField<Type> >
refCast<const fixedGradientFvPatchField<Type>>
(
bf[patchI]
)
@ -236,7 +236,7 @@ bool Foam::externalCoupledFunctionObject::readData
// additional processing by derived type.
pf.fixedGradientFvPatchField<Type>::evaluate();
}
else if (isA<fixedValueFvPatchField<Type> >(bf[patchI]))
else if (isA<fixedValueFvPatchField<Type>>(bf[patchI]))
{
// Read columns for value only
List<scalarField> data;
@ -263,7 +263,7 @@ bool Foam::externalCoupledFunctionObject::readData
fixedValueFvPatchField<Type>& pf =
const_cast<fixedValueFvPatchField<Type>&>
(
refCast<const fixedValueFvPatchField<Type> >
refCast<const fixedValueFvPatchField<Type>>
(
bf[patchI]
)
@ -293,20 +293,20 @@ bool Foam::externalCoupledFunctionObject::readData
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::externalCoupledFunctionObject::gatherAndCombine
(
const Field<Type>& fld
)
{
// Collect values from all processors
List<Field<Type> > gatheredValues(Pstream::nProcs());
List<Field<Type>> gatheredValues(Pstream::nProcs());
gatheredValues[Pstream::myProcNo()] = fld;
Pstream::gatherList(gatheredValues);
tmp<Field<Type> > tresult(new Field<Type>(0));
Field<Type>& result = tresult();
tmp<Field<Type>> tresult(new Field<Type>(0));
Field<Type>& result = tresult.ref();
if (Pstream::master())
{
@ -456,10 +456,10 @@ bool Foam::externalCoupledFunctionObject::writeData
toMaster << os.str();
}
}
else if (isA<mixedFvPatchField<Type> >(bf[patchI]))
else if (isA<mixedFvPatchField<Type>>(bf[patchI]))
{
const mixedFvPatchField<Type>& pf =
refCast<const mixedFvPatchField<Type> >(bf[patchI]);
refCast<const mixedFvPatchField<Type>>(bf[patchI]);
Field<Type> value(gatherAndCombine(pf));
Field<Type> snGrad(gatherAndCombine(pf.snGrad()()));

4
src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C
View File

@ -39,8 +39,8 @@ externalCoupledMixedFvPatchField
:
mixedFvPatchField<Type>(p, iF)
{
this->refValue() = pTraits<Type>::zero;
this->refGrad() = pTraits<Type>::zero;
this->refValue() = Type(Zero);
this->refGrad() = Type(Zero);
this->valueFraction() = 0.0;
}

8
src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.H
View File

@ -112,9 +112,9 @@ public:
);
//- Construct and return a clone
virtual tmp<fvPatchField<Type> > clone() const
virtual tmp<fvPatchField<Type>> clone() const
{
return tmp<fvPatchField<Type> >
return tmp<fvPatchField<Type>>
(
new externalCoupledMixedFvPatchField<Type>(*this)
);
@ -128,12 +128,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual tmp<fvPatchField<Type> > clone
virtual tmp<fvPatchField<Type>> clone
(
const DimensionedField<Type, volMesh>& iF
) const
{
return tmp<fvPatchField<Type> >
return tmp<fvPatchField<Type>>
(
new externalCoupledMixedFvPatchField<Type>(*this, iF)
);

2
src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
View File

@ -104,7 +104,7 @@ externalCoupledTemperatureMixedFvPatchScalarField
// Initialise as a fixed value
this->refValue() = *this;
this->refGrad() = pTraits<scalar>::zero;
this->refGrad() = Zero;
this->valueFraction() = 1.0;
}
}

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_;