mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' into cvm
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
|
||||
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -453,6 +453,7 @@ void Foam::createShellMesh::setRefinement
|
||||
label region0 = pointRegions_[eFaces[0]][fp0];
|
||||
label region1 = pointRegions_[eFaces[0]][fp1];
|
||||
|
||||
// Pick up points with correct normal
|
||||
if (layerI == 0)
|
||||
{
|
||||
newF[0] = f[fp0];
|
||||
@ -468,6 +469,22 @@ void Foam::createShellMesh::setRefinement
|
||||
newF[3] = addedPoints[nLayers*region0+layerI];
|
||||
}
|
||||
|
||||
// Optionally rotate so e[0] is always 0th vertex. Note that
|
||||
// this normally is automatically done by coupled face ordering
|
||||
// but with NOORDERING we have to do it ourselves.
|
||||
if (f[fp0] != e[0])
|
||||
{
|
||||
// rotate one back to get newF[1] (originating from e[0])
|
||||
// into newF[0]
|
||||
label v0 = newF[0];
|
||||
for (label i = 0; i < newF.size()-1; i++)
|
||||
{
|
||||
newF[i] = newF[newF.fcIndex(i)];
|
||||
}
|
||||
newF.last() = v0;
|
||||
}
|
||||
|
||||
|
||||
label minCellI = addedCells[nLayers*eFaces[0]+layerI];
|
||||
label maxCellI;
|
||||
label patchI;
|
||||
@ -569,6 +586,21 @@ void Foam::createShellMesh::setRefinement
|
||||
newF[3] = addedPoints[nLayers*region0+layerI];
|
||||
}
|
||||
|
||||
|
||||
// Optionally rotate so e[0] is always 0th vertex. Note that
|
||||
// this normally is automatically done by coupled face
|
||||
// ordering but with NOORDERING we have to do it ourselves.
|
||||
if (f[fp0] != e[0])
|
||||
{
|
||||
// rotate one back to get newF[1] (originating
|
||||
// from e[0]) into newF[0].
|
||||
label v0 = newF[0];
|
||||
for (label i = 0; i < newF.size()-1; i++)
|
||||
{
|
||||
newF[i] = newF[newF.fcIndex(i)];
|
||||
}
|
||||
newF.last() = v0;
|
||||
}
|
||||
////if (ePatches.size() == 0)
|
||||
//{
|
||||
// Pout<< "Adding from MULTI face:"
|
||||
|
||||
@ -220,7 +220,7 @@ snapControls
|
||||
//- Maximum relative distance for points to be attracted by surface.
|
||||
// True distance is this factor times local maximum edge length.
|
||||
// Note: changed(corrected) w.r.t 17x! (17x used 2* tolerance)
|
||||
tolerance 2.0;
|
||||
tolerance 1.0;
|
||||
|
||||
//- Number of mesh displacement relaxation iterations.
|
||||
nSolveIter 30;
|
||||
@ -228,6 +228,10 @@ snapControls
|
||||
//- Maximum number of snapping relaxation iterations. Should stop
|
||||
// before upon reaching a correct mesh.
|
||||
nRelaxIter 5;
|
||||
|
||||
//- Highly experimental and wip: number of feature edge snapping
|
||||
// iterations. Leave out altogether to disable.
|
||||
//nFeatureSnapIter 10;
|
||||
}
|
||||
|
||||
|
||||
@ -258,6 +262,9 @@ addLayersControls
|
||||
|
||||
|
||||
//- Wanted thickness of final added cell layer. If multiple layers
|
||||
// is the
|
||||
// thickness of the layer furthest away from the wall.
|
||||
// Relative to undistorted size of cell outside layer.
|
||||
// is the thickness of the layer furthest away from the wall.
|
||||
// See relativeSizes parameter.
|
||||
finalLayerThickness 0.3;
|
||||
@ -410,7 +417,7 @@ debug 0;
|
||||
|
||||
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
|
||||
// Note: the write tolerance needs to be higher than this.
|
||||
mergeTolerance 1E-6;
|
||||
mergeTolerance 1e-6;
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
Reference in New Issue
Block a user