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/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source 
Conflicts:
	src/parallel/decompose/scotchDecomp/scotchDecomp.C
This commit is contained in:
mattijs
2010-06-04 16:09:16 +01:00
parent 9f8b5bb693 28b1a9e2c6
commit fbe04b18ec
1046 changed files with 4231 additions and 1807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

2
applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

2
applications/utilities/mesh/advanced/selectCells/selectCellsDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

16
applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
View File

@ -579,12 +579,17 @@ void ReadCells
int main(int argc, char *argv[])
{
argList::addNote
(
"read CCM files as written by proSTAR/ccm\n"
" - does not handle 'interfaces' (couples), cyclics or data\n"
" - does not handle mesh regions (porosity, solids, ...)\n"
);
argList::noParallel();
argList::validArgs.append("ccm26 file");
# include "setRootCase.H"
# include "createTime.H"
argList::validArgs.append("ccmFile");
#include "setRootCase.H"
#include "createTime.H"
// Foam mesh data
// ~~~~~~~~~~~~~~
@ -615,6 +620,7 @@ int main(int argc, char *argv[])
{
const fileName ccmFile = args[1];
const word ccmExt = ccmFile.ext();
if (!isFile(ccmFile))
{
@ -623,8 +629,6 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
word ccmExt = ccmFile.ext();
if (ccmExt != "ccm" && ccmExt != "ccmg")
{
FatalErrorIn(args.executable())

2
applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
View File

@ -90,7 +90,7 @@ cellShape create3DCellShape
// make a list of outward-pointing faces
labelListList localFaces(faceLabels.size());
forAll (faceLabels, faceI)
forAll(faceLabels, faceI)
{
const label curFaceLabel = faceLabels[faceI];

6
applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
View File

@ -62,6 +62,10 @@ using namespace Foam;
int main(int argc, char *argv[])
{
argList::addNote
(
"read OpenFOAM mesh and write a pro-STAR (v4) bnd/cel/vrt format"
);
argList::noParallel();
timeSelector::addOptions();
@ -74,7 +78,7 @@ int main(int argc, char *argv[])
argList::addBoolOption
(
"noBnd",
"suppress writing the .bnd file"
"suppress writing a boundary (.bnd) file"
);
# include "setRootCase.H"

9
applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
View File

@ -38,8 +38,13 @@ Description
int main(int argc, char *argv[])
{
argList::addNote
(
"convert pro-STAR (v3) mesh to OpenFOAM"
);
argList::noParallel();
argList::validArgs.append("STAR mesh file prefix");
argList::validArgs.append("pro-STAR prefix");
argList::addOption
(
"scale",
@ -56,7 +61,7 @@ int main(int argc, char *argv[])
const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0);
# include "createTime.H"
#include "createTime.H"
starMesh makeMesh(args[1], runTime, scaleFactor);

5
applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
View File

@ -59,6 +59,11 @@ using namespace Foam;
int main(int argc, char *argv[])
{
argList::addNote
(
"convert pro-STAR (v4) mesh to OpenFOAM"
);
argList::noParallel();
argList::validArgs.append("pro-STAR prefix");
argList::addBoolOption

2
applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

2
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

2
applications/utilities/mesh/manipulation/createPatch/createPatchDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

2
applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

0
applications/utilities/mesh/conversion/polyDualMesh/Make/files → applications/utilities/mesh/manipulation/polyDualMesh/Make/files
View File

0
applications/utilities/mesh/conversion/polyDualMesh/Make/options → applications/utilities/mesh/manipulation/polyDualMesh/Make/options
View File

13
applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C → applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
View File

@ -881,9 +881,6 @@ Foam::meshDualiser::meshDualiser(const polyMesh& mesh)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::meshDualiser::setRefinement
@ -1469,14 +1466,4 @@ void Foam::meshDualiser::setRefinement
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
// ************************************************************************* //

0
applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H → applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H
View File

0
applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C → applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
View File

2
applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

2
applications/utilities/mesh/manipulation/topoSet/topoSetDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile