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/master' into develop

Browse Source
This commit is contained in:
Andrew Heather
2020-03-13 12:41:33 +00:00
parent 38334ed15a 989fda3b18
commit 1a6824f9e4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -78,18 +79,18 @@ Foam::point Foam::BSpline::position
const point& p0 = points()[segment]; const point& p0 = points()[segment];
const point& p1 = points()[segment+1]; const point& p1 = points()[segment+1];
// special cases - no calculation needed // Special cases - no calculation needed
if (mu <= 0.0) // Note: only checks at overall endpoints
if ((segment == 0) && (mu <= 0.0))
{ {
return p0; return p0;
} }
else if (mu >= 1.0) else if ((segment == nSegments() - 1) && (mu >= 1.0))
{ {
return p1; return p1;
} }
// Determine the end points
// determine the end points
point e0; point e0;
point e1; point e1;
@ -113,7 +114,6 @@ Foam::point Foam::BSpline::position
e1 = points()[segment+2]; e1 = points()[segment+2];
} }
return 1.0/6.0 * return 1.0/6.0 *
( (
( e0 + 4*p0 + p1 ) ( e0 + 4*p0 + p1 )