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 /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2013-12-03 11:10:07 +00:00
parent dda3459f0d fbffbdb185
commit cfd7d5159d
4 changed files with 72 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
View File

@ -109,6 +109,16 @@ int main(int argc, char *argv[])
}
}
// - All patches which are not agglomarated are identity for finalAgglom
forAll(boundary, patchId)
{
if (finalAgglom[patchId].size() == 0)
{
finalAgglom[patchId] = identity(boundary[patchId].size());
}
}
// Sync agglomeration across coupled patches
labelList nbrAgglom(mesh.nFaces() - mesh.nInternalFaces(), -1);

33
src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
View File

@ -83,11 +83,19 @@ void Foam::pairPatchAgglomeration::setBasedEdgeWeights()
facePairWeight_[edgeCommon] = -1.0;
}
}
else if (eFaces.size() == 3)
else
{
facePairWeight_.insert(edge(eFaces[1], eFaces[0]), -1.0);
facePairWeight_.insert(edge(eFaces[2], eFaces[0]), -1.0);
facePairWeight_.insert(edge(eFaces[1], eFaces[2]), -1.0);
forAll(eFaces, j)
{
for (label k = j+1; k<eFaces.size(); k++)
{
facePairWeight_.insert
(
edge(eFaces[j], eFaces[k]),
-1.0
);
}
}
}
}
}
@ -154,11 +162,20 @@ void Foam::pairPatchAgglomeration::setEdgeWeights
facePairWeight_[edgeCommon] = -1.0;
}
}
else if (eFaces.size() == 3)
else
{
facePairWeight_.insert(edge(eFaces[1], eFaces[0]), -1.0);
facePairWeight_.insert(edge(eFaces[2], eFaces[0]), -1.0);
facePairWeight_.insert(edge(eFaces[1], eFaces[2]), -1.0);
// Set edge as barrier by setting weight to -1
forAll(eFaces, j)
{
for (label k = j+1; k<eFaces.size(); k++)
{
facePairWeight_.insert
(
edge(eFaces[j], eFaces[k]),
-1.0
);
}
}
}
}
}

2
src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
View File

@ -200,7 +200,7 @@ void Foam::radiation::viewFactor::initialise()
{
sumF += Fmatrix_()[i][j];
}
scalar delta = 1.0 - sumF;
scalar delta = sumF - 1.0;
for (label j=0; j<totalNCoarseFaces_; j++)
{
Fmatrix_()[i][j] *= (1.0 - delta/(sumF + 0.001));

36
tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot Normal file
View File

@ -0,0 +1,36 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object soot;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
".*"
{
type calculate;
}
frontAndBack
{
type empty;
}
}
// ************************************************************************* //