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

GIT: Resolve merge conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-10-15 17:14:13 +01:00
parent 7b7967de76 4d1159e685
commit 57547918a6
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
View File

@ -3939,17 +3939,11 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
Info<< "Setting cellZones according to named surfaces:" << endl;
forAll(namedSurfaces, i)
{
<<<<<<< HEAD
const vectorField smallVec(ROOTSMALL*(end-start));
start -= smallVec;
end += smallVec;
=======
label surfI = namedSurfaces[i];
Info<< "Surface : " << surfaces_.names()[surfI] << nl
<< " faceZone : " << surfZones[surfI].faceZoneName() << nl
<< " cellZone : " << surfZones[surfI].cellZoneName() << endl;
>>>>>>> ENH: snappyHexMesh: various improvements. See below or the default snappyHexMeshDict.
}
Info<< endl;
@ -4016,7 +4010,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
// Extend segments a bit
{
const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
const vectorField smallVec(ROOTSMALL*(end-start));
start -= smallVec;
end += smallVec;
}