diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C index ec09ef343858351572e5a133c539bfe61c18737a..fb5df1f37015f8f4dfb4db3d12f493d5fae407ee 100644 --- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C +++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C @@ -909,6 +909,8 @@ int main(int argc, char *argv[]) { if (own[faceI] != -1 && nei[faceI] != -1) { + faceToCell[1].insert(faceI, own[faceI]); + faceToCell[0].insert(faceI, nei[faceI]); cnt++; } } diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict index 0b89073b25715e9f8eb21be83212e333bce10f45..c54da3eb040b33ee38221dff35ce37490cf2ec9f 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -21,18 +21,18 @@ nIntervals 20; nSamples 10000; // Type of pdf -pdfType RosinRammler; +type RosinRammler; // Write data flag writeData true; // PDF model coefficients -RosinRammlerPDF +RosinRammlerDistribution { minValue 1e-06; maxValue 200e-06; - d (60.0e-06); - n (0.8); + d 60.0e-06; + n 0.8; } // ************************************************************************* // diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C index f8f513322c6d821cd5e39b7721cbfd57da2d770a..479c56db0e8787e583b92c80e865086921ea043d 100644 --- a/src/OpenFOAM/global/debug/debug.C +++ b/src/OpenFOAM/global/debug/debug.C @@ -95,10 +95,18 @@ Foam::dictionary& Foam::debug::controlDict() controlDictPtr_ = new dictionary(); forAllReverse(controlDictFiles, cdfi) { - controlDictPtr_->merge - ( - dictionary(IFstream(controlDictFiles[cdfi])()) - ); + IFstream ifs(controlDictFiles[cdfi]); + + if (!ifs.good()) + { + SafeFatalIOErrorIn + ( + "debug::controlDict()", + ifs, + "Cannot open controlDict" + ); + } + controlDictPtr_->merge(dictionary(ifs)); } } diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C index 803190a4a197337af6907b42681de15a69947eae..44ea1691af47a20f24ad05e298073eb3591f9acd 100644 --- a/src/sampling/sampledSet/sampledSets/sampledSets.C +++ b/src/sampling/sampledSet/sampledSets/sampledSets.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -282,10 +282,6 @@ void Foam::sampledSets::correct() bool setsFound = dict_.found("sets"); if (setsFound) { - // reset interpolation - pointMesh::Delete(mesh_); - volPointInterpolation::Delete(mesh_); - searchEngine_.correct(); PtrList<sampledSet> newList diff --git a/src/turbulenceModels/compressible/RAS/v2f/v2f.C b/src/turbulenceModels/compressible/RAS/v2f/v2f.C index c3fae0f03e271f0b3bdf17c8ee3dacd23e4c44cd..ec0c37363ddb6b511b0728d31a9d4480df523ba5 100644 --- a/src/turbulenceModels/compressible/RAS/v2f/v2f.C +++ b/src/turbulenceModels/compressible/RAS/v2f/v2f.C @@ -406,9 +406,11 @@ void v2f::correct() "v2f::alpha", 1.0/T*((C1_ - N)*v2_ - 2.0/3.0*k_*(C1_ - 1.0)) ); - - tmp<volScalarField> Ceps1 = - 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0))); + const volScalarField Ceps1 + ( + "Ceps1", + 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0))) + ); // Update epsilon (and possibly G) at the wall epsilon_.boundaryField().updateCoeffs(); @@ -420,7 +422,7 @@ void v2f::correct() + fvm::div(phi_, epsilon_) - fvm::laplacian(DepsilonEff(), epsilon_) == - Ceps1()*G/T + Ceps1*G/T - fvm::SuSp(((2.0/3.0)*Ceps1 + Ceps3_)*rho_*divU, epsilon_) - fvm::Sp(Ceps2_*rho_/T, epsilon_) );