GeometricTensorField: added transpose function to support a tmp argument.

Use new "T" function to avoid duplicate registration of grad(U) object.

GeometricTensorField: added transpose function to support a tmp argument.
Use new "T" function to avoid duplicate registration of grad(U) object.
834aee99 · Henry · f7c3a8e4 · 834aee99 · 834aee99 · 834aee99
Commit 834aee99 authored Dec 12, 2010 by Henry
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
          + aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + 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
        Info<< max(rho) << " " << min(rho) << endl;

--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
          + aphiv_neg*(rho_neg*(e_neg + 0.5*magSqr(U_neg)) + 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(fvm::ddt(rho) + fvc::div(phi));

--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -259,7 +259,8 @@ unset MPI_ARCH_PATH MPI_HOME

 case "$WM_MPLIB" in
 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

    # Tell OpenMPI where to find its install directory

--- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
@@ -36,6 +36,7 @@ namespace Foam

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

+UNARY_FUNCTION(tensor, tensor, T, transform)
 UNARY_FUNCTION(scalar, tensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
 UNARY_FUNCTION(symmTensor, tensor, symm, transform)

--- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
@@ -49,6 +49,7 @@ namespace Foam

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

+UNARY_FUNCTION(tensor, tensor, T, transform)
 UNARY_FUNCTION(scalar, tensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
 UNARY_FUNCTION(symmTensor, tensor, symm, transform)

--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -736,7 +736,7 @@ Foam::argList::argList
        {
            Info<< "Slaves : " << slaveProcs << nl;
            if (roots.size())
-            {                
+            {
                Info<< "Roots  : " << roots << nl;
            }
            Info<< "Pstream initialized with:" << nl
@@ -770,7 +770,8 @@ Foam::argList::argList

    if (bannerEnabled)
    {
-        Info<< "Monitoring run-time modified files using "
+        Info<< "fileModificationChecking : "
+            << "Monitoring run-time modified files using "
            << regIOobject::fileCheckTypesNames
                [
                    regIOobject::fileModificationChecking

--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -134,7 +134,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff(volVectorField& U) const
 {
    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))))
    );
 }


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


--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -285,7 +285,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff(volVectorField& U) const
 {
    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))))
    );
 }


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

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

--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -248,7 +248,7 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
 {
    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))))
    );
 }


--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -247,7 +247,7 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
 {
    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))))
    );
 }


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


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


--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -327,7 +327,7 @@ tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff(volVectorField& U) const
 {
    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))))
    );
 }


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


--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -261,7 +261,7 @@ tmp<fvVectorMatrix> realizableKE::divDevRhoReff(volVectorField& U) const
 {
    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))))
    );
 }


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


--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -97,7 +97,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevBeff(volVectorField& U) const
 {
    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))))
    );
 }