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/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2013-10-14 08:55:25 +01:00
parent 94097396ae 72d5e471f8
commit 48be156fa3
17 changed files with 155 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
qq
View File

@ -1,102 +0,0 @@
OSspecific/POSIX/POSIX.C:pid_t Foam::pid()
OSspecific/POSIX/POSIX.C:bool Foam::ping
OSspecific/POSIX/POSIX.C: "Foam::ping(const string&, ...)"
OSspecific/POSIX/POSIX.C: "Foam::ping(const string&, const label)"
OSspecific/POSIX/POSIX.C:bool Foam::ping(const string& hostname, const label timeOut)
OSspecific/POSIX/fileStat.H: So e.g. Foam::ping first and hope nfs is running.
OpenFOAM/global/constants/atomic/atomicConstants.C: 4.0*mathematical::pi
OpenFOAM/global/constants/atomic/atomicConstants.C: 4.0*mathematical::pi
OpenFOAM/global/constants/electromagnetic/electromagneticConstants.C: 4.0*mathematical::pi*1e-07
OpenFOAM/global/constants/electromagnetic/electromagneticConstants.C: 1.0/(4.0*mathematical::pi)
OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.C: Foam::sqr(mathematical::pi)/60.0
OpenFOAM/global/unitConversion/unitConversion.H: return (deg*constant::mathematical::pi/180.0);
OpenFOAM/global/unitConversion/unitConversion.H: return (rad*180.0/constant::mathematical::pi);
OpenFOAM/meshes/meshShapes/face/face.C: angle = constant::mathematical::pi + edgeAngle;
OpenFOAM/meshes/meshShapes/face/face.C: angle = constant::mathematical::pi - edgeAngle;
OpenFOAM/meshes/meshShapes/face/face.C: scalar minDiff = constant::mathematical::pi;
OpenFOAM/primitives/transform/transform.H: return (3.0 + cos)*constant::mathematical::piByTwo;
OpenFOAM/primitives/transform/transform.H: return (1.0 - cos)*constant::mathematical::piByTwo;
engine/engineTime/engineTime.C:Foam::scalar Foam::engineTime::pistonPosition(const scalar theta) const
engine/engineTime/engineTime.C:Foam::dimensionedScalar Foam::engineTime::pistonPosition() const
engine/engineTime/engineTime.C:Foam::dimensionedScalar Foam::engineTime::pistonDisplacement() const
engine/engineTime/engineTime.C:Foam::dimensionedScalar Foam::engineTime::pistonSpeed() const
engine/include/StCorr.H: Ak = sphereFraction*4.0*constant::mathematical::pi
engine/include/StCorr.H: /(sphereFraction*4.0*constant::mathematical::pi),
engine/include/StCorr.H: Ak = circleFraction*constant::mathematical::pi*thickness
engine/include/StCorr.H: *constant::mathematical::pi
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C:void Foam::pimpleControl::read()
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C:bool Foam::pimpleControl::criteriaSatisfied()
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C:Foam::pimpleControl::pimpleControl(fvMesh& mesh)
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C:Foam::pimpleControl::~pimpleControl()
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C:bool Foam::pimpleControl::loop()
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H: Foam::pimpleControl
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H:inline Foam::label Foam::pimpleControl::nCorrPIMPLE() const
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H:inline Foam::label Foam::pimpleControl::nCorrPISO() const
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H:inline Foam::label Foam::pimpleControl::corrPISO() const
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H:inline bool Foam::pimpleControl::correct()
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H:inline bool Foam::pimpleControl::storeInitialResiduals() const
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H:inline bool Foam::pimpleControl::finalIter() const
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H:inline bool Foam::pimpleControl::finalInnerIter() const
finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H:inline bool Foam::pimpleControl::turbCorr() const
finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C: (rpm*constant::mathematical::pi/30.0)*(hatAxis) ^ d
finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C: (rpm*constant::mathematical::pi/30.0)
fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C: const scalar diameter = Foam::sqrt(4.0*sumArea/mathematical::pi);
fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C: alphaGeom = mathematical::pi - alphaGeom;
fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C: scalar coeff1 = alpha_*sqr(rotor_.omega())*mathematical::pi;
lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C: scalar dmC = 4.0*mathematical::pi*d*D_*YO2*Tc*rhoc/(Sb_*(T + Tc))*dt;
lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C: const scalar Ap = constant::mathematical::pi*sqr(d);
lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C: const scalar Ap = constant::mathematical::pi*sqr(d);
lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C: const scalar Ap = constant::mathematical::pi*sqr(d);
lagrangian/distributionModels/normal/normal.C: scalar k = 2.0/(constant::mathematical::pi*a_) + 0.5*log(1.0 - y*y);
lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H: return constant::mathematical::pi*d_*d_;
lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C: scalar theta = pCyl[1] + constant::mathematical::pi;
lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C: const scalar alpha = mathematical::pi/2.0 - acos(nw & Udir);
lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H: mathematical::pi/4.0
lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C: *mathematical::pi*(sqr(pREff) - sqr(r_PW_mag))
lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C: *mathematical::pi*(sqr(pREff) - sqr(r_PW_mag))
lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C: this->volumeTotal_ = sum(pow3(diameters_))*constant::mathematical::pi/6.0;
lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C: const scalar deg2Rad = mathematical::pi/180.0;
lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C: scalar Ao = 0.25*mathematical::pi*outerDiameter_*outerDiameter_;
lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C: scalar Ai = 0.25*mathematical::pi*innerDiameter_*innerDiameter_;
lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C: scalar vol = mathematical::pi/6.0*pow3(diameterParcelPatch_[filmFaceI]);
lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C: scalar k = 2.0/(mathematical::pi*a) + 0.5*log(1.0 - y*y);
lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C: const scalar Dp = sigma*Tc*cc/(3*mathematical::pi*muc*dp);
lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C: 216*muc*sigma*Tc/(sqr(mathematical::pi)*pow5(dp)*(rhoRatio)*cc);
lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C: f = eta*sqrt(mathematical::pi*s0/dt);
lagrangian/molecularDynamics/molecule/molecule/moleculeI.H:inline const Foam::vector& Foam::molecule::pi() const
lagrangian/molecularDynamics/molecule/molecule/moleculeI.H:inline Foam::vector& Foam::molecule::pi()
lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.C: prefactor(1.0/(4.0*constant::mathematical::pi*8.854187817e-12))
lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.C: 1.0/(4.0*constant::mathematical::pi*8.854187817e-12);
lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C: 1.0/(4.0*constant::mathematical::pi*8.854187817e-12);
lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C:pitchForkRing::pitchForkRing
lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H: Foam::tetherPotentials::pitchForkRing
lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C: rho*sigma*d*cos(angle_*constant::mathematical::pi/360.0)
lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C: scalar hSheet = volFlowRate/(constant::mathematical::pi*delta*Urel);
lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C: scalar dD = cbrt(3.0*constant::mathematical::pi*sqr(dL)/kL);
lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISASMDCalcMethod2.H: // scalar factorGamma = 0.75*sqrt(mathematicalConstant::pi); //nExp=2
lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C: scalar rhopi6 = rho*constant::mathematical::pi/6.0;
lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C: //scalar ms0 = rho*pow3(dc)*mathematicalConstant::pi/6.0;
lagrangian/spray/submodels/BreakupModel/SHF/SHF.C: scalar rhopi6 = rho*constant::mathematical::pi/6.0;
lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C: scalar nu0 = 0.25*constant::mathematical::pi*sqr(sumD)*magUrel*dt/Vc;
meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C: phi *= constant::mathematical::pi/180.0;
meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C: theta *= constant::mathematical::pi/180.0;
meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C: psi *= constant::mathematical::pi/180.0;
meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C: x *= constant::mathematical::pi/180.0;
meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C: y *= constant::mathematical::pi/180.0;
meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C: z *= constant::mathematical::pi/180.0;
meshTools/coordinateSystems/cylindricalCS.C: local.y()*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
meshTools/coordinateSystems/cylindricalCS.C: *(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
meshTools/coordinateSystems/cylindricalCS.C: )*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0),
meshTools/coordinateSystems/cylindricalCS.C: )*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0)
postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C: *6/constant::mathematical::pi
postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H:inline const Foam::vector& Foam::sixDoFRigidBodyMotion::pi() const
postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionI.H:inline Foam::vector& Foam::sixDoFRigidBodyMotion::pi()
postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateI.H:inline const Foam::vector& Foam::sixDoFRigidBodyMotionState::pi() const
postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionStateI.H:inline Foam::vector& Foam::sixDoFRigidBodyMotionState::pi()
randomProcesses/fft/kShellIntegration.C: y *= sqr(x)*4.0*constant::mathematical::pi;
randomProcesses/fft/kShellIntegration.C: scalar factor = pow((l0/(2.0*constant::mathematical::pi)),3.0);
regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C: const scalar pi = constant::mathematical::pi;
sampling/sampledSet/circle/circleSet.C: const scalar alpha = constant::mathematical::pi/180.0*dTheta_;
thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C: 1.0/constant::mathematical::pi*omega_
thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C: 1.0/constant::mathematical::pi*omega_
transportModels/interfaceProperties/interfaceProperties.C: Foam::constant::mathematical::pi/180.0;

105
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,33 +28,17 @@ License
#include "fvcGrad.H"
#include "coupledFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
template<class Type, class Limiter, template<class> class LimitFunc>
Foam::tmp<Foam::surfaceScalarField>
Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
void Foam::LimitedScheme<Type, Limiter, LimitFunc>::calcLimiter
(
const GeometricField<Type, fvPatchField, volMesh>& phi
const GeometricField<Type, fvPatchField, volMesh>& phi,
surfaceScalarField& limiterField
) const
{
const fvMesh& mesh = this->mesh();
tmp<surfaceScalarField> tLimiter
(
new surfaceScalarField
(
IOobject
(
type() + "Limiter(" + phi.name() + ')',
mesh.time().timeName(),
mesh
),
mesh,
dimless
)
);
surfaceScalarField& lim = tLimiter();
tmp<GeometricField<typename Limiter::phiType, fvPatchField, volMesh> >
tlPhi = LimitFunc<Type>()(phi);
@ -73,7 +57,7 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
const vectorField& C = mesh.C();
scalarField& pLim = lim.internalField();
scalarField& pLim = limiterField.internalField();
forAll(pLim, face)
{
@ -92,7 +76,8 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
);
}
surfaceScalarField::GeometricBoundaryField& bLim = lim.boundaryField();
surfaceScalarField::GeometricBoundaryField& bLim =
limiterField.boundaryField();
forAll(bLim, patchi)
{
@ -143,8 +128,80 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
pLim = 1.0;
}
}
}
return tLimiter;
// * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * * //
template<class Type, class Limiter, template<class> class LimitFunc>
Foam::tmp<Foam::surfaceScalarField>
Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
(
const GeometricField<Type, fvPatchField, volMesh>& phi
) const
{
const fvMesh& mesh = this->mesh();
const word limiterFieldName(type() + "Limiter(" + phi.name() + ')');
if (this->mesh().cache("limiter"))
{
if (!mesh.foundObject<surfaceScalarField>(limiterFieldName))
{
surfaceScalarField* limiterField
(
new surfaceScalarField
(
IOobject
(
limiterFieldName,
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimless
)
);
mesh.objectRegistry::store(limiterField);
}
surfaceScalarField& limiterField =
const_cast<surfaceScalarField&>
(
mesh.lookupObject<surfaceScalarField>
(
limiterFieldName
)
);
calcLimiter(phi, limiterField);
return limiterField;
}
else
{
tmp<surfaceScalarField> tlimiterField
(
new surfaceScalarField
(
IOobject
(
limiterFieldName,
mesh.time().timeName(),
mesh
),
mesh,
dimless
)
);
calcLimiter(phi, tlimiterField());
return tlimiterField;
}
}

11
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,7 +57,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class LimitedScheme Declaration
Class LimitedScheme Declaration
\*---------------------------------------------------------------------------*/
template<class Type, class Limiter, template<class> class LimitFunc>
@ -68,6 +68,13 @@ class LimitedScheme
{
// Private Member Functions
//- Calculate the limiter
void calcLimiter
(
const GeometricField<Type, fvPatchField, volMesh>& phi,
surfaceScalarField& limiterField
) const;
//- Disallow default bitwise copy construct
LimitedScheme(const LimitedScheme&);

40
src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
View File

@ -91,25 +91,14 @@ void Foam::writeRegisteredObject::write()
{
Info<< type() << " " << name_ << " output:" << nl;
DynamicList<word> allNames(obr_.toc().size());
forAll(objectNames_, i)
{
if (obr_.foundObject<regIOobject>(objectNames_[i]))
wordList names(obr_.names<regIOobject>(objectNames_[i]));
if (names.size())
{
regIOobject& obj =
const_cast<regIOobject&>
(
obr_.lookupObject<regIOobject>(objectNames_[i])
);
if (exclusiveWriting_)
{
// Switch off automatic writing to prevent double write
obj.writeOpt() = IOobject::NO_WRITE;
}
Info<< " writing object " << obj.name() << nl << endl;
obj.write();
allNames.append(names);
}
else
{
@ -119,6 +108,25 @@ void Foam::writeRegisteredObject::write()
<< endl;
}
}
forAll(allNames, i)
{
regIOobject& obj =
const_cast<regIOobject&>
(
obr_.lookupObject<regIOobject>(allNames[i])
);
if (exclusiveWriting_)
{
// Switch off automatic writing to prevent double write
obj.writeOpt() = IOobject::NO_WRITE;
}
Info<< " writing object " << obj.name() << nl << endl;
obj.write();
}
}

4
src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
View File

@ -74,7 +74,7 @@ SourceFiles
#ifndef writeRegisteredObject_H
#define writeRegisteredObject_H
#include "wordList.H"
#include "wordReList.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -110,7 +110,7 @@ protected:
// Read from dictionary
//- Names of objects to control
wordList objectNames_;
wordReList objectNames_;
// Private Member Functions

13
src/thermophysicalModels/basic/basicThermo/basicThermo.H
View File

@ -405,32 +405,35 @@ public:
//- Thermal diffusivity for temperature of mixture [J/m/s/K]
virtual tmp<volScalarField> kappa() const = 0;
//- Thermal diffusivity of mixture for patch [J/m/s/K]
//- Thermal diffusivity for temperature
// of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappa
(
const label patchi
) const = 0;
//- Effective thermal diffusivity of mixture [J/m/s/K]
//- Effective thermal diffusivity for temperature
// of mixture [J/m/s/K]
virtual tmp<volScalarField> kappaEff
(
const volScalarField&
) const = 0;
//- Effective thermal diffusivity of mixture for patch [J/m/s/K]
//- Effective thermal diffusivity for temperature
// of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappaEff
(
const scalarField& alphat,
const label patchi
) const = 0;
//- Effective thermal diffusivity of mixture [J/m/s/K]
//- Effective thermal diffusivity of mixture [kg/m/s]
virtual tmp<volScalarField> alphaEff
(
const volScalarField& alphat
) const = 0;
//- Effective thermal diffusivity of mixture for patch [J/m/s/K]
//- Effective thermal diffusivity of mixture for patch [kg/m/s]
virtual tmp<scalarField> alphaEff
(
const scalarField& alphat,

14
src/thermophysicalModels/basic/heThermo/heThermo.H
View File

@ -259,30 +259,32 @@ public:
//- Thermal diffusivity for temperature of mixture [J/m/s/K]
virtual tmp<volScalarField> kappa() const;
//- Thermal diffusivity of mixture for patch [J/m/s/K]
//- Thermal diffusivity for temperature
// of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappa
(
const label patchi
) const;
//- Effective thermal diffusivity of mixture [J/m/s/K]
//- Effective thermal diffusivity for temperature
// of mixture [J/m/s/K]
virtual tmp<volScalarField> kappaEff(const volScalarField&) const;
//- Effective thermal diffusivity of mixture for patch [J/m/s/K]
//- Effective thermal diffusivity for temperature
// of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappaEff
(
const scalarField& alphat,
const label patchi
) const;
//- Effective thermal diffusivity of mixture [J/m/s/K]
//- Effective thermal diffusivity of mixture [kg/m/s]
virtual tmp<volScalarField> alphaEff
(
const volScalarField& alphat
) const;
//- Effective thermal diffusivity of mixture for patch [J/m/s/K]
//- Effective thermal diffusivity of mixture for patch [kg/m/s]
virtual tmp<scalarField> alphaEff
(
const scalarField& alphat,

7
src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H
View File

@ -47,14 +47,11 @@ SourceFiles
#ifndef viscosityModel_H
#define viscosityModel_H
#include "IOdictionary.H"
#include "typeInfo.H"
#include "runTimeSelectionTables.H"
#include "dictionary.H"
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
#include "dimensionedScalar.H"
#include "tmp.H"
#include "autoPtr.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/fvSchemes
View File

@ -30,8 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinearV 1;
div(phi,Yi_h) Gauss limitedLinear01 1;
div(phi,h) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;

3
tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
View File

@ -30,8 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinearV 1;
div(phi,Yi_h) Gauss limitedLinear01 1;
div(phi,h) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;

8
tutorials/incompressible/pimpleDyMFoam/propeller/Allclean
View File

@ -5,10 +5,10 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove surface
\rm -f constant/triSurface/propellerTip.obj.gz
\rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
cleanCase
\rm -rf 0
\rm -rf constant/extendedFeatureEdgeMesh/
\rm -f constant/triSurface/*.eMesh*
\rm -rf 0 > /dev/null 2>&1
\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
\rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1

8
tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean
View File

@ -4,10 +4,10 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
rm *.obj
rm -r constant/extendedFeatureEdgeMesh
rm constant/triSurface/boundaryAndFaceZones.eMesh
rm constant/polyMesh/boundary
rm *.obj > /dev/null 2>&1
rm -r constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm constant/triSurface/boundaryAndFaceZones.eMesh > /dev/null 2>&1
rm constant/polyMesh/boundary > /dev/null 2>&1
cleanCase

6
tutorials/incompressible/simpleFoam/motorBike/Allclean
View File

@ -4,9 +4,9 @@
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove surface and features
\rm -f constant/triSurface/motorBike.obj.gz
\rm -rf constant/extendedFeatureEdgeMesh/
\rm -f constant/triSurface/motorBike.eMesh
\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
rm -rf 0 > /dev/null 2>&1

3
tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
View File

@ -30,8 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinearV 1;
div(phi,Yi_h) Gauss limitedLinear01 1;
div(phi,h) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;

6
tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allclean
View File

@ -6,8 +6,8 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase
\rm -rf 0
\rm -rf constant/extendedFeatureEdgeMesh/
\rm -f constant/triSurface/*.eMesh*
\rm -rf 0 > /dev/null 2>&1
\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
\rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
# ----------------------------------------------------------------- end-of-file

6
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
View File

@ -9,6 +9,6 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase
\rm -rf 0
\rm -rf constant/extendedFeatureEdgeMesh/
\rm -f constant/triSurface/*.eMesh*
\rm -rf 0 > /dev/null 2>&1
\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
\rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1

2
tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
alpha.air
alpha
{
nAlphaCorr 1;
nAlphaSubCycles 2;