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 remote-tracking branch 'origin/develop' into develop-pre-release

Browse Source
This commit is contained in:
Andrew Heather
2018-05-17 12:14:27 +01:00
parent 7ac5d76773 fe80e3b4ed
commit f700bce878
51 changed files with 1224 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
View File

@ -54,7 +54,7 @@ namespace Foam
void Foam::cylindrical::init
(
const objectRegistry& obr,
const List<label>& cells
const labelUList& cells
)
{
const polyMesh& mesh = refCast<const polyMesh>(obr);
@ -196,7 +196,7 @@ void Foam::cylindrical::updateCells
forAll(cells, i)
{
label celli = cells[i];
const label celli = cells[i];
vector dir = cc[celli] - origin_;
dir /= mag(dir) + VSMALL;

3
src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
View File

@ -52,6 +52,7 @@ SourceFiles
#include "point.H"
#include "vector.H"
#include "ListOps.H"
#include "coordinateRotation.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -85,7 +86,7 @@ class cylindrical
void init
(
const objectRegistry& obr,
const List<label>& cells = List<label>()
const labelUList& cells = Foam::emptyLabelList
);

8
src/meshTools/sets/cellSources/regionToCell/regionToCell.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 | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -86,11 +86,7 @@ void Foam::regionToCell::markRegionFaces
{
label facei = pp.start()+i;
label bFacei = facei-mesh_.nInternalFaces();
if
(
selectedCell[faceCells[i]]
!= selectedCell[nbrSelected[bFacei]]
)
if (selectedCell[faceCells[i]] != nbrSelected[bFacei])
{
regionFace[facei] = true;
}