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: Integration updates

Browse Source
This commit is contained in:
Andrew Heather
2016-04-28 09:57:03 +01:00
parent f0b404748d
commit af14c117a9
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
View File

@ -195,9 +195,9 @@ void dynamicLagrangian<BasicTurbulenceModel>::correct()
fvm::ddt(alpha, rho, flm_) fvm::ddt(alpha, rho, flm_)
+ fvm::div(alphaRhoPhi, flm_) + fvm::div(alphaRhoPhi, flm_)
== ==
rho*invT*LM alpha*rho*invT*LM
- fvm::Sp(rho*invT, flm_) - fvm::Sp(alpha*rho*invT, flm_)
+ fvOptions(flm_) + fvOptions(alpha, rho, flm_)
); );
flmEqn.relax(); flmEqn.relax();
@ -213,9 +213,9 @@ void dynamicLagrangian<BasicTurbulenceModel>::correct()
fvm::ddt(alpha, rho, fmm_) fvm::ddt(alpha, rho, fmm_)
+ fvm::div(alphaRhoPhi, fmm_) + fvm::div(alphaRhoPhi, fmm_)
== ==
rho*invT*MM alpha*rho*invT*MM
- fvm::Sp(rho*invT, fmm_) - fvm::Sp(alpha*rho*invT, fmm_)
+ fvOptions(fmm_) + fvOptions(alpha, rho, fmm_)
); );
fmmEqn.relax(); fmmEqn.relax();

14
src/fvOptions/Make/files
View File

@ -13,6 +13,12 @@ $(generalSources)/semiImplicitSource/semiImplicitSource.C
derivedSources=sources/derived derivedSources=sources/derived
$(derivedSources)/actuationDiskSource/actuationDiskSource.C $(derivedSources)/actuationDiskSource/actuationDiskSource.C
$(derivedSources)/buoyancyForce/buoyancyForce.C
$(derivedSources)/buoyancyForce/buoyancyForceIO.C
$(derivedSources)/buoyancyEnergy/buoyancyEnergy.C
$(derivedSources)/buoyancyEnergy/buoyancyEnergyIO.C
$(derivedSources)/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
$(derivedSources)/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C
$(derivedSources)/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C $(derivedSources)/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
$(derivedSources)/explicitPorositySource/explicitPorositySource.C $(derivedSources)/explicitPorositySource/explicitPorositySource.C
$(derivedSources)/meanVelocityForce/meanVelocityForce.C $(derivedSources)/meanVelocityForce/meanVelocityForce.C
@ -33,14 +39,6 @@ $(derivedSources)/solidificationMeltingSource/solidificationMeltingSource.C
$(derivedSources)/solidificationMeltingSource/solidificationMeltingSourceIO.C $(derivedSources)/solidificationMeltingSource/solidificationMeltingSourceIO.C
$(derivedSources)/tabulatedAccelerationSource/tabulatedAccelerationSource.C $(derivedSources)/tabulatedAccelerationSource/tabulatedAccelerationSource.C
$(derivedSources)/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C $(derivedSources)/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
/*
$(derivedSources)/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
$(derivedSources)/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C
*/
$(derivedSources)/buoyancyForce/buoyancyForce.C
$(derivedSources)/buoyancyForce/buoyancyForceIO.C
$(derivedSources)/buoyancyEnergy/buoyancyEnergy.C
$(derivedSources)/buoyancyEnergy/buoyancyEnergyIO.C
interRegion = sources/interRegion interRegion = sources/interRegion
$(interRegion)/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C $(interRegion)/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C

16
src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
View File

@ -148,20 +148,26 @@ Foam::tmp<Foam::volScalarField> Foam::pressureTools::convertToCoeff
const volScalarField& p const volScalarField& p
) const ) const
{ {
tmp<volScalarField> tCoeff(p);
if (calcCoeff_) if (calcCoeff_)
{ {
tCoeff.ref() -= dimensionedScalar("pInf", dimPressure, pInf_); tmp<volScalarField> tCoeff(new volScalarField("pCoeff", p));
volScalarField& coeff = tCoeff.ref();
coeff -= dimensionedScalar("pInf", dimPressure, pInf_);
const dimensionedScalar p0("p0", dimPressure, SMALL); const dimensionedScalar p0("p0", dimPressure, SMALL);
const dimensionedVector U("U", dimVelocity, UInf_); const dimensionedVector U("U", dimVelocity, UInf_);
const dimensionedScalar rho("rho", dimDensity, rhoInf_); const dimensionedScalar rho("rho", dimDensity, rhoInf_);
tCoeff.ref() /= 0.5*rho*magSqr(U) + p0; coeff /= 0.5*rho*magSqr(U) + p0;
return tCoeff;
}
else
{
return p;
} }
return tCoeff;
} }