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' into cvm

Browse Source 
Conflicts:
	doc/codingStyleGuide.org
This commit is contained in:
graham
2009-11-30 14:55:39 +00:00
parent 4db98cd236 909e6b27e4
commit ad669ae3d8
609 changed files with 56025 additions and 2873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/surface/surfaceAdd/surfaceAdd.C
View File

@ -263,12 +263,12 @@ int main(int argc, char *argv[])
Info<< endl;
Info << "Writing : " << outFileName << endl;
Info<< "Writing : " << outFileName << endl;
// No need to 'group' while writing since all in correct order anyway.
combinedSurf.write(outFileName);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

6
applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
View File

@ -64,13 +64,13 @@ int main(int argc, char *argv[])
// Read
// ~~~~
Info << "Reading : " << inFileName << endl;
Info<< "Reading : " << inFileName << endl;
triSurface surf(inFileName);
Info<< "Read surface:" << endl;
surf.writeStats(Info);
Info<< endl;
// Construct features from surface&featureangle
@ -117,7 +117,7 @@ int main(int argc, char *argv[])
}
Info << "Writing : " << outFileName << endl;
Info<< "Writing : " << outFileName << endl;
surf.write(outFileName, true);
Info<< "End\n" << endl;

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

@ -550,7 +550,7 @@ int main(int argc, char *argv[])
fileName surfFileNameBase(surfFileName.name());
for(label zone = 0; zone < numZones; zone++)
for (label zone = 0; zone < numZones; zone++)
{
boolList includeMap(surf.size(), false);

4
applications/utilities/surface/surfaceClean/collapseBase.C
View File

@ -128,7 +128,7 @@ static void splitTri
labelledTri
(
f[fp2],
splitPoints[splitPoints.size()-1],
splitPoints.last(),
f[fp1],
f.region()
)
@ -144,7 +144,7 @@ static void splitTri
(
f[fp1],
f[fp2],
splitPoints[splitPoints.size()-1],
splitPoints.last(),
f.region()
)
);

20
applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
View File

@ -54,7 +54,7 @@ int mapVertex(::List<int>& collapse_map, int a, int mx)
return 0;
}
while (a >= mx)
{
{
a = collapse_map[a];
}
return a;
@ -122,28 +122,28 @@ int main(int argc, char *argv[])
td.v[1]=f[1];
td.v[2]=f[2];
tri.Add(td);
}
}
::List<int> collapse_map; // to which neighbor each vertex collapses
::List<int> permutation;
::ProgressiveMesh(vert,tri,collapse_map,permutation);
// rearrange the vertex list
// rearrange the vertex list
::List< ::Vector> temp_list;
for(int i=0;i<vert.num;i++)
for (int i=0;i<vert.num;i++)
{
temp_list.Add(vert[i]);
}
for(int i=0;i<vert.num;i++)
for (int i=0;i<vert.num;i++)
{
vert[permutation[i]]=temp_list[i];
}
// update the changes in the entries in the triangle list
for(int i=0;i<tri.num;i++)
for (int i=0;i<tri.num;i++)
{
for(int j=0;j<3;j++)
for (int j=0;j<3;j++)
{
tri[i].v[j] = permutation[tri[i].v[j]];
}
@ -167,7 +167,7 @@ int main(int argc, char *argv[])
int p2 = mapVertex(collapse_map, tri[i].v[2], render_num);
// note: serious optimization opportunity here,
// by sorting the triangles the following "continue"
// by sorting the triangles the following "continue"
// could have been made into a "break" statement.
if (p0 == p1 || p1 == p2 || p2 == p0)
{
@ -181,7 +181,7 @@ int main(int argc, char *argv[])
// Convert vert into pointField.
pointField newPoints(vert.num);
for(int i=0; i<vert.num; i++)
for (int i=0; i<vert.num; i++)
{
const ::Vector & v = vert[i];
@ -205,7 +205,7 @@ int main(int argc, char *argv[])
surf2.write(outFileName);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

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

@ -123,7 +123,7 @@ int main(int argc, char *argv[])
<< endl;
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

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

@ -320,7 +320,7 @@ int main(int argc, char *argv[])
}
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

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

@ -95,7 +95,7 @@ int main(int argc, char *argv[])
surf.write(outFileName);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

4
applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
View File

@ -65,7 +65,7 @@ int main(int argc, char *argv[])
triSurface cleanSurf(surf1);
while(true)
while (true)
{
label nOldVert = cleanSurf.nPoints();
@ -83,7 +83,7 @@ int main(int argc, char *argv[])
cleanSurf.write(outFileName);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

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

@ -79,7 +79,7 @@ int main(int argc, char *argv[])
surf2.write(outFileName);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

4
applications/utilities/surface/surfaceSmooth/surfaceSmooth.C
View File

@ -78,7 +78,7 @@ int main(int argc, char *argv[])
const labelListList& pointEdges = surf1.pointEdges();
for(label iter = 0; iter < iters; iter++)
for (label iter = 0; iter < iters; iter++)
{
forAll(pointEdges, vertI)
{
@ -111,7 +111,7 @@ int main(int argc, char *argv[])
surf2.write(outFileName);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

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

@ -106,7 +106,7 @@ int main(int argc, char *argv[])
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

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

@ -973,7 +973,7 @@ int main(int argc, char *argv[])
surf.write(outSurfName);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

12
applications/utilities/surface/surfaceSubset/surfaceSubset.C
View File

@ -117,7 +117,7 @@ int main(int argc, char *argv[])
if (markedPoints.size())
{
Info << "Found " << markedPoints.size() << " marked point(s)." << endl;
Info<< "Found " << markedPoints.size() << " marked point(s)." << endl;
// pick up cells sharing the point
@ -155,7 +155,7 @@ int main(int argc, char *argv[])
if (markedEdges.size())
{
Info << "Found " << markedEdges.size() << " marked edge(s)." << endl;
Info<< "Found " << markedEdges.size() << " marked edge(s)." << endl;
// pick up cells sharing the edge
@ -194,7 +194,7 @@ int main(int argc, char *argv[])
const point& min = markedZone[0];
const point& max = markedZone[1];
Info << "Using zone min:" << min << " max:" << max << endl;
Info<< "Using zone min:" << min << " max:" << max << endl;
forAll(surf1, faceI)
{
@ -295,7 +295,7 @@ int main(int argc, char *argv[])
if (markedFaces.size())
{
Info << "Found " << markedFaces.size() << " marked face(s)." << endl;
Info<< "Found " << markedFaces.size() << " marked face(s)." << endl;
// Check and mark faces to pick up
forAll (markedFaces, faceI)
@ -373,11 +373,11 @@ int main(int argc, char *argv[])
Info<< "Subset:" << endl;
surf2.writeStats(Info);
Info << endl;
Info<< endl;
fileName outFileName(args.additionalArgs()[2]);
Info << "Writing surface to " << outFileName << endl;
Info<< "Writing surface to " << outFileName << endl;
surf2.write(outFileName);

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

@ -311,7 +311,7 @@ int main(int argc, char *argv[])
runTime++;
// Write resulting mesh
Info << "Writing modified mesh to time " << runTime.value() << endl;
Info<< "Writing modified mesh to time " << runTime.value() << endl;
mesh.write();
}

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

@ -166,7 +166,7 @@ int main(int argc, char *argv[])
surf2.write(outFileName);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}