Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

2014-01-27 16:50:46 +00:00 · 2014-01-27 16:50:46 +00:00 · cecf49d576
commit cecf49d576
parent c380695ead b0cb741881
11 changed files with 27 additions and 13 deletions
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/EEqns.H
@ -2,8 +2,8 @@
    volScalarField& he1 = thermo1.he();
    volScalarField& he2 = thermo2.he();

-    volScalarField Cpv1(thermo1.Cpv());
-    volScalarField Cpv2(thermo2.Cpv());
+    volScalarField Cpv1("Cpv1", thermo1.Cpv());
+    volScalarField Cpv2("Cpv2", thermo2.Cpv());

    volScalarField heatTransferCoeff(fluid.heatTransferCoeff());

--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@ -66,6 +66,7 @@

    volVectorField DDtU1
    (
+        "DDtU1",
        fvc::ddt(U1)
      + fvc::div(phi1, U1)
      - fvc::div(phi1)*U1
@ -73,6 +74,7 @@

    volVectorField DDtU2
    (
+        "DDtU2",
        fvc::ddt(U2)
      + fvc::div(phi2, U2)
      - fvc::div(phi2)*U2
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@ -1,6 +1,6 @@
 {
-    surfaceScalarField alpha1f(fvc::interpolate(alpha1));
-    surfaceScalarField alpha2f(scalar(1) - alpha1f);
+    surfaceScalarField alpha1f("alpha1f", fvc::interpolate(alpha1));
+    surfaceScalarField alpha2f("alpha2f", scalar(1) - alpha1f);

    rAU1 = 1.0/U1Eqn.A();
    rAU2 = 1.0/U2Eqn.A();
@ -189,7 +189,7 @@

        if (pimple.finalNonOrthogonalIter())
        {
-            surfaceScalarField mSfGradp(pEqnIncomp.flux()/rAUf);
+            surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);

            phi1.boundaryField() ==
                mrfZones.relative
--- a/src/TurbulenceModels/phaseIncompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
+++ b/src/TurbulenceModels/phaseIncompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
@ -603,6 +603,8 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
        // Update k, epsilon and G at the wall
        kl.boundaryField().updateCoeffs();
        epsilonl.boundaryField().updateCoeffs();
+
+        Gc().checkOut();
    }

    tmp<volScalarField> Gd;
@ -621,6 +623,8 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correct()
        // Update k, epsilon and G at the wall
        kg.boundaryField().updateCoeffs();
        epsilong.boundaryField().updateCoeffs();
+
+        Gd().checkOut();
    }

    // Mixture turbulence generation
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -79,7 +79,15 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
        )
    ),

-    delta_(LESdelta::New("delta", U.mesh(), LESDict_))
+    delta_
+    (
+        LESdelta::New
+        (
+            IOobject::groupName("delta", U.group()),
+            U.mesh(),
+            LESDict_
+        )
+    )
 {
    // Force the construction of the mesh deltaCoeffs which may be needed
    // for the construction of the derived models and BCs
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/U
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/U
@ -49,7 +49,7 @@ boundaryField
        value           uniform (0 0 0);
    }

-    hull_wall
+    hull
    {
        type            fixedValue;
        value           uniform (0 0 0);
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org
@ -44,7 +44,7 @@ boundaryField
        value           $internalField;
    }

-    hull_wall
+    hull
    {
        type            zeroGradient;
    }
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/k
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/k
@ -44,7 +44,7 @@ boundaryField
        value           $internalField;
    }

-    hull_wall
+    hull
    {
        type            kqRWallFunction;
        value           $internalField;
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/nut
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/nut
@ -42,7 +42,7 @@ boundaryField
        type            zeroGradient;
    }

-    hull_wall
+    hull
    {
        type            nutkWallFunction;
        value           $internalField;
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/omega
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/omega
@ -50,7 +50,7 @@ boundaryField
        value           $internalField;
    }

-    hull_wall
+    hull
    {
        type            omegaWallFunction;
        value           $internalField;
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
@ -48,7 +48,7 @@ boundaryField
        value           $internalField;
    }

-    hull_wall
+    hull
    {
        type            fixedFluxPressure;
        value           $internalField;