songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-dev-OpenCFD into develop

Browse Source
This commit is contained in:
sergio 2015-12-15 10:16:20 -08:00
commit 40ef1d63e6
4 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -379,9 +379,9 @@ void Foam::ParticleCollector<CloudType>::collectParcelConcentricCircles
scalar(nSector_)*theta/constant::mathematical::twoPi
);
}
}
hitFaceIDs_.append(secI);
hitFaceIDs_.append(secI);
}
}

23
src/meshTools/searchableSurface/searchableCone.C
View File

@ -1075,21 +1075,6 @@ void Foam::searchableCone::getVolumeType
volType.setSize(points.size());
volType = volumeType::INSIDE;
scalar magDir = magDir_;
bool swap = false;
bool swapInner = false;
if (radius1_ > radius2_)
{
swap = true;
}
if (innerRadius1_ > innerRadius2_)
{
swapInner = true;
}
forAll(points, pointI)
{
const point& pt = points[pointI];
@ -1100,15 +1085,7 @@ void Foam::searchableCone::getVolumeType
scalar parallel = v & unitDir_;
scalar comp = parallel;
scalar compInner = parallel;
if (swap)
{
comp = -(magDir-parallel);
}
if (swapInner)
{
compInner = -(magDir-parallel);
}
scalar radius_sec = radius1_+comp*(radius2_-radius1_)/magDir_;

6
src/sampling/probes/probes.C
View File

@ -132,8 +132,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
<< " seems to be on multiple domains:"
<< " cell " << elementList_[probeI]
<< " on my domain " << Pstream::myProcNo()
<< " and cell " << cellI << " on some other domain."
<< endl
<< " and cell " << cellI << " on some other domain." << endl
<< "This might happen if the probe location is on"
<< " a processor patch. Change the location slightly"
<< " to prevent this." << endl;
@ -146,8 +145,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
<< " seems to be on multiple domains:"
<< " cell " << faceList_[probeI]
<< " on my domain " << Pstream::myProcNo()
<< " and face " << faceI << " on some other domain."
<< endl
<< " and face " << faceI << " on some other domain." << endl
<< "This might happen if the probe location is on"
<< " a processor patch. Change the location slightly"
<< " to prevent this." << endl;

4
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles
View File

@ -3,7 +3,7 @@
# ========= | #
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox #
# \\ / O peration | Version: dev #
# \\ / A nd | Web: www.OpenFOAM.com #
# \\ / A nd | Web: www.OpenFOAM.org #
# \\/ M anipulation | #
#-----------------------------------------------------------------------------#
cd ${0%/*} || exit 1 # Run from this directory
@ -71,7 +71,7 @@ for xi in $(seq 1 1 $nx); do
echo "processing cube $n"
pad=""
if [ $n -lt 10]; then
if [ $n -lt 10 ]; then
pad="0"
fi