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

MRG: merged develop line back into integration branch

Browse Source
This commit is contained in:
Andrew Heather
2017-05-18 11:11:12 +01:00
parent 8ff163713d 568570d2be
commit 2e9bead519
514 changed files with 12134 additions and 16093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sampling/probes/patchProbesTemplates.C
View File

@ -115,7 +115,7 @@ void Foam::patchProbes::sampleAndWrite
if
(
iter != objectRegistry::end()
iter.found()
&& iter()->type()
== GeometricField<Type, fvPatchField, volMesh>::typeName
)
@ -167,7 +167,7 @@ void Foam::patchProbes::sampleAndWriteSurfaceFields
if
(
iter != objectRegistry::end()
iter.found()
&& iter()->type()
== GeometricField<Type, fvsPatchField, surfaceMesh>::typeName
)

4
src/sampling/probes/probesTemplates.C
View File

@ -141,7 +141,7 @@ void Foam::probes::sampleAndWrite(const fieldGroup<Type>& fields)
if
(
iter != objectRegistry::end()
iter.found()
&& iter()->type()
== GeometricField<Type, fvPatchField, volMesh>::typeName
)
@ -190,7 +190,7 @@ void Foam::probes::sampleAndWriteSurfaceFields(const fieldGroup<Type>& fields)
if
(
iter != objectRegistry::end()
iter.found()
&& iter()->type()
== GeometricField<Type, fvsPatchField, surfaceMesh>::typeName
)

2
src/sampling/sampledSet/patchSeed/patchSeedSet.C
View File

@ -227,7 +227,7 @@ void Foam::patchSeedSet::calcSamples
{
forAll(subset, i)
{
label j = rndGen.integer(0, subset.size()-1);
label j = rndGen.position<label>(0, subset.size()-1);
Swap(subset[i], subset[j]);
}
}

4
src/sampling/sampledSurface/sampledPlane/sampledPlane.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -139,7 +139,7 @@ bool Foam::sampledPlane::update()
labelList selectedCells = mesh().cellZones().findMatching(zoneKey_).used();
if (selectedCells.empty())
if (returnReduce(selectedCells.empty(), andOp<bool>()))
{
reCut(mesh(), triangulate_);
}

10
src/sampling/surface/isoSurface/isoSurface.C
View File

@ -24,21 +24,11 @@ License
\*---------------------------------------------------------------------------*/
#include "isoSurface.H"
#include "fvMesh.H"
#include "mergePoints.H"
#include "addToRunTimeSelectionTable.H"
#include "slicedVolFields.H"
#include "volFields.H"
#include "surfaceFields.H"
#include "OFstream.H"
#include "meshTools.H"
#include "triSurfaceSearch.H"
#include "triSurfaceTools.H"
#include "surfaceIntersection.H"
#include "intersectedSurface.H"
#include "searchableBox.H"
#include "triSurface.H"
#include "triSurfaceMesh.H"
#include "triPoints.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //