diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C index 520a0c7726c564a34155732d96ded4e60368f7d3..8e9cc672800730b210db7fefa47be6a8e21d7622 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C @@ -195,9 +195,9 @@ void dynamicLagrangian<BasicTurbulenceModel>::correct() fvm::ddt(alpha, rho, flm_) + fvm::div(alphaRhoPhi, flm_) == - rho*invT*LM - - fvm::Sp(rho*invT, flm_) - + fvOptions(flm_) + alpha*rho*invT*LM + - fvm::Sp(alpha*rho*invT, flm_) + + fvOptions(alpha, rho, flm_) ); flmEqn.relax(); @@ -213,9 +213,9 @@ void dynamicLagrangian<BasicTurbulenceModel>::correct() fvm::ddt(alpha, rho, fmm_) + fvm::div(alphaRhoPhi, fmm_) == - rho*invT*MM - - fvm::Sp(rho*invT, fmm_) - + fvOptions(fmm_) + alpha*rho*invT*MM + - fvm::Sp(alpha*rho*invT, fmm_) + + fvOptions(alpha, rho, fmm_) ); fmmEqn.relax(); diff --git a/src/fvOptions/Make/files b/src/fvOptions/Make/files index e3778435f72998d6cd3763f4921185fcc375f191..6e74683868e4d575219757c8034002aaff62a8ce 100644 --- a/src/fvOptions/Make/files +++ b/src/fvOptions/Make/files @@ -13,6 +13,12 @@ $(generalSources)/semiImplicitSource/semiImplicitSource.C derivedSources=sources/derived $(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)/explicitPorositySource/explicitPorositySource.C $(derivedSources)/meanVelocityForce/meanVelocityForce.C @@ -33,14 +39,6 @@ $(derivedSources)/solidificationMeltingSource/solidificationMeltingSource.C $(derivedSources)/solidificationMeltingSource/solidificationMeltingSourceIO.C $(derivedSources)/tabulatedAccelerationSource/tabulatedAccelerationSource.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)/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C index 67677062a6d4727478fe9126fd444d568f062a5a..cd13ce8b37fd364e7ab023f613d26bab3a564549 100644 --- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C +++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C @@ -148,20 +148,26 @@ Foam::tmp<Foam::volScalarField> Foam::pressureTools::convertToCoeff const volScalarField& p ) const { - tmp<volScalarField> tCoeff(p); - 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 dimensionedVector U("U", dimVelocity, UInf_); 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; }