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

2
applications/solvers/combustion/chemFoam/readInitialConditions.H
View File

@ -99,7 +99,7 @@
scalar u0 = hs0 - p0/rho0;
scalar R0 = p0/(rho0*T0);
Rspecific[0] = R0;
scalar integratedHeat = 0.0;
Info << constProp << " will be held constant." << nl

2
applications/test/vectorTools/Test-vectorTools.C
View File

@ -8,7 +8,7 @@ using namespace Foam;
void test(const vector& a, const vector& b, const scalar tolerance)
{
Info<< "Vectors " << a << " and " << b
Info<< "Vectors " << a << " and " << b
<< " are (to tolerance of " << tolerance << "): ";
if (vectorTools::areParallel(a, b, tolerance))

2
applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
View File

@ -252,4 +252,4 @@ public:
#endif
// ************************************************************************* //
// ************************************************************************* //

2
applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C
View File

@ -93,7 +93,7 @@ void Foam::CV2D::insertSurfaceNearPointPairs()
nNearPoints++;
// Correct the edge iterator for the change in the
// Correct the edge iterator for the change in the
// number of edges following the point-pair insertion
eit = Finite_edges_iterator
(

2
applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
View File

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

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

@ -440,6 +440,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
existingSurfacePtLocations
);
}
// else
// {
// vit->setInternal();
// }
}
else if (vit->ppSlave() || vit->referredExternal())
{
@ -477,6 +481,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
existingSurfacePtLocations
);
}
// else
// {
// vit->setInternal();
// }
}
}
@ -2697,7 +2705,7 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
// NEED TO REMOVE FROM THE SURFACE TREE...
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
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
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
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -330,4 +330,4 @@ void Foam::patchToPoly2DMesh::createMesh()
// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
// ************************************************************************* //
// ************************************************************************* //

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

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

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

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

2
applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
View File

@ -82,7 +82,7 @@ Foam::label Foam::checkTopology
if (cFaces[i] < 0 || cFaces[i] >= mesh.nFaces())
{
cells.insert(cellI);
break;
break;
}
}
}

2
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -488,7 +488,7 @@ int main(int argc, char *argv[])
"word",
"specify alternative dictionary for the feature extraction information"
);
# include "setRootCase.H"
# include "createTime.H"

2
src/fieldSources/basicSource/explicitSource/ExplicitSource.H
View File

@ -39,7 +39,7 @@ Description
}
}
If volumeMode =
If volumeMode =
- absolute: values are given as <quantity>
- specific: values are given as <quantity>/m3

2
src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H
View File

@ -38,7 +38,7 @@ Description
gradPini gradPini [0 2 -2 0 0] 0; // initial pressure gradient
flowDir (1 0 0); // flow direction
}
SourceFiles
pressureGradientExplicitSource.C

4
src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
View File

@ -202,7 +202,7 @@ protected:
//- Maximum radius
scalar rMax_;
// Protected Member Functions
//- Check data
@ -247,7 +247,7 @@ public:
// Constructors
//- Construct from components
rotorDiskSource
(

2
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
View File

@ -181,7 +181,7 @@ void Foam::ParticleErosion<CloudType>::postPatch
// particle direction of travel
const vector& U = p.U();
// quick reject if particle travelling away from the patch
if ((-nw & U) < 0)
{

2
src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
View File

@ -112,7 +112,7 @@ public:
//- Post-move hook
virtual void postMove
(
(
const parcelType& p,
const label cellI,
const scalar dt

2
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
View File

@ -285,7 +285,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
);
flatSiteData.append(wSD);
particleHit = true;
}
}

2
src/postProcessing/functionObjects/field/turbulenceFields/postProcessingDict
View File

@ -26,7 +26,7 @@ functions
fields
(
R
R
);
}
}

2
src/postProcessing/functionObjects/utilities/pressureCoefficient/pressureCoefficient.H
View File

@ -28,7 +28,7 @@ Description
Calculates pressure coefficient, c_p
c_p = p/p_dyn,inf
where:
p_dyn,inf = 0.5*rho*mag(U_inf)^2

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

@ -268,7 +268,7 @@ kOmegaSST::kOmegaSST
/ max
(
a1_*omega_,
F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_))))
F2()*sqrt(2.0)*mag(symm(fvc::grad(U_)))
)
);
mut_.correctBoundaryConditions();
@ -365,7 +365,7 @@ void kOmegaSST::correct()
// Re-calculate viscosity
mut_ =
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();
// 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 cvMesh
runApplication collapseEdges 1e-3 45
runApplication snappyHexMesh
runApplication checkMesh -constant -allGeometry -allTopology

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

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

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

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