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 branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2012-03-30 12:03:12 +01:00
parent 747ba9dd29 e684b76771
commit 6757a6b70d
25 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
View File

@ -440,6 +440,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
existingSurfacePtLocations existingSurfacePtLocations
); );
} }
// else
// {
// vit->setInternal();
// }
} }
else if (vit->ppSlave() || vit->referredExternal()) else if (vit->ppSlave() || vit->referredExternal())
{ {
@ -477,6 +481,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
existingSurfacePtLocations existingSurfacePtLocations
); );
} }
// else
// {
// vit->setInternal();
// }
} }
} }
@ -2697,7 +2705,7 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
// NEED TO REMOVE FROM THE SURFACE TREE... // NEED TO REMOVE FROM THE SURFACE TREE...
surfacePtLocationTreePtr_().remove surfacePtLocationTreePtr_().remove
( (
existingSurfacePtLocations.size() existingSurfacePtLocations.size() - 1
); );
} }

2
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

4
src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
View File

@ -268,7 +268,7 @@ kOmegaSST::kOmegaSST
/ max / max
( (
a1_*omega_, a1_*omega_,
F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_)))) F2()*sqrt(2.0)*mag(symm(fvc::grad(U_)))
) )
); );
mut_.correctBoundaryConditions(); mut_.correctBoundaryConditions();
@ -365,7 +365,7 @@ void kOmegaSST::correct()
// Re-calculate viscosity // Re-calculate viscosity
mut_ = mut_ =
a1_*rho_*k_ a1_*rho_*k_
/max(a1_*omega_, F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_))))); /max(a1_*omega_, F2()*sqrt(2.0)*mag(symm(fvc::grad(U_))));
mut_.correctBoundaryConditions(); mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity // Re-calculate thermal diffusivity

1
tutorials/mesh/cvMesh/blob/Allrun
View File

@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # run from this directory
runApplication blockMesh runApplication blockMesh
runApplication cvMesh runApplication cvMesh
runApplication collapseEdges 1e-3 45
runApplication snappyHexMesh runApplication snappyHexMesh
runApplication checkMesh -constant -allGeometry -allTopology runApplication checkMesh -constant -allGeometry -allTopology

11
tutorials/mesh/cvMesh/blob/system/cvMeshDict
View File

@ -59,7 +59,6 @@ initialPoints
autoDensityCoeffs autoDensityCoeffs
{ {
minCellSizeLimit 0.04;
minLevels 0; minLevels 0;
maxSizeRatio 5.0; maxSizeRatio 5.0;
sampleResolution 5; sampleResolution 5;
@ -150,21 +149,20 @@ motionControl
{ {
priority 1; priority 1;
mode bothSides; mode bothSides;
surfaceCellSizeFunction uniformValue; surfaceCellSizeFunction uniformValue;
uniformValueCoeffs uniformValueCoeffs
{ {
surfaceCellSize 0.04; surfaceCellSize 0.04;
} }
refinementFactor 1;
cellSizeFunction uniformDistance; cellSizeFunction uniformDistance;
uniformDistanceCoeffs uniformDistanceCoeffs
{ {
distance 0.1; distance 0.1;
} }
linearDistanceCoeffs linearDistanceCoeffs
{ {
surfaceCellSize 0.02;
distanceCellSize $defaultCellSize; distanceCellSize $defaultCellSize;
distance 0.1; distance 0.1;
} }
@ -217,14 +215,15 @@ polyMeshFiltering
{ {
writeTetDualMesh false; writeTetDualMesh false;
filterSizeCoeff 0.2; filterSizeCoeff 0.2;
mergeClosenessCoeff 1e-9; mergeClosenessCoeff 1e-3;
edgeMergeAngle 45;
continueFilteringOnBadInitialPolyMesh true; continueFilteringOnBadInitialPolyMesh true;
filterErrorReductionCoeff 0.5; filterErrorReductionCoeff 0.5;
filterCountSkipThreshold 4; filterCountSkipThreshold 4;
surfaceStepFaceAngle 80; surfaceStepFaceAngle 80;
maxCollapseIterations 25; maxCollapseIterations 25;
maxConsecutiveEqualFaceSets 5; maxConsecutiveEqualFaceSets 5;
edgeCollapseGuardFraction 0.3; edgeCollapseGuardFraction 0.1;
maxCollapseFaceToPointSideLengthCoeff 0.35; maxCollapseFaceToPointSideLengthCoeff 0.35;
} }

4
tutorials/mesh/cvMesh/blob/system/decomposeParDict
View File

@ -17,8 +17,8 @@ FoamFile
numberOfSubdomains 8; numberOfSubdomains 8;
method scotch; //method scotch;
// method ptscotch; method ptscotch;
// method hierarchical; // method hierarchical;
simpleCoeffs simpleCoeffs