diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C index 28ec0eeee7..eb69175ac4 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -156,6 +156,8 @@ tmp ddtScheme::fvcDdtPhiCoeff const fluxFieldType& phiCorr ) { + // Courant number limited formulation + /* tmp tddtCouplingCoeff = scalar(1) - min ( @@ -163,6 +165,16 @@ tmp ddtScheme::fvcDdtPhiCoeff *mesh().time().deltaT()*mesh().deltaCoeffs()/mesh().magSf(), scalar(1) ); + */ + + // Flux normalised formulation + tmp tddtCouplingCoeff = scalar(1) + - min + ( + mag(phiCorr) + /(mag(phi) + dimensionedScalar("small", phi.dimensions(), SMALL)), + scalar(1) + ); surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff.ref(); @@ -203,7 +215,7 @@ tmp ddtScheme::fvcDdtPhiCoeff const volScalarField& rho ) { - return fvcDdtPhiCoeff(U, phi, phiCorr/fvc::interpolate(rho)); + return fvcDdtPhiCoeff(U, phi, phiCorr); } @@ -230,7 +242,7 @@ tmp ddtScheme::fvcDdtPhiCoeff ( U, phi, - (phi - fvc::dotInterpolate(mesh().Sf(), U))/fvc::interpolate(rho) + (phi - fvc::dotInterpolate(mesh().Sf(), U)) ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C index 52e77d20d5..75ef442deb 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -347,6 +347,8 @@ localEulerDdtScheme::fvmDdt } +/* +// Courant number limited formulation template tmp localEulerDdtScheme::fvcDdtPhiCoeff ( @@ -355,6 +357,7 @@ tmp localEulerDdtScheme::fvcDdtPhiCoeff const fluxFieldType& phiCorr ) { + // Courant number limited formulation tmp tddtCouplingCoeff = scalar(1) - min ( @@ -391,6 +394,7 @@ tmp localEulerDdtScheme::fvcDdtPhiCoeff return tddtCouplingCoeff; } +*/ template diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H index edb911607e..c5f3ded8f8 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -215,14 +215,14 @@ public: typedef typename ddtScheme::fluxFieldType fluxFieldType; - using ddtScheme::fvcDdtPhiCoeff; + // using ddtScheme::fvcDdtPhiCoeff; - virtual tmp fvcDdtPhiCoeff - ( - const GeometricField& U, - const fluxFieldType& phi, - const fluxFieldType& phiCorr - ); + // virtual tmp fvcDdtPhiCoeff + // ( + // const GeometricField& U, + // const fluxFieldType& phi, + // const fluxFieldType& phiCorr + // ); virtual tmp fvcDdtUfCorr (