Merge remote-tracking branch 'origin/merge-foundation' into adjust-config-foundation-merge

This commit is contained in:
Mark Olesen
2016-09-30 17:50:20 +02:00
1233 changed files with 6078 additions and 1618 deletions

View File

@ -86,6 +86,27 @@ int main(int argc, char *argv[])
"specify alternative dictionary for the blockMesh description"
);
argList::addNote
(
"Block description\n"
"\n"
" For a given block, the correspondence between the ordering of\n"
" vertex labels and face labels is shown below.\n"
" For vertex numbering in the sequence 0 to 7 (block, centre):\n"
" faces 0 (f0) and 1 are left and right, respectively;\n"
" faces 2 and 3 are bottom and top;\n"
" and faces 4 and 5 are front the back:\n"
"\n"
" 4 ---- 5\n"
" f3 |\\ |\\ f5\n"
" | | 7 ---- 6 \\\n"
" | 0 |--- 1 | \\\n"
" | \\| \\| f4\n"
" f2 3 ---- 2\n"
"\n"
" f0 ----- f1\n"
);
#include "addRegionOption.H"
#include "setRootCase.H"
#include "createTime.H"

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -640,11 +640,14 @@ int main(int argc, char *argv[])
geometry,
surfaces
);
// Patch fields
volScalarField::Boundary& cellDistanceBf =
cellDistance.boundaryFieldRef();
forAll(fvm.C().boundaryField(), patchi)
{
const pointField& cc = fvm.C().boundaryField()[patchi];
fvPatchScalarField& fld = cellDistance.boundaryField()[patchi];
fvPatchScalarField& fld = cellDistanceBf[patchi];
scalarField patchDistSqr
(
fld.patch().patchInternalField(distSqr)