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

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2009-10-22 11:59:45 +01:00
parent fe45863a11 8d70c5b025
commit 9120e00a59
125 changed files with 364 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ODE/ODESolvers/SIBS/SIBS.C
View File

@ -121,7 +121,7 @@ void Foam::SIBS::solve
kMax_ = kOpt_;
}
label k=0;
label k = 0;
scalar h = hTry;
yTemp_ = y;
@ -213,7 +213,7 @@ void Foam::SIBS::solve
x = xNew_;
hDid = h;
first_=0;
first_ = 0;
scalar wrkmin = GREAT;
scalar scale = 1.0;

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

@ -173,9 +173,9 @@ bool Foam::regIOobject::checkOut()
}
bool Foam::regIOobject::upToDate(const word& a) const
bool Foam::regIOobject::upToDate(const regIOobject& a) const
{
if (db().lookupObject<regIOobject>(a).eventNo() >= eventNo_)
if (a.eventNo() >= eventNo_)
{
return false;
}
@ -186,12 +186,16 @@ bool Foam::regIOobject::upToDate(const word& a) const
}
bool Foam::regIOobject::upToDate(const word& a, const word& b) const
bool Foam::regIOobject::upToDate
(
const regIOobject& a,
const regIOobject& b
) const
{
if
(
db().lookupObject<regIOobject>(a).eventNo() >= eventNo_
|| db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
a.eventNo() >= eventNo_
|| b.eventNo() >= eventNo_
)
{
return false;
@ -205,16 +209,16 @@ bool Foam::regIOobject::upToDate(const word& a, const word& b) const
bool Foam::regIOobject::upToDate
(
const word& a,
const word& b,
const word& c
const regIOobject& a,
const regIOobject& b,
const regIOobject& c
) const
{
if
(
db().lookupObject<regIOobject>(a).eventNo() >= eventNo_
|| db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
|| db().lookupObject<regIOobject>(c).eventNo() >= eventNo_
a.eventNo() >= eventNo_
|| b.eventNo() >= eventNo_
|| c.eventNo() >= eventNo_
)
{
return false;
@ -228,18 +232,18 @@ bool Foam::regIOobject::upToDate
bool Foam::regIOobject::upToDate
(
const word& a,
const word& b,
const word& c,
const word& d
const regIOobject& a,
const regIOobject& b,
const regIOobject& c,
const regIOobject& d
) const
{
if
(
db().lookupObject<regIOobject>(a).eventNo() >= eventNo_
|| db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
|| db().lookupObject<regIOobject>(c).eventNo() >= eventNo_
|| db().lookupObject<regIOobject>(d).eventNo() >= eventNo_
a.eventNo() >= eventNo_
|| b.eventNo() >= eventNo_
|| c.eventNo() >= eventNo_
|| d.eventNo() >= eventNo_
)
{
return false;

37
src/OpenFOAM/db/regIOobject/regIOobject.H
View File

@ -154,19 +154,38 @@ public:
//- Event number at last update.
inline label& eventNo();
//- Am I uptodate with respect to other regIOobjects
bool upToDate(const word&) const;
bool upToDate(const word&, const word&) const;
bool upToDate(const word&, const word&, const word&) const;
//- Return true if up-to-date with respect to given object
// otherwise false
bool upToDate(const regIOobject&) const;
//- Return true if up-to-date with respect to given objects
// otherwise false
bool upToDate
(
const word&,
const word&,
const word&,
const word&
const regIOobject&,
const regIOobject&
) const;
//- Flag me as up to date
//- Return true if up-to-date with respect to given objects
// otherwise false
bool upToDate
(
const regIOobject&,
const regIOobject&,
const regIOobject&
) const;
//- Return true if up-to-date with respect to given objects
// otherwise false
bool upToDate
(
const regIOobject&,
const regIOobject&,
const regIOobject&,
const regIOobject&
) const;
//- Set up to date (obviously)
void setUpToDate();

16
src/OpenFOAM/global/constants/math/mathematicalConstants.H → src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H
View File

@ -26,7 +26,7 @@ Namespace
Foam::constant::mathematical
Description
mathematical constants and conversion functions
mathematical constants.
\*---------------------------------------------------------------------------*/
@ -60,20 +60,6 @@ namespace mathematical
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
//- Conversion from degrees to radians
inline scalar degToRad(const scalar& deg)
{
return (deg*constant::mathematical::pi/180.0);
}
//- Conversion from radians to degrees
inline scalar radToDeg(const scalar& rad)
{
return (rad*180.0/constant::mathematical::pi);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

67
src/OpenFOAM/global/unitConversion/unitConversion.H Normal file
View File

@ -0,0 +1,67 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Namespace
Foam
Description
Unit conversion functions
\*---------------------------------------------------------------------------*/
#ifndef unitConversion_H
#define unitConversion_H
#include "mathematicalConstants.H"
using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
//- Conversion from degrees to radians
inline scalar degToRad(const scalar& deg)
{
return (deg*pi/180.0);
}
//- Conversion from radians to degrees
inline scalar radToDeg(const scalar& rad)
{
return (rad*180.0/pi);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

2
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
View File

@ -27,7 +27,7 @@ License
#include "primitiveMesh.H"
#include "pyramidPointFaceRef.H"
#include "ListOps.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "SortableList.H"

5
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
View File

@ -31,10 +31,7 @@ Description
#include "primitiveMesh.H"
#include "pyramidPointFaceRef.H"
#include "cell.H"
#include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "unitConversion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

4
src/dynamicFvMesh/include/meshCourantNo.H
View File

@ -39,10 +39,10 @@ if (mesh.nInternalFaces())
mesh.surfaceInterpolation::deltaCoeffs()*mag(mesh.phi());
meshCoNum = max(SfUfbyDelta/mesh.magSf())
.value()*runTime.deltaT().value();
.value()*runTime.deltaTValue();
meanMeshCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
.value()*runTime.deltaT().value();
.value()*runTime.deltaTValue();
}
Info<< "Mesh Courant Number mean: " << meanMeshCoNum

2
src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
View File

@ -27,7 +27,7 @@ License
#include "topoCellLooper.H"
#include "cellFeatures.H"
#include "polyMesh.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "DynamicList.H"
#include "ListOps.H"
#include "meshTools.H"

2
src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
View File

@ -32,7 +32,7 @@ License
#include "cellCuts.H"
#include "splitCell.H"
#include "mapPolyMesh.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "meshTools.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

2
src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
View File

@ -27,7 +27,7 @@ License
#include "polyMeshGeometry.H"
#include "pyramidPointFaceRef.H"
#include "syncTools.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
namespace Foam
{

2
src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
View File

@ -119,7 +119,7 @@ void fvMotionSolverEngineMesh::move()
pistonPosition_.value() += deltaZ;
scalar pistonSpeed = deltaZ/engineDB_.deltaT().value();
scalar pistonSpeed = deltaZ/engineDB_.deltaTValue();
Info<< "clearance: " << deckHeight_.value() - pistonPosition_.value() << nl
<< "Piston speed = " << pistonSpeed << " m/s" << endl;

2
src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
View File

@ -121,7 +121,7 @@ void layeredEngineMesh::move()
}
pistonPosition_.value() += deltaZ;
scalar pistonSpeed = deltaZ/engineDB_.deltaT().value();
scalar pistonSpeed = deltaZ/engineDB_.deltaTValue();
Info<< "clearance: " << deckHeight_.value() - pistonPosition_.value() << nl
<< "Piston speed = " << pistonSpeed << " m/s" << endl;

6
src/engine/engineTime/engineTime.C
View File

@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "engineTime.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -165,7 +165,7 @@ Foam::scalar Foam::engineTime::thetaRevolution() const
Foam::scalar Foam::engineTime::deltaTheta() const
{
return timeToDeg(deltaT().value());
return timeToDeg(deltaTValue());
}
@ -216,7 +216,7 @@ Foam::dimensionedScalar Foam::engineTime::pistonSpeed() const
(
"pistonSpeed",
dimVelocity,
pistonDisplacement().value()/(deltaT().value() + VSMALL)
pistonDisplacement().value()/(deltaTValue() + VSMALL)
);
}

2
src/engine/engineValve/engineValve.C
View File

@ -208,7 +208,7 @@ Foam::scalar Foam::engineValve::curVelocity() const
lift(engineDB_.theta() - engineDB_.deltaTheta()),
minLift_
)
)/(engineDB_.deltaT().value() + VSMALL);
)/(engineDB_.deltaTValue() + VSMALL);
}

4
src/engine/ignition/ignitionSite.C
View File

@ -106,7 +106,7 @@ const labelList& ignitionSite::cells() const
bool ignitionSite::igniting() const
{
scalar curTime = db_.value();
scalar deltaT = db_.deltaT().value();
scalar deltaT = db_.deltaTValue();
return
(
@ -120,7 +120,7 @@ bool ignitionSite::igniting() const
bool ignitionSite::ignited() const
{
scalar curTime = db_.value();
scalar deltaT = db_.deltaT().value();
scalar deltaT = db_.deltaTValue();
return(curTime - deltaT >= time_);
}

4
src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H
View File

@ -39,10 +39,10 @@ if (mesh.nInternalFaces())
mesh.surfaceInterpolation::deltaCoeffs()*mag(phi)/fvc::interpolate(rho);
CoNum = max(SfUfbyDelta/mesh.magSf())
.value()*runTime.deltaT().value();
.value()*runTime.deltaTValue();
meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
.value()*runTime.deltaT().value();
.value()*runTime.deltaTValue();
}
Info<< "Courant Number mean: " << meanCoNum

4
src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.C
View File

@ -180,7 +180,7 @@ Foam::timeActivatedExplicitMulticomponentPointSource::Su
DimensionedField<scalar, volMesh>& sourceField = tSource();
const scalarField& V = mesh_.V();
const scalar dt = runTime_.deltaT().value();
const scalar dt = runTime_.deltaTValue();
forAll(pointSources_, sourceI)
{
@ -240,7 +240,7 @@ Foam::timeActivatedExplicitMulticomponentPointSource::Su()
DimensionedField<scalar, volMesh>& sourceField = tSource();
const scalarField& V = mesh_.V();
const scalar dt = runTime_.deltaT().value();
const scalar dt = runTime_.deltaTValue();
forAll(pointSources_, sourceI)
{

4
src/finiteVolume/cfdTools/general/include/setDeltaT.H
View File

@ -41,12 +41,12 @@ if (adjustTimeStep)
(
min
(
deltaTFact*runTime.deltaT().value(),
deltaTFact*runTime.deltaTValue(),
maxDeltaT
)
);
Info<< "deltaT = " << runTime.deltaT().value() << endl;
Info<< "deltaT = " << runTime.deltaTValue() << endl;
}
// ************************************************************************* //

2
src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H
View File

@ -39,7 +39,7 @@ if (adjustTimeStep)
(
min
(
maxCo*runTime.deltaT().value()/CoNum,
maxCo*runTime.deltaTValue()/CoNum,
maxDeltaT
)
);

6
src/finiteVolume/cfdTools/general/include/volContinuity.H
View File

@ -4,12 +4,12 @@
// Backward Differencing in time.
conserve.internalField() +=
(1.0 - mesh.V0()/mesh.V())/runTime.deltaT().value();
(1.0 - mesh.V0()/mesh.V())/runTime.deltaTValue();
scalar sumLocalContErr = runTime.deltaT().value()*
scalar sumLocalContErr = runTime.deltaTValue()*
mag(conserve)().weightedAverage(mesh.V()).value();
scalar globalContErr = runTime.deltaT().value()*
scalar globalContErr = runTime.deltaTValue()*
conserve.weightedAverage(mesh.V()).value();
Info<< "volume continuity errors : sum local = " << sumLocalContErr

4
src/finiteVolume/cfdTools/incompressible/CourantNo.H
View File

@ -39,10 +39,10 @@ if (mesh.nInternalFaces())
mesh.surfaceInterpolation::deltaCoeffs()*mag(phi);
CoNum = max(SfUfbyDelta/mesh.magSf())
.value()*runTime.deltaT().value();
.value()*runTime.deltaTValue();
meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
.value()*runTime.deltaT().value();
.value()*runTime.deltaTValue();
}
Info<< "Courant Number mean: " << meanCoNum

4
src/finiteVolume/cfdTools/incompressible/continuityErrs.H
View File

@ -33,10 +33,10 @@ Description
{
volScalarField contErr = fvc::div(phi);
scalar sumLocalContErr = runTime.deltaT().value()*
scalar sumLocalContErr = runTime.deltaTValue()*
mag(contErr)().weightedAverage(mesh.V()).value();
scalar globalContErr = runTime.deltaT().value()*
scalar globalContErr = runTime.deltaTValue()*
contErr.weightedAverage(mesh.V()).value();
cumulativeContErr += globalContErr;

4
src/finiteVolume/cfdTools/incompressible/movingMeshContinuityErrs.H
View File

@ -33,10 +33,10 @@ Description
{
volScalarField contErr = fvc::div(phi + fvc::meshPhi(U));
scalar sumLocalContErr = runTime.deltaT().value()*
scalar sumLocalContErr = runTime.deltaTValue()*
mag(contErr)().weightedAverage(mesh.V()).value();
scalar globalContErr = runTime.deltaT().value()*
scalar globalContErr = runTime.deltaTValue()*
contErr.weightedAverage(mesh.V()).value();
cumulativeContErr += globalContErr;

4
src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H
View File

@ -32,11 +32,11 @@ Description
if (mesh.moving())
{
scalar sumLocalContErr = runTime.deltaT().value()*
scalar sumLocalContErr = runTime.deltaTValue()*
mag(fvc::div(phi + fvc::meshPhi(rho, U)))()
.weightedAverage(mesh.V()).value();
scalar globalContErr = runTime.deltaT().value()*
scalar globalContErr = runTime.deltaTValue()*
fvc::div(phi + fvc::meshPhi(rho, U))()
.weightedAverage(mesh.V()).value();

2
src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
View File

@ -223,7 +223,7 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
openFraction_
+ max
(
this->db().time().deltaT().value()/openingTime_,
this->db().time().deltaTValue()/openingTime_,
maxOpenFractionDelta_
)
*(orientation_*sign(forceDiff)),

2
src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
View File

@ -202,7 +202,7 @@ void advectiveFvPatchField<Type>::updateCoeffs()
this->dimensionedInternalField().mesh()
.ddtScheme(this->dimensionedInternalField().name())
);
scalar deltaT = this->db().time().deltaT().value();
scalar deltaT = this->db().time().deltaTValue();
const GeometricField<Type, fvPatchField, volMesh>& field =
this->db().objectRegistry::

2
src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
View File

@ -112,7 +112,7 @@ void movingWallVelocityFvPatchVectorField::updateCoeffs()
oldFc[i] = pp[i].centre(oldPoints);
}
vectorField Up = (pp.faceCentres() - oldFc)/mesh.time().deltaT().value();
vectorField Up = (pp.faceCentres() - oldFc)/mesh.time().deltaTValue();
const volVectorField& U = db().lookupObject<volVectorField>("U");
scalarField phip =

2
src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
View File

@ -196,7 +196,7 @@ void syringePressureFvPatchScalarField::updateCoeffs()
}
scalar t = db().time().value();
scalar deltaT = db().time().deltaT().value();
scalar deltaT = db().time().deltaTValue();
const surfaceScalarField& phi =
db().lookupObject<surfaceScalarField>("phi");

20
src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
View File

@ -59,8 +59,8 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
IOobject::NO_WRITE
);
scalar deltaT = mesh().time().deltaT().value();
scalar deltaT0 = mesh().time().deltaT0().value();
scalar deltaT = mesh().time().deltaTValue();
scalar deltaT0 = mesh().time().deltaT0Value();
scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@ -137,8 +137,8 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
IOobject::NO_WRITE
);
scalar deltaT = mesh().time().deltaT().value();
scalar deltaT0 = mesh().time().deltaT0().value();
scalar deltaT = mesh().time().deltaTValue();
scalar deltaT0 = mesh().time().deltaT0Value();
scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@ -246,8 +246,8 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
fvMatrix<Type>& fvm = tfvm();
scalar deltaT = mesh().time().deltaT().value();
scalar deltaT0 = mesh().time().deltaT0().value();
scalar deltaT = mesh().time().deltaTValue();
scalar deltaT0 = mesh().time().deltaT0Value();
scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@ -307,8 +307,8 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
fvMatrix<Type>& fvm = tfvm();
scalar deltaT = mesh().time().deltaT().value();
scalar deltaT0 = mesh().time().deltaT0().value();
scalar deltaT = mesh().time().deltaTValue();
scalar deltaT0 = mesh().time().deltaT0Value();
scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@ -368,8 +368,8 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
fvMatrix<Type>& fvm = tfvm();
scalar deltaT = mesh().time().deltaT().value();
scalar deltaT0 = mesh().time().deltaT0().value();
scalar deltaT = mesh().time().deltaTValue();
scalar deltaT0 = mesh().time().deltaT0Value();
scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);

6
src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
View File

@ -276,7 +276,7 @@ EulerDdtScheme<Type>::fvmDdt
fvMatrix<Type>& fvm = tfvm();
scalar rDeltaT = 1.0/mesh().time().deltaT().value();
scalar rDeltaT = 1.0/mesh().time().deltaTValue();
fvm.diag() = rDeltaT*mesh().V();
@ -311,7 +311,7 @@ EulerDdtScheme<Type>::fvmDdt
);
fvMatrix<Type>& fvm = tfvm();
scalar rDeltaT = 1.0/mesh().time().deltaT().value();
scalar rDeltaT = 1.0/mesh().time().deltaTValue();
fvm.diag() = rDeltaT*rho.value()*mesh().V();
@ -348,7 +348,7 @@ EulerDdtScheme<Type>::fvmDdt
);
fvMatrix<Type>& fvm = tfvm();
scalar rDeltaT = 1.0/mesh().time().deltaT().value();
scalar rDeltaT = 1.0/mesh().time().deltaTValue();
fvm.diag() = rDeltaT*rho.internalField()*mesh().V();

4
src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
View File

@ -44,14 +44,14 @@ namespace fv
template<class Type>
scalar backwardDdtScheme<Type>::deltaT_() const
{
return mesh().time().deltaT().value();
return mesh().time().deltaTValue();
}
template<class Type>
scalar backwardDdtScheme<Type>::deltaT0_() const
{
return mesh().time().deltaT0().value();
return mesh().time().deltaT0Value();
}

4
src/finiteVolume/finiteVolume/ddtSchemes/boundedBackwardDdtScheme/boundedBackwardDdtScheme.C
View File

@ -42,13 +42,13 @@ namespace fv
scalar boundedBackwardDdtScheme::deltaT_() const
{
return mesh().time().deltaT().value();
return mesh().time().deltaTValue();
}
scalar boundedBackwardDdtScheme::deltaT0_() const
{
return mesh().time().deltaT0().value();
return mesh().time().deltaT0Value();
}

34
src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
View File

@ -52,7 +52,6 @@ void Foam::fvSchemes::clear()
defaultLaplacianScheme_.clear();
fluxRequired_.clear();
defaultFluxRequired_ = false;
cacheFields_.clear();
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -169,15 +168,7 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
tokenList()
)()
),
defaultFluxRequired_(false),
cacheFields_
(
ITstream
(
objectPath() + "::cacheFields",
tokenList()
)()
)
defaultFluxRequired_(false)
{
read();
}
@ -381,11 +372,6 @@ bool Foam::fvSchemes::read()
}
}
if (dict.found("cacheFields"))
{
cacheFields_ = dict.subDict("cacheFields");
}
return true;
}
else
@ -563,22 +549,4 @@ bool Foam::fvSchemes::fluxRequired(const word& name) const
}
bool Foam::fvSchemes::cache(const word& name) const
{
if (debug)
{
Info<< "Lookup cache for " << name << endl;
}
if (cacheFields_.found(name))
{
return true;
}
else
{
return false;
}
}
// ************************************************************************* //

4
src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
View File

@ -79,8 +79,6 @@ class fvSchemes
dictionary fluxRequired_;
bool defaultFluxRequired_;
dictionary cacheFields_;
// Private Member Functions
@ -128,8 +126,6 @@ public:
bool fluxRequired(const word& name) const;
bool cache(const word& name) const;
// Read

4
src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
View File

@ -99,7 +99,7 @@ void Foam::MULES::explicitSolve
scalarField& psiIf = psi;
const scalarField& psi0 = psi.oldTime();
const scalar deltaT = mesh.time().deltaT().value();
const scalar deltaT = mesh.time().deltaTValue();
psiIf = 0.0;
fvc::surfaceIntegrate(psiIf, phiPsi);
@ -328,7 +328,7 @@ void Foam::MULES::limiter
const unallocLabelList& owner = mesh.owner();
const unallocLabelList& neighb = mesh.neighbour();
const scalarField& V = mesh.V();
const scalar deltaT = mesh.time().deltaT().value();
const scalar deltaT = mesh.time().deltaTValue();
const scalarField& phiBDIf = phiBD;
const surfaceScalarField::GeometricBoundaryField& phiBDBf =

2
src/finiteVolume/fvMesh/fvMesh.C
View File

@ -576,7 +576,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
// Move the polyMesh and set the mesh motion fluxes to the swept-volumes
scalar rDeltaT = 1.0/time().deltaT().value();
scalar rDeltaT = 1.0/time().deltaTValue();
tmp<scalarField> tsweptVols = polyMesh::movePoints(p);
scalarField& sweptVols = tsweptVols();

2
src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
View File

@ -32,7 +32,7 @@ Description
#include "surfaceFields.H"
#include "demandDrivenData.H"
#include "coupledFvPatch.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
View File

@ -142,7 +142,7 @@ Foam::velocityComponentLaplacianFvMotionSolver::curPoints() const
(
cmpt_,
tcurPoints().component(cmpt_)
+ fvMesh_.time().deltaT().value()*pointMotionU_.internalField()
+ fvMesh_.time().deltaTValue()*pointMotionU_.internalField()
);
twoDCorrectPoints(tcurPoints());

2
src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
View File

@ -112,7 +112,7 @@ Foam::velocityLaplacianFvMotionSolver::curPoints() const
tmp<pointField> tcurPoints
(
fvMesh_.points()
+ fvMesh_.time().deltaT().value()*pointMotionU_.internalField()
+ fvMesh_.time().deltaTValue()*pointMotionU_.internalField()
);
twoDCorrectPoints(tcurPoints());

2
src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
View File

@ -146,7 +146,7 @@ void angularOscillatingVelocityPointPatchVectorField::updateCoeffs()
+ (axisHat ^ p0Rel*sin(angle))
+ (axisHat & p0Rel)*(1 - cos(angle))*axisHat
- p.localPoints()
)/t.deltaT().value()
)/t.deltaTValue()
);
fixedValuePointPatchField<vector>::updateCoeffs();

2
src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
View File

@ -125,7 +125,7 @@ void oscillatingVelocityPointPatchVectorField::updateCoeffs()
Field<vector>::operator=
(
(p0_ + amplitude_*sin(omega_*t.value()) - p.localPoints())
/t.deltaT().value()
/t.deltaTValue()
);
fixedValuePointPatchField<vector>::updateCoeffs();

4
src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
View File

@ -129,7 +129,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
// calculate the forces on the motion object from this data, then
// update the positions
motion_.updatePosition(t.deltaT().value());
motion_.updatePosition(t.deltaTValue());
dictionary forcesDict;
@ -157,7 +157,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
(
fm.first().first() + fm.first().second() + gravity*motion_.mass(),
fm.second().first() + fm.second().second(),
t.deltaT().value()
t.deltaTValue()
);
Field<vector>::operator=(motion_.generatePositions(p0_) - p0_);

4
src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
View File

@ -64,7 +64,7 @@ void surfaceDisplacementPointPatchVectorField::calcProjection
const pointField& localPoints = patch().localPoints();
const labelList& meshPoints = patch().meshPoints();
//const scalar deltaT = mesh.time().deltaT().value();
//const scalar deltaT = mesh.time().deltaTValue();
// Construct large enough vector in direction of projectDir so
// we're guaranteed to hit something.
@ -451,7 +451,7 @@ void surfaceDisplacementPointPatchVectorField::updateCoeffs()
// Clip offset to maximum displacement possible: velocity*timestep
const scalar deltaT = mesh.time().deltaT().value();
const scalar deltaT = mesh.time().deltaTValue();
const vector clipVelocity = velocity_*deltaT;
forAll(displacement, i)

2
src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
View File

@ -63,7 +63,7 @@ void surfaceSlipDisplacementPointPatchVectorField::calcProjection
const pointField& localPoints = patch().localPoints();
const labelList& meshPoints = patch().meshPoints();
//const scalar deltaT = mesh.time().deltaT().value();
//const scalar deltaT = mesh.time().deltaTValue();
// Construct large enough vector in direction of projectDir so
// we're guaranteed to hit something.

2
src/lagrangian/basic/Particle/ParticleI.H
View File

@ -373,7 +373,7 @@ inline Foam::scalar Foam::Particle<ParticleType>::currentTime() const
{
return
cloud_.pMesh().time().value()
+ stepFraction_*cloud_.pMesh().time().deltaT().value();
+ stepFraction_*cloud_.pMesh().time().deltaTValue();
}

2
src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
View File

@ -27,7 +27,7 @@ License
#include "multiHoleInjector.H"
#include "addToRunTimeSelectionTable.H"
#include "Random.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam

2
src/lagrangian/dieselSpray/parcel/parcel.C
View File

@ -100,7 +100,7 @@ bool Foam::parcel::move(spray& sDB)
const liquidMixture& fuels = sDB.fuels();
scalar deltaT = sDB.runTime().deltaT().value();
scalar deltaT = sDB.runTime().deltaTValue();
label Nf = fuels.components().size();
label Ns = sDB.composition().Y().size();

2
src/lagrangian/dieselSpray/spray/spray.C
View File

@ -41,7 +41,7 @@ License
#include "symmetryPolyPatch.H"
#include "wedgePolyPatch.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

6
src/lagrangian/dieselSpray/spray/sprayI.H
View File

@ -157,7 +157,7 @@ inline tmp<volVectorField> spray::momentumSource() const
)
);
tsource().internalField() = sms_/runTime_.deltaT().value()/mesh_.V();
tsource().internalField() = sms_/runTime_.deltaTValue()/mesh_.V();
return tsource;
}
@ -185,7 +185,7 @@ inline tmp<volScalarField> spray::evaporationSource(const label si) const
if (isLiquidFuel_[si])
{
label fi = gasToLiquidIndex_[si];
tsource().internalField() = srhos_[fi]/runTime_.deltaT().value()/mesh_.V();
tsource().internalField() = srhos_[fi]/runTime_.deltaTValue()/mesh_.V();
}
else
{
@ -216,7 +216,7 @@ inline tmp<volScalarField> spray::heatTransferSource() const
)
);
tsource().internalField() = shs_/runTime_.deltaT().value()/mesh_.V();
tsource().internalField() = shs_/runTime_.deltaTValue()/mesh_.V();
return tsource;
}

6
src/lagrangian/dieselSpray/spray/sprayInject.C
View File

@ -71,7 +71,7 @@ void spray::inject()
// deltaT is the duration of injection during this timestep
scalar deltaT = min
(
runTime_.deltaT().value(),
runTime_.deltaTValue(),
min
(
time - it->tsoi(),
@ -150,8 +150,8 @@ void spray::inject()
scalar dt = time - toi;
pPtr->stepFraction() =
(runTime_.deltaT().value() - dt)
/runTime_.deltaT().value();
(runTime_.deltaTValue() - dt)
/runTime_.deltaTValue();
bool keepParcel = pPtr->move(*this);

8
src/lagrangian/dieselSpray/spray/sprayOps.C
View File

@ -58,7 +58,7 @@ void spray::evolve()
calculateAmbientPressure();
calculateAmbientTemperature();
collisions().collideParcels(runTime_.deltaT().value());
collisions().collideParcels(runTime_.deltaTValue());
move();
dispersion().disperseParcels();
inject();
@ -103,7 +103,7 @@ void spray::breakupLoop()
breakup().updateParcelProperties
(
elmnt(),
runTime_.deltaT().value(),
runTime_.deltaTValue(),
velocity,
fuels_
);
@ -111,7 +111,7 @@ void spray::breakupLoop()
breakup().breakupParcel
(
elmnt(),
runTime_.deltaT().value(),
runTime_.deltaTValue(),
velocity,
fuels_
);
@ -137,7 +137,7 @@ void spray::atomizationLoop()
atomization().atomizeParcel
(
elmnt(),
runTime_.deltaT().value(),
runTime_.deltaTValue(),
velocity,
fuels_
);

2
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
View File

@ -72,7 +72,7 @@ void gradientDispersionRAS::disperseParcels() const
const scalar cps = 0.16432;
scalar dt = spray_.runTime().deltaT().value();
scalar dt = spray_.runTime().deltaTValue();
const volScalarField& k = turbulence().k();
volVectorField gradk = fvc::grad(k);
const volScalarField& epsilon = turbulence().epsilon();

2
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
View File

@ -73,7 +73,7 @@ void stochasticDispersionRAS::disperseParcels() const
const scalar cps = 0.16432;
const vector one(1.0, 1.0, 1.0);
scalar dt = spray_.runTime().deltaT().value();
scalar dt = spray_.runTime().deltaTValue();
const volScalarField& k = turbulence().k();
//volVectorField gradk = fvc::grad(k);
const volScalarField& epsilon = turbulence().epsilon();

2
src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
View File

@ -26,7 +26,7 @@ License
#include "blobsSwirlInjector.H"
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
View File

@ -104,7 +104,7 @@ bool reflectParcel::wallTreatment
vector Ub1 = U_.boundaryField()[patchi][facei];
vector Ub0 = U_.oldTime().boundaryField()[patchi][facei];
scalar dt = spray_.runTime().deltaT().value();
scalar dt = spray_.runTime().deltaTValue();
const vectorField& oldPoints = mesh.oldPoints();
const vector& Cf1 = mesh.faceCentres()[globalFacei];

2
src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
View File

@ -128,7 +128,7 @@ inline Foam::Random& Foam::DsmcCloud<ParcelType>::rndGen()
template<class ParcelType>
inline void Foam::DsmcCloud<ParcelType>::storeDeltaT()
{
cachedDeltaT_ = mesh().time().deltaT().value();
cachedDeltaT_ = mesh().time().deltaTValue();
}

2
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
View File

@ -167,7 +167,7 @@ void Foam::KinematicCloud<ParcelType>::checkParcelProperties
parcel.rho() = constProps_.rho0();
}
scalar carrierDt = this->db().time().deltaT().value();
scalar carrierDt = this->db().time().deltaTValue();
parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
}

4
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
View File

@ -84,7 +84,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
false
),
this->mesh(),
dimensionedScalar("zero", dimensionSet(1, 2, -2, 0, 0), 0.0)
dimensionedScalar("zero", dimEnergy, 0.0)
),
hcTrans_
(
@ -98,7 +98,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
false
),
this->mesh(),
dimensionedScalar("zero", dimensionSet(1, 2, -2, 0, 0), 0.0)
dimensionedScalar("zero", dimEnergy, 0.0)
)
{
if (readFields)

2
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
View File

@ -226,7 +226,7 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
const polyMesh& mesh = td.cloud().pMesh();
const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
const scalar deltaT = mesh.time().deltaT().value();
const scalar deltaT = mesh.time().deltaTValue();
scalar tEnd = (1.0 - p.stepFraction())*deltaT;
const scalar dtMax = tEnd;

16
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
View File

@ -462,15 +462,21 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
{
const label idc =
td.cloud().composition().localToGlobalCarrierId(idPhase, i);
const scalar hv = td.cloud().mcCarrierThermo().speciesData()[idc].H(T);
const label idl = td.cloud().composition().globalIds(idPhase)[i];
const scalar hl =
td.cloud().composition().liquids().properties()[idl].h(pc_, T);
// Enthalphy transfer to carrier phase
const scalar hv = td.cloud().mcCarrierThermo().speciesData()[idc].H(Ts);
const scalar hl =
td.cloud().composition().liquids().properties()[idl].h(pc_, Ts);
// Enthalphy transfer to carrier phase - method 1 using enthalpy diff
Sh += dMassPC[i]*(hl - hv)/dt;
// Enthalphy transfer to carrier phase - method 2 using latent heat
// const scalar hl =
// td.cloud().composition().liquids().properties()[idl].hl(pc_, Ts);
// Sh -= dMassPC[i]*hl/dt;
// Update particle surface thermo properties
const scalar Dab =
td.cloud().composition().liquids().properties()[idl].D(pc_, Ts, Wc);

2
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
View File

@ -351,7 +351,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
}
const scalar time = owner_.db().time().value();
const scalar carrierDt = owner_.db().time().deltaT().value();
const scalar carrierDt = owner_.db().time().deltaTValue();
const polyMesh& mesh = owner_.mesh();
// Prepare for next time step

4
src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
View File

@ -41,9 +41,9 @@ void Foam::correlationFunction<Type>::setTimesAndSizes
const label tZeroBufferSize
)
{
sampleSteps_ = ceil(sampleInterval_/mesh_.time().deltaT().value());
sampleSteps_ = ceil(sampleInterval_/mesh_.time().deltaTValue());
sampleInterval_ = sampleSteps_*mesh_.time().deltaT().value();
sampleInterval_ = sampleSteps_*mesh_.time().deltaTValue();
label bufferLength(ceil(duration_/sampleInterval_));

2
src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
View File

@ -88,7 +88,7 @@ bool Foam::molecule::move(molecule::trackData& td)
const constantProperties& constProps(td.molCloud().constProps(id_));
scalar deltaT = cloud().pMesh().time().deltaT().value();
scalar deltaT = cloud().pMesh().time().deltaTValue();
if (td.part() == 0)
{

2
src/lagrangian/solidParticle/solidParticle.C
View File

@ -36,7 +36,7 @@ bool Foam::solidParticle::move(solidParticle::trackData& td)
const polyMesh& mesh = cloud().pMesh();
const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
scalar deltaT = mesh.time().deltaT().value();
scalar deltaT = mesh.time().deltaTValue();
scalar tEnd = (1.0 - stepFraction())*deltaT;
scalar dtMax = tEnd;

2
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
View File

@ -34,7 +34,7 @@ Description
#include "removePoints.H"
#include "pointFields.H"
#include "motionSmoother.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "pointSet.H"
#include "faceSet.H"
#include "cellSet.H"

1
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
View File

@ -35,6 +35,7 @@ License
#include "refinementSurfaces.H"
#include "shellSurfaces.H"
#include "mapDistributePolyMesh.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

2
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
View File

@ -26,7 +26,7 @@ License
#include "layerParameters.H"
#include "polyBoundaryMesh.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "refinementSurfaces.H"
#include "searchableSurfaces.H"
#include "regExp.H"

2
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
View File

@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "refinementParameters.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "polyMesh.H"
#include "globalIndex.H"

2
src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
View File

@ -37,7 +37,7 @@ License
#include "searchableSurfaces.H"
#include "polyMeshGeometry.H"
#include "IOmanip.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

2
src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
View File

@ -93,7 +93,7 @@ bool Foam::trackedParticle::move(trackedParticle::trackData& td)
td.switchProcessor = false;
td.keepParticle = true;
scalar deltaT = cloud().pMesh().time().deltaT().value();
scalar deltaT = cloud().pMesh().time().deltaTValue();
scalar tEnd = (1.0 - stepFraction())*deltaT;
scalar dtMax = tEnd;

2
src/mesh/blockMesh/curvedEdges/arcEdge.C
View File

@ -25,7 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "arcEdge.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

3
src/meshTools/cellQuality/cellQuality.C
View File

@ -26,11 +26,10 @@ License
\*---------------------------------------------------------------------------*/
#include "cellQuality.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from mesh
Foam::cellQuality::cellQuality(const polyMesh& mesh)
:
mesh_(mesh)

2
src/meshTools/coordinateSystems/toroidalCS.C
View File

@ -26,7 +26,7 @@ License
#include "toroidalCS.H"
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

2
src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
View File

@ -26,7 +26,7 @@ License
#include "primitiveMeshGeometry.H"
#include "pyramidPointFaceRef.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
View File

@ -26,7 +26,7 @@ License
#include "shapeToCell.H"
#include "polyMesh.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "hexMatcher.H"
#include "cellFeatures.H"

2
src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
View File

@ -36,7 +36,7 @@ License
#include "meshTools.H"
#include "plane.H"
#include "Random.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
#include "treeBoundBox.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

2
src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
View File

@ -33,7 +33,7 @@ License
#include "linePointRef.H"
#include "OFstream.H"
#include "IFstream.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

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

@ -70,7 +70,7 @@ void Foam::fieldAverage::initialize()
totalIter_.setSize(faItems_.size(), 1);
totalTime_.clear();
totalTime_.setSize(faItems_.size(), obr_.time().deltaT().value());
totalTime_.setSize(faItems_.size(), obr_.time().deltaTValue());
// Add mean fields to the field lists
@ -170,7 +170,7 @@ void Foam::fieldAverage::calcAverages()
forAll(faItems_, fieldI)
{
totalIter_[fieldI]++;
totalTime_[fieldI] += obr_.time().deltaT().value();
totalTime_[fieldI] += obr_.time().deltaTValue();
}
addMeanSqrToPrime2Mean<scalar, scalar>

4
src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
View File

@ -150,7 +150,7 @@ const
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
const scalar dt = obr_.time().deltaT().value();
const scalar dt = obr_.time().deltaTValue();
forAll(faItems_, i)
{
@ -193,7 +193,7 @@ void Foam::fieldAverage::calculatePrime2MeanFields
typedef GeometricField<Type1, fvPatchField, volMesh> fieldType1;
typedef GeometricField<Type2, fvPatchField, volMesh> fieldType2;
const scalar dt = obr_.time().deltaT().value();
const scalar dt = obr_.time().deltaTValue();
forAll(faItems_, i)
{

2
src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
View File

@ -164,7 +164,7 @@ bool Foam::streamLineParticle::move(streamLineParticle::trackData& td)
td.switchProcessor = false;
td.keepParticle = true;
scalar deltaT = GREAT; //cloud().pMesh().time().deltaT().value();
scalar deltaT = GREAT; //cloud().pMesh().time().deltaTValue();
scalar tEnd = (1.0 - stepFraction())*deltaT;
scalar dtMax = tEnd;

12
src/thermophysicalModels/liquids/C7H16/C7H16.C
View File

@ -65,7 +65,15 @@ Foam::C7H16::C7H16()
182.274175063868,
-254.530511150515
),
h_(-3.1469964e+6,7.3072e+3,-3.52884e+1,1.10637e-1,-1.634831e-4,9.64941e-8),
h_
(
-3.1469964e+6,
7.3072e+3,
-3.52884e+1,
1.10637e-1,
-1.634831e-4,
9.64941e-8
),
cpg_(1199.05392998284, 3992.85457666361, 1676.6, 2734.42177956968, 756.4),
B_
(
@ -80,7 +88,7 @@ Foam::C7H16::C7H16()
K_(0.215, -0.000303, 0.0, 0.0, 0.0, 0.0),
Kg_(-0.070028, 0.38068, -7049.9, -2400500.0),
sigma_(540.20, 0.054143, 1.2512, 0.0, 0.0, 0.0),
D_(147.18, 20.1, 100.204, 28.0) // note: Same as C7H16
D_(147.18, 20.1, 100.204, 28.0)
{}

2
src/thermophysicalModels/liquids/C7H16/C7H16.H
View File

@ -126,7 +126,7 @@ public:
//- Liquid heat capacity [J/(kg K)]
inline scalar cp(scalar p, scalar T) const;
//- Liquid Enthalpy [J/(kg)]
//- Liquid Enthalpy [J/kg]
inline scalar h(scalar p, scalar T) const;
//- Ideal gas heat capacity [J/(kg K)]

2
src/thermophysicalModels/liquids/liquid/liquid.H
View File

@ -219,7 +219,7 @@ public:
//- Liquid heat capacity [J/(kg K)]
virtual scalar cp(scalar p, scalar T) const = 0;
//- Liquid h [J/kg]
//- Liquid enthalpy [J/kg] - reference to 298.15 K
virtual scalar h(scalar p, scalar T) const = 0;
//- Ideal gas heat capacity [J/(kg K)]

2
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
View File

@ -99,7 +99,7 @@ class icoPolynomial
{
// Private data
//- Density
//- Density [kg/m^3]
Polynomial<PolySize> rhoPolynomial_;

9
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
View File

@ -40,8 +40,11 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
Sf_(readScalar(is)),
cpPolynomial_("cpPolynomial", is),
dhPolynomial_(cpPolynomial_.integrate()),
sPolynomial_(cpPolynomial_.integrateMinus1())
{}
dsPolynomial_(cpPolynomial_.integrateMinus1())
{
// Offset dh poly so that it is relative to the enthalpy at Tstd
dhPolynomial_[0] -= dhPolynomial_.evaluate(specie::Tstd);
}
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
@ -58,7 +61,7 @@ Foam::Ostream& Foam::operator<<
<< pt.Sf_ << tab
<< pt.cpPolynomial_ << tab
<< pt.dhPolynomial_ << tab
<< pt.sPolynomial;
<< pt.dsPolynomial;
os.check
(

12
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
View File

@ -106,14 +106,14 @@ class hPolynomialThermo
//- Standard entropy [J/(kg.K)]
scalar Sf_;
//- Specific heat at constant pressure
//- Specific heat at constant pressure [J/(kg.K)]
Polynomial<PolySize> cpPolynomial_;
//- Enthalpy - derived from cp
//- Enthalpy - derived from cp [J/kg] - relative to Tstd
typename Polynomial<PolySize>::intPolyType dhPolynomial_;
//- Entropy - derived from cp
Polynomial<PolySize> sPolynomial_;
//- Entropy - derived from cp [J/(kg.K)]
Polynomial<PolySize> dsPolynomial_;
// Private member functions
@ -125,8 +125,8 @@ class hPolynomialThermo
const scalar Hf,
const scalar Sf,
const Polynomial<PolySize>& cpPoly,
const typename Polynomial<PolySize>::intPolyType& hPoly,
const Polynomial<PolySize>& sPoly
const typename Polynomial<PolySize>::intPolyType& dhPoly,
const Polynomial<PolySize>& dsPoly
);

25
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
View File

@ -36,7 +36,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
const scalar Sf,
const Polynomial<PolySize>& cpPoly,
const typename Polynomial<PolySize>::intPolyType& dhPoly,
const Polynomial<PolySize>& sPoly
const Polynomial<PolySize>& dsPoly
)
:
EquationOfState(pt),
@ -44,7 +44,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
Sf_(Sf),
cpPolynomial_(cpPoly),
dhPolynomial_(dhPoly),
sPolynomial_(sPoly)
dsPolynomial_(dsPoly)
{}
@ -62,8 +62,11 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
Sf_(pt.Sf_),
cpPolynomial_(pt.cpPolynomial_),
dhPolynomial_(pt.dhPolynomial_),
sPolynomial_(pt.sPolynomial_)
{}
dsPolynomial_(pt.dsPolynomial_)
{
// Offset dh poly so that it is relative to the enthalpy at Tstd
dhPolynomial_[0] -= dhPolynomial_.evaluate(specie::Tstd);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -112,7 +115,7 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
const scalar T
) const
{
return (sPolynomial_.evaluate(T) + Sf_)*this->W();
return (dsPolynomial_.evaluate(T) + Sf_)*this->W();
}
@ -135,7 +138,7 @@ inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator+=
Sf_ = molr1*Sf_ + molr2*pt.Sf_;
cpPolynomial_ = molr1*cpPolynomial_ + molr2*pt.cpPolynomial_;
dhPolynomial_ = molr1*dhPolynomial_ + molr2*pt.dhPolynomial_;
sPolynomial_ = molr1*sPolynomial_ + molr2*pt.sPolynomial_;
dsPolynomial_ = molr1*dsPolynomial_ + molr2*pt.dsPolynomial_;
}
@ -153,10 +156,10 @@ inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator-=
scalar molr2 = pt.nMoles()/this->nMoles();
Hf_ = molr1*Hf_ - molr2*pt.Hf_;
Sf_ = molr1*Hf_ - molr2*pt.Sf_;
Sf_ = molr1*Sf_ - molr2*pt.Sf_;
cpPolynomial_ = molr1*cpPolynomial_ - molr2*pt.cpPolynomial_;
dhPolynomial_ = molr1*dhPolynomial_ - molr2*pt.dhPolynomial_;
sPolynomial_ = molr1*sPolynomial_ - molr2*pt.sPolynomial_;
dsPolynomial_ = molr1*dsPolynomial_ - molr2*pt.dsPolynomial_;
}
@ -184,7 +187,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator+
molr1*pt1.Sf_ + molr2*pt2.Sf_,
molr1*pt1.cpPolynomial_ + molr2*pt2.cpPolynomial_,
molr1*pt1.dhPolynomial_ + molr2*pt2.dhPolynomial_,
molr1*pt1.sPolynomial_ + molr2*pt2.sPolynomial_
molr1*pt1.dsPolynomial_ + molr2*pt2.dsPolynomial_
);
}
@ -211,7 +214,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator-
molr1*pt1.Sf_ - molr2*pt2.Sf_,
molr1*pt1.cpPolynomial_ - molr2*pt2.cpPolynomial_,
molr1*pt1.dhPolynomial_ - molr2*pt2.dhPolynomial_,
molr1*pt1.sPolynomial_ - molr2*pt2.sPolynomial_
molr1*pt1.dsPolynomial_ - molr2*pt2.dsPolynomial_
);
}
@ -230,7 +233,7 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator*
pt.Sf_,
pt.cpPolynomial_,
pt.dhPolynomial_,
pt.sPolynomial_
pt.dsPolynomial_
);
}

12
src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
View File

@ -131,23 +131,23 @@ public:
// Member Functions
// Fundamaental properties
// Fundamental properties
// (These functions must be provided in derived types)
// Heat capacity at constant pressure [J/(kmol K)]
//scalar cp(const scalar) const;
// scalar cp(const scalar) const;
// Enthalpy [J/kmol]
//scalar h(const scalar) const;
// scalar h(const scalar) const;
// Sensible enthalpy [J/kmol]
//scalar hs(const scalar) const;
// scalar hs(const scalar) const;
// Chemical enthalpy [J/kmol]
//scalar hc(const scalar) const;
// scalar hc(const scalar) const;
// Entropy [J/(kmol K)]
//scalar s(const scalar) const;
// scalar s(const scalar) const;
// Calculate and return derived properties

2
src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
View File

@ -79,7 +79,7 @@ public:
wf_(wf),
wa_(wa),
alpha_(sqrt(1/wf_ + 1/wa_)),
beta_(sqr((cbrt(a_) + cbrt(b_))))
beta_(sqr(cbrt(a_) + cbrt(b_)))
{}
//- Construct from Istream

2
src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
View File

@ -330,7 +330,7 @@ Foam::tmp<Foam::pointField> Foam::linearValveLayersFvMesh::newPoints() const
forAll (patchPoints, ppI)
{
np[patchPoints[ppI]] += vel*time().deltaT().value();
np[patchPoints[ppI]] += vel*time().deltaTValue();
}
return tnewPoints;

4
src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
View File

@ -349,7 +349,7 @@ bool Foam::mixerFvMesh::update()
csPtr_->globalPosition
(
csPtr_->localPosition(points())
+ vector(0, rpm_*360.0*time().deltaT().value()/60.0, 0)
+ vector(0, rpm_*360.0*time().deltaTValue()/60.0, 0)
*movingPointsMask()
)
);
@ -372,7 +372,7 @@ bool Foam::mixerFvMesh::update()
csPtr_->globalPosition
(
csPtr_->localPosition(oldPoints())
+ vector(0, rpm_*360.0*time().deltaT().value()/60.0, 0)
+ vector(0, rpm_*360.0*time().deltaTValue()/60.0, 0)
*movingPointsMask()
)
);

8
src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
View File

@ -420,7 +420,7 @@ bool Foam::movingConeTopoFvMesh::update()
// )/
// (curLeft_ - leftEdge_)
// )
)*curMotionVel_*time().deltaT().value();
)*curMotionVel_*time().deltaTValue();
}
else
{
@ -442,11 +442,11 @@ bool Foam::movingConeTopoFvMesh::update()
// )/
// (curLeft_ - leftEdge_)
// )
)*curMotionVel_*time().deltaT().value();
)*curMotionVel_*time().deltaTValue();
}
// curLeft_ += curMotionVel_.x()*time().deltaT().value();
// curRight_ += curMotionVel_.x()*time().deltaT().value();
// curLeft_ += curMotionVel_.x()*time().deltaTValue();
// curRight_ += curMotionVel_.x()*time().deltaTValue();
curLeft_ = average
(
faceZones()