GeometricTensorField: added transpose function to support a tmp argument.

Use new "T" function to avoid duplicate registration of grad(U) object.
This commit is contained in:
Henry
2010-12-12 21:39:15 +00:00
parent f7c3a8e42c
commit 834aee9965
40 changed files with 45 additions and 41 deletions

View File

@ -157,7 +157,7 @@ int main(int argc, char *argv[])
+ aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + p_neg) + aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + p_neg)
+ aSf*p_pos - aSf*p_neg; + aSf*p_pos - aSf*p_neg;
volTensorField tauMC("tauMC", mu*dev2(fvc::grad(U)().T())); volTensorField tauMC("tauMC", mu*dev2(Foam::T(fvc::grad(U))));
// --- Solve density // --- Solve density
Info<< max(rho) << " " << min(rho) << endl; Info<< max(rho) << " " << min(rho) << endl;

View File

@ -139,7 +139,7 @@ int main(int argc, char *argv[])
+ aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + p_neg) + aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + p_neg)
+ aSf*p_pos - aSf*p_neg; + aSf*p_pos - aSf*p_neg;
volTensorField tauMC("tauMC", mu*dev2(fvc::grad(U)().T())); volTensorField tauMC("tauMC", mu*dev2(Foam::T(fvc::grad(U))));
// --- Solve density // --- Solve density
solve(fvm::ddt(rho) + fvc::div(phi)); solve(fvm::ddt(rho) + fvc::div(phi));

View File

@ -259,7 +259,8 @@ unset MPI_ARCH_PATH MPI_HOME
case "$WM_MPLIB" in case "$WM_MPLIB" in
OPENMPI) OPENMPI)
mpi_version=openmpi-1.4.1 #mpi_version=openmpi-1.4.1
mpi_version=openmpi-1.5
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mpi_version export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mpi_version
# Tell OpenMPI where to find its install directory # Tell OpenMPI where to find its install directory

View File

@ -36,6 +36,7 @@ namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
UNARY_FUNCTION(tensor, tensor, T, transform)
UNARY_FUNCTION(scalar, tensor, tr, transform) UNARY_FUNCTION(scalar, tensor, tr, transform)
UNARY_FUNCTION(sphericalTensor, tensor, sph, transform) UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
UNARY_FUNCTION(symmTensor, tensor, symm, transform) UNARY_FUNCTION(symmTensor, tensor, symm, transform)

View File

@ -49,6 +49,7 @@ namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
UNARY_FUNCTION(tensor, tensor, T, transform)
UNARY_FUNCTION(scalar, tensor, tr, transform) UNARY_FUNCTION(scalar, tensor, tr, transform)
UNARY_FUNCTION(sphericalTensor, tensor, sph, transform) UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
UNARY_FUNCTION(symmTensor, tensor, symm, transform) UNARY_FUNCTION(symmTensor, tensor, symm, transform)

View File

@ -770,7 +770,8 @@ Foam::argList::argList
if (bannerEnabled) if (bannerEnabled)
{ {
Info<< "Monitoring run-time modified files using " Info<< "fileModificationChecking : "
<< "Monitoring run-time modified files using "
<< regIOobject::fileCheckTypesNames << regIOobject::fileCheckTypesNames
[ [
regIOobject::fileModificationChecking regIOobject::fileModificationChecking

View File

@ -134,7 +134,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -143,7 +143,7 @@ tmp<fvVectorMatrix> GenSGSStress::divDevRhoBeff(volVectorField& U) const
fvc::div(rho()*B_ + 0.05*muSgs_*fvc::grad(U)) fvc::div(rho()*B_ + 0.05*muSgs_*fvc::grad(U))
+ fvc::laplacian(0.95*muSgs_, U, "laplacian(muEff,U)") + fvc::laplacian(0.95*muSgs_, U, "laplacian(muEff,U)")
- fvm::laplacian(muEff(), U) - fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(fvc::grad(U)().T())) - fvc::div(mu()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -285,7 +285,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -274,7 +274,7 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U)) fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
+ fvc::laplacian((1.0 - couplingFactor_)*mut_, U) + fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
- fvm::laplacian(muEff(), U) - fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(fvc::grad(U)().T())) - fvc::div(mu()*dev2(T(fvc::grad(U))))
); );
} }
else else
@ -284,7 +284,7 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
fvc::div(rho_*R_) fvc::div(rho_*R_)
+ fvc::laplacian(mut_, U) + fvc::laplacian(mut_, U)
- fvm::laplacian(muEff(), U) - fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(fvc::grad(U)().T())) - fvc::div(mu()*dev2(T(fvc::grad(U))))
); );
} }
} }

View File

@ -303,7 +303,7 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U)) fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
+ fvc::laplacian((1.0 - couplingFactor_)*mut_, U) + fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
- fvm::laplacian(muEff(), U) - fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(fvc::grad(U)().T())) - fvc::div(mu()*dev2(T(fvc::grad(U))))
); );
} }
else else
@ -313,7 +313,7 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
fvc::div(rho_*R_) fvc::div(rho_*R_)
+ fvc::laplacian(mut_, U) + fvc::laplacian(mut_, U)
- fvm::laplacian(muEff(), U) - fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(fvc::grad(U)().T())) - fvc::div(mu()*dev2(T(fvc::grad(U))))
); );
} }
} }

View File

@ -248,7 +248,7 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -247,7 +247,7 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -345,7 +345,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
return return
( (
- fvm::laplacian(muEff_, U) - fvm::laplacian(muEff_, U)
- fvc::div(muEff_*dev2(fvc::grad(U)().T())) - fvc::div(muEff_*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -230,7 +230,7 @@ tmp<fvVectorMatrix> kEpsilon::divDevRhoReff(volVectorField& U) const
return return
( (
- fvm::laplacian(muEff(), U) - fvm::laplacian(muEff(), U)
- fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -327,7 +327,7 @@ tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -194,7 +194,7 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
return return
( (
- fvm::laplacian(muEff(), U) - fvm::laplacian(muEff(), U)
- fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -261,7 +261,7 @@ tmp<fvVectorMatrix> realizableKE::divDevRhoReff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -215,7 +215,7 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
return return
( (
- fvm::laplacian(muEff(), U) - fvm::laplacian(muEff(), U)
- fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
); );
} }

View File

@ -97,7 +97,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevBeff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -96,7 +96,7 @@ tmp<fvVectorMatrix> Smagorinsky2::divDevBeff
return return
( (
- fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -349,7 +349,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevBeff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -435,7 +435,7 @@ tmp<fvVectorMatrix> kOmegaSSTSAS::divDevBeff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -146,7 +146,7 @@ tmp<fvVectorMatrix> laminar::divDevBeff(volVectorField& U) const
{ {
return return
( (
- fvm::laplacian(nu(), U) - fvc::div(nu()*dev(fvc::grad(U)().T())) - fvm::laplacian(nu(), U) - fvc::div(nu()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -199,7 +199,7 @@ tmp<fvVectorMatrix> LamBremhorstKE::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -205,7 +205,7 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -294,7 +294,7 @@ tmp<fvVectorMatrix> LienCubicKE::divDevReff(volVectorField& U) const
( (
fvc::div(nonlinearStress_) fvc::div(nonlinearStress_)
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -358,7 +358,7 @@ tmp<fvVectorMatrix> LienCubicKELowRe::divDevReff(volVectorField& U) const
( (
fvc::div(nonlinearStress_) fvc::div(nonlinearStress_)
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -244,7 +244,7 @@ tmp<fvVectorMatrix> LienLeschzinerLowRe::divDevReff(volVectorField& U) const
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
//- (fvc::grad(U) & fvc::grad(nuEff())) //- (fvc::grad(U) & fvc::grad(nuEff()))
- fvc::div(nuEff()*fvc::grad(U)().T()) - fvc::div(nuEff()*T(fvc::grad(U)))
); );
} }

View File

@ -284,7 +284,7 @@ tmp<fvVectorMatrix> NonlinearKEShih::divDevReff(volVectorField& U) const
( (
fvc::div(nonlinearStress_) fvc::div(nonlinearStress_)
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -215,7 +215,7 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -325,7 +325,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff_, U) - fvm::laplacian(nuEff_, U)
- fvc::div(nuEff_*dev(fvc::grad(U)().T())) - fvc::div(nuEff_*dev(T(fvc::grad(U))))
); );
} }

View File

@ -187,7 +187,7 @@ tmp<fvVectorMatrix> kEpsilon::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -196,7 +196,7 @@ tmp<fvVectorMatrix> kOmega::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -303,7 +303,7 @@ tmp<fvVectorMatrix> kOmegaSST::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -172,7 +172,7 @@ tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -257,7 +257,7 @@ tmp<fvVectorMatrix> qZeta::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -237,7 +237,7 @@ tmp<fvVectorMatrix> realizableKE::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -198,7 +198,7 @@ tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
return return
( (
- fvm::laplacian(nuEff(), U) - fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(fvc::grad(U)().T())) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
); );
} }

View File

@ -36,7 +36,7 @@ divSchemes
div(phi,R) Gauss upwind; div(phi,R) Gauss upwind;
div(R) Gauss linear; div(R) Gauss linear;
div(phi,nuTilda) Gauss upwind; div(phi,nuTilda) Gauss upwind;
div((nuEff*dev(grad(U).T()))) Gauss linear; div((nuEff*dev(T(grad(U))))) Gauss linear;
} }
laplacianSchemes laplacianSchemes