zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2013-03-14 10:51:29 +00:00
parent 5d4073b8a3 0f8fbf35c7
commit a44b1c44ce
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
View File

@ -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++;
}
}

10
applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
View File

@ -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;
}
// ************************************************************************* //

16
src/OpenFOAM/global/debug/debug.C
View File

@ -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));
}
}

6
src/sampling/sampledSet/sampledSets/sampledSets.C
View File

@ -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

10
src/turbulenceModels/compressible/RAS/v2f/v2f.C
View File

@ -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_)
);