From 4abc681d098377155c513e0b77aec4d66052a7fe Mon Sep 17 00:00:00 2001 From: william Date: Mon, 27 Jan 2014 15:49:05 +0000 Subject: [PATCH 1/2] BUG: Removed duplicate registers in twoPhaseEulerFoam --- .../solvers/multiphase/twoPhaseEulerFoam/EEqns.H | 4 ++-- .../multiphase/twoPhaseEulerFoam/createFields.H | 2 ++ .../solvers/multiphase/twoPhaseEulerFoam/pEqn.H | 6 +++--- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 4 ++++ .../turbulenceModels/LES/LESModel/LESModel.C | 12 ++++++++++-- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/EEqns.H index f53973f0cc..c68d001943 100644 --- 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()); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H index bee6645407..f2e81b03e8 100644 --- 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 diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H index ea3f6bdb33..00d7cef7ed 100644 --- 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 diff --git a/src/TurbulenceModels/phaseIncompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseIncompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C index c759c5f6ad..23d69508bd 100644 --- a/src/TurbulenceModels/phaseIncompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C +++ b/src/TurbulenceModels/phaseIncompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C @@ -603,6 +603,8 @@ void mixtureKEpsilon::correct() // Update k, epsilon and G at the wall kl.boundaryField().updateCoeffs(); epsilonl.boundaryField().updateCoeffs(); + + Gc().checkOut(); } tmp Gd; @@ -621,6 +623,8 @@ void mixtureKEpsilon::correct() // Update k, epsilon and G at the wall kg.boundaryField().updateCoeffs(); epsilong.boundaryField().updateCoeffs(); + + Gd().checkOut(); } // Mixture turbulence generation diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C index 6b4b7b74f8..1019a3ac9f 100644 --- 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::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 From 742d66b73354a1dd72a99d97087b849dc360803e Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 27 Jan 2014 16:30:13 +0000 Subject: [PATCH 2/2] tutorials/multiphase/LTSInterFoam/wigleyHull: Updated hull patch name for new snappyHexMesh --- tutorials/multiphase/LTSInterFoam/wigleyHull/0/U | 2 +- tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org | 2 +- tutorials/multiphase/LTSInterFoam/wigleyHull/0/k | 2 +- tutorials/multiphase/LTSInterFoam/wigleyHull/0/nut | 2 +- tutorials/multiphase/LTSInterFoam/wigleyHull/0/omega | 2 +- tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/U b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/U index cdfb0476f5..88c7022844 100644 --- 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); diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org index 9f0c8ce1fc..6f60c040ca 100644 --- 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; } diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/k b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/k index aad177972c..853af9b0ef 100644 --- 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; diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/nut b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/nut index c36622b550..87b4bf3c28 100644 --- 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; diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/omega b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/omega index cf768115ca..a515138656 100644 --- 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; diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh index d041cce82d..027c48884c 100644 --- 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;