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

STYLE: Updated template code

Browse Source
This commit is contained in:
Andrew Heather
2016-06-17 14:11:59 +01:00
parent ad73063ebd
commit 9e84deeb09
12 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H
View File

@ -25,7 +25,7 @@
// Update the pressure BCs to ensure flux consistency
constrainPressure(p_rgh, U, phiHbyA, rAUf);
Pair<tmp<volScalarField> > vDot = mixture->vDot();
Pair<tmp<volScalarField>> vDot = mixture->vDot();
const volScalarField& vDotc = vDot[0]();
const volScalarField& vDotv = vDot[1]();

12
applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C
View File

@ -61,7 +61,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::constant
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::Pair<Foam::tmp<Foam::volScalarField> >
Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const
{
const volScalarField& T = mesh_.lookupObject<volScalarField>("T");
@ -76,7 +76,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const
dimensionedScalar T0("0", dimTemperature, 0.0);
return Pair<tmp<volScalarField> >
return Pair<tmp<volScalarField>>
(
coeffC_*mixture_.rho2()*max(TSat - T, T0),
-coeffE_*mixture_.rho1()*max(T - TSat, T0)
@ -84,7 +84,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const
}
Foam::Pair<Foam::tmp<Foam::volScalarField> >
Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
{
@ -110,7 +110,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
dimensionedScalar T0("0", dimTemperature, 0.0);
return Pair<tmp<volScalarField> >
return Pair<tmp<volScalarField>>
(
coeffC_*mixture_.rho2()*limitedAlpha2*max(TSat - T, T0),
coeffE_*mixture_.rho1()*limitedAlpha1*max(T - TSat, T0)
@ -118,7 +118,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
}
Foam::Pair<Foam::tmp<Foam::volScalarField> >
Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const
{
volScalarField limitedAlpha1
@ -142,7 +142,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const
const dimensionedScalar& TSat = thermo.TSat();
return Pair<tmp<volScalarField> >
return Pair<tmp<volScalarField>>
(
coeffC_*mixture_.rho2()*limitedAlpha2*pos(TSat - T),
coeffE_*mixture_.rho1()*limitedAlpha1*pos(T - TSat)

6
applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H
View File

@ -88,15 +88,15 @@ public:
//- Return the mass condensation and vaporisation rates as a
// coefficient to multiply (1 - alphal) for the condensation rate
// and a coefficient to multiply alphal for the vaporisation rate
virtual Pair<tmp<volScalarField> > mDotAlphal() const;
virtual Pair<tmp<volScalarField>> mDotAlphal() const;
//- Return the mass condensation and vaporisation rates as coefficients
virtual Pair<tmp<volScalarField> > mDot() const;
virtual Pair<tmp<volScalarField>> mDot() const;
//- Return the mass condensation and vaporisation rates as a
// coefficient to multiply (Tsat - T) for the condensation rate
// and a coefficient to multiply (T - Tsat) for the vaporisation rate
virtual Pair<tmp<volScalarField> > mDotDeltaT() const;
virtual Pair<tmp<volScalarField>> mDotDeltaT() const;
//- Correct the constant phaseChange model
virtual void correct();

12
applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C
View File

@ -64,7 +64,7 @@ temperaturePhaseChangeTwoPhaseMixture
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::Pair<Foam::tmp<Foam::volScalarField> >
Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const
{
volScalarField alphalCoeff
@ -73,9 +73,9 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const
*(1.0/mixture_.rho1() - 1.0/mixture_.rho2())
);
Pair<tmp<volScalarField> > mDotAlphal = this->mDotAlphal();
Pair<tmp<volScalarField>> mDotAlphal = this->mDotAlphal();
return Pair<tmp<volScalarField> >
return Pair<tmp<volScalarField>>
(
alphalCoeff*mDotAlphal[0],
alphalCoeff*mDotAlphal[1]
@ -83,13 +83,13 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const
}
Foam::Pair<Foam::tmp<Foam::volScalarField> >
Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixture::vDot() const
{
dimensionedScalar pCoeff(1.0/mixture_.rho1() - 1.0/mixture_.rho2());
Pair<tmp<volScalarField> > mDot = this->mDot();
Pair<tmp<volScalarField>> mDot = this->mDot();
return Pair<tmp<volScalarField> >(pCoeff*mDot[0], pCoeff*mDot[1]);
return Pair<tmp<volScalarField>>(pCoeff*mDot[0], pCoeff*mDot[1]);
}

10
applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H
View File

@ -130,24 +130,24 @@ public:
//- Return the mass condensation and vaporisation rates as a
// coefficient to multiply (1 - alphal) for the condensation rate
// and a coefficient to multiply alphal for the vaporisation rate
virtual Pair<tmp<volScalarField> > mDotAlphal() const = 0;
virtual Pair<tmp<volScalarField>> mDotAlphal() const = 0;
//- Return the mass condensation and vaporisation rates as coefficients
virtual Pair<tmp<volScalarField> > mDot() const = 0;
virtual Pair<tmp<volScalarField>> mDot() const = 0;
//- Return the mass condensation and vaporisation rates as a
// coefficient to multiply (Tsat - T) for the condensation rate
// and a coefficient to multiply (T - Tsat) for the vaporisation rate
virtual Pair<tmp<volScalarField> > mDotDeltaT() const = 0;
virtual Pair<tmp<volScalarField>> mDotDeltaT() const = 0;
//- Return the volumetric condensation and vaporisation rates as a
// coefficient to multiply (1 - alphal) for the condensation rate
// and a coefficient to multiply alphal for the vaporisation rate
Pair<tmp<volScalarField> > vDotAlphal() const;
Pair<tmp<volScalarField>> vDotAlphal() const;
//- Return the volumetric condensation and vaporisation rates as
// coefficients
Pair<tmp<volScalarField> > vDot() const;
Pair<tmp<volScalarField>> vDot() const;
//- Correct the phaseChange model
virtual void correct() = 0;

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
View File

@ -97,7 +97,7 @@ List<Vb::Point> pointFile::initialPoints() const
if (points.empty())
{
FatalErrorIn("List<Vb::Point> pointFile::initialPoints() const")
FatalErrorInFunction
<< "Point file contain no points"
<< exit(FatalError) << endl;
}
@ -128,7 +128,7 @@ List<Vb::Point> pointFile::initialPoints() const
if (points.empty())
{
FatalErrorIn("List<Vb::Point> pointFile::initialPoints() const")
FatalErrorInFunction
<< "Point file contain no points"
<< exit(FatalError) << endl;
}
@ -170,7 +170,7 @@ List<Vb::Point> pointFile::initialPoints() const
}
else
{
FatalErrorIn("List<Vb::Point> pointFile::initialPoints() const")
FatalErrorInFunction
<< "Cannot find points file " << pointsIO.objectPath()
<< exit(FatalError) << endl;
}

2
src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.C
View File

@ -119,7 +119,7 @@ void Foam::unwatchedIOdictionary::addWatch()
if (findIndex(files_, f) != -1)
{
FatalErrorIn("regIOobject::addWatch()")
FatalErrorInFunction
<< "Object " << objectPath() << " of type " << type()
<< " already watched" << abort(FatalError);
}

2
src/OpenFOAM/db/regIOobject/regIOobject.C
View File

@ -269,7 +269,7 @@ void Foam::regIOobject::addWatch()
label index = time().findWatch(watchIndices_, f);
if (index != -1)
{
FatalErrorIn("regIOobject::addWatch()")
FatalErrorInFunction
<< "Object " << objectPath() << " of type " << type()
<< " already watched with index " << watchIndices_[index]
<< abort(FatalError);

2
src/OpenFOAM/meshes/polyMesh/polyMesh.C
View File

@ -1058,7 +1058,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
if (newPoints.size() != points_.size())
{
FatalErrorIn("polyMesh::movePoints(const pointField&)")
FatalErrorInFunction
<< "Size of newPoints " << newPoints.size()
<< " does not correspond to current mesh points size "
<< points_.size()

6
src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
View File

@ -64,7 +64,7 @@ class InterfaceForce
const scalar C_;
//- gradInterForce interpolator
autoPtr<interpolation<vector> > gradInterForceInterpPtr_;
autoPtr<interpolation<vector>> gradInterForceInterpPtr_;
public:
@ -87,9 +87,9 @@ public:
InterfaceForce(const InterfaceForce& gf);
//- Construct and return a clone
virtual autoPtr<ParticleForce<CloudType> > clone() const
virtual autoPtr<ParticleForce<CloudType>> clone() const
{
return autoPtr<ParticleForce<CloudType> >
return autoPtr<ParticleForce<CloudType>>
(
new InterfaceForce<CloudType>(*this)
);

2
src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
View File

@ -76,7 +76,7 @@ void Foam::reactionsSensitivityAnalysis<chemistryType>::calculateSpeciesRR
)
{
tmp<DimensionedField<scalar, volMesh> > RRt
tmp<DimensionedField<scalar, volMesh>> RRt
(
new DimensionedField<scalar, volMesh>
(

1
src/regionModels/doc/regionBoundaryConditionsDoc.H
View File

@ -25,6 +25,7 @@ License
\defgroup grpRegionBoundaryConditions Region boundary conditions
@{
\ingroup grpBoundaryConditions
This group contains region model boundary conditions
@}