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

14
applications/test/Dictionary/DictionaryTest.C
View File

@ -84,7 +84,7 @@ public:
~Scalar()
{
Info <<"delete Scalar: " << data_ << endl;
Info<<"delete Scalar: " << data_ << endl;
}
friend Ostream& operator<<(Ostream& os, const Scalar& val)
@ -169,7 +169,7 @@ int main(int argc, char *argv[])
{
Info<< " = " << iter() << endl;
}
PtrDictionary<Scalar> scalarDict2;
for (int i = 8; i<15; i++)
{
@ -186,22 +186,22 @@ int main(int argc, char *argv[])
{
Info<< "elem = " << *iter << endl;
}
scalarDict.transfer(scalarDict2);
Scalar* p = scalarDict.lookupPtr("ent8");
// This does not (yet) work
// Scalar* q = scalarDict.remove("ent10");
if (p)
{
Info << "found: " << *p << endl;
Info<< "found: " << *p << endl;
}
else
{
Info << "no p: " << endl;
Info<< "no p: " << endl;
}
scalarDict.clear();

2
applications/test/IndirectList/IndirectListTest.C
View File

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

2
applications/test/LduMatrix/LduMatrixTest.C
View File

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

2
applications/test/LduMatrix/LduMatrixTest2.C
View File

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

10
applications/test/Map/MapTest.C
View File

@ -53,15 +53,15 @@ int main(int argc, char *argv[])
if (bananaIter == banana.end())
{
Info << "not found" << endl;
Info<< "not found" << endl;
}
else
{
Info << "5 is " << bananaIter() << endl;
Info<< "5 is " << bananaIter() << endl;
}
// Same with STL
Info << "Same with STL" << endl;
Info<< "Same with STL" << endl;
std::map<label, bool> STLbanana;
STLbanana[5] = true;
@ -69,11 +69,11 @@ int main(int argc, char *argv[])
if (STLbananaIter == STLbanana.end())
{
Info << "not found" << endl;
Info<< "not found" << endl;
}
else
{
Info << "5 is " << STLbananaIter->second << endl;
Info<< "5 is " << STLbananaIter->second << endl;
}

2
applications/test/Matrix/MatrixTest.C
View File

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

2
applications/test/NamedEnum/namedEnumTest.C
View File

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
namedEnumTest::options hmm(namedEnumTest::namedEnum.read(Sin));
Info<< namedEnumTest::namedEnum[hmm] << endl;
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/test/ODETest/ODETest.C
View File

@ -167,7 +167,7 @@ int main(int argc, char *argv[])
Info<< nl << "Analytical: y(2.0) = " << yEnd << endl;
Info << "Numerical: y(2.0) = " << y << ", hEst = " << hEst << endl;
Info << "\nEnd\n" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/test/POSIX/POSIXTest.C
View File

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

4
applications/test/PackedList2/PackedListTest2.C
View File

@ -135,7 +135,7 @@ int main(int argc, char *argv[])
sum = 0;
for (label iter = 0; iter < nIters; ++iter)
{
for(unsigned int i = 0; i < stlVector.size(); i++)
for (unsigned int i = 0; i < stlVector.size(); i++)
{
sum += stlVector[i];
}
@ -386,7 +386,7 @@ int main(int argc, char *argv[])
<< " s" << endl;
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/test/PtrList/PtrListTest.C
View File

@ -54,7 +54,7 @@ public:
~Scalar()
{
Info <<"delete Scalar: " << data_ << endl;
Info<<"delete Scalar: " << data_ << endl;
}
autoPtr<Scalar> clone() const;

2
applications/test/Tuple2/Tuple2Test.C
View File

@ -44,7 +44,7 @@ int main()
Info<< t2 << " " << t2.first() << " " << t2.second() << endl;
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/test/UIndirectListTest/UIndirectListTest.C
View File

@ -100,7 +100,7 @@ int main(int argc, char *argv[])
dynList.append(UIndirectList<double>(completeList, addresses));
Info<< "DynamicList::append(UIndirectList): " << dynList << endl;
Info << "\nEnd\n" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/test/callback/callbackTest.C
View File

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

2
applications/test/dimensionedType/dimensionedTypeTest.C
View File

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

16
applications/test/extendedStencil/testExtendedStencil.C
View File

@ -188,11 +188,11 @@ int main(int argc, char *argv[])
// (
// mesh
// );
//
//
// Info<< "cellFaceCell:" << endl;
// writeStencilStats(addressing.stencil());
//
//
//
//
// //// Do some interpolation.
// //{
// // const labelListList& stencil = addressing.stencil();
@ -226,7 +226,7 @@ int main(int argc, char *argv[])
// mesh.C(),
// stencilPoints
// );
//
//
// forAll(stencilPoints, faceI)
// {
// if (stencilPoints[faceI].size() >= 15)
@ -443,10 +443,10 @@ int main(int argc, char *argv[])
(
mesh
);
Info<< "cellFaceCell:" << endl;
writeStencilStats(addressing.stencil());
// Collect stencil face centres
List<List<point> > stencilPoints(mesh.nCells());
addressing.collectData
@ -454,7 +454,7 @@ int main(int argc, char *argv[])
mesh.Cf(),
stencilPoints
);
forAll(stencilPoints, cellI)
{
writeStencilOBJ
@ -477,7 +477,7 @@ int main(int argc, char *argv[])
// vf,
// stencilData
// );
// for(label faci = 0; faci < mesh.nInternalFaces(); faci++)
// for (label faci = 0; faci < mesh.nInternalFaces(); faci++)
// {
// const scalarList& stData = stencilData[faceI];
// const scalarList& stWeight = fit[faceI];

3
applications/test/fileName/fileNameTest.C
View File

@ -108,8 +108,7 @@ int main()
Info<< " badName(die) => " << findEtcFile("badName", true) << nl
<< endl;
Info<< "\nEnd" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

3
applications/test/fileNameClean/fileNameCleanTest.C
View File

@ -95,8 +95,7 @@ int main(int argc, char *argv[])
printCleaning(pathName);
}
Info<< "\nEnd" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/test/liquid/liquidTest.C
View File

@ -39,7 +39,7 @@ int main()
Info<< fuel.rho(1e5, 300) << endl;
Info<< fuel << endl;
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/test/mesh/meshTest.C
View File

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

2
applications/test/pTraits/pTraitsTest.C
View File

@ -38,7 +38,7 @@ int main()
{
Info<< pTraits<scalar>::typeName << endl;
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

6
applications/test/primitivePatch/testPrimitivePatch.C
View File

@ -137,7 +137,7 @@ void writeFaceEdges
const labelList& myEdges = faceEdges[faceI];
forAll(myEdges, i)
{
{
const edge& e = edges[myEdges[i]];
feStream<< "l " << e.start()+1 << ' ' << e.end()+1 << endl;
@ -172,7 +172,7 @@ void writeEdgeFaces
const labelList& myFaces = edgeFaces[edgeI];
forAll(myFaces, i)
{
{
efStream<< "l " << myFaces[0]+1 << ' ' << myFaces[i]+1 << endl;
}
}
@ -249,7 +249,7 @@ int main(int argc, char *argv[])
writeFaceFaces(localPoints, localFaces, faceFaces);
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/test/readCHEMKINIII/readCHEMKINIII.C
View File

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

6
applications/test/router/processorRouter.C
View File

@ -71,7 +71,7 @@ labelList procNeighbours(const polyMesh& mesh)
{
const polyPatch& patch = mesh.boundaryMesh()[patchI];
const processorPolyPatch& procPatch =
const processorPolyPatch& procPatch =
refCast<const processorPolyPatch>(patch);
label procId = procPatch.neighbProcNo() - Pstream::firstSlave() + 1;
@ -96,7 +96,7 @@ point meshCentre(const polyMesh& mesh)
int main(int argc, char *argv[])
{
# include "setRootCase.H"
# include "setRootCase.H"
# include "createTime.H"
# include "createMesh.H"
@ -230,7 +230,7 @@ int main(int argc, char *argv[])
// Dump route as lines.
labelList route(cellRouter.getRoute(-(pathI + 1)));
for(label elemI = 1; elemI < route.size(); elemI++)
for (label elemI = 1; elemI < route.size(); elemI++)
{
objFile
<< "l " << route[elemI-1]+1 << ' '

8
applications/test/router/router.C
View File

@ -38,7 +38,7 @@ Foam::label Foam::router::count(const label weight) const
{
cnt += weights_[nodeI];
}
return cnt;
}
@ -315,7 +315,7 @@ bool Foam::router::route(const labelList& path, const label pathValue)
setWeights(0, path[0]);
// Check if all endPoints can be reached
for(label leafI = 1; leafI < path.size(); leafI++)
for (label leafI = 1; leafI < path.size(); leafI++)
{
if (weights_[path[leafI]] == labelMax)
{
@ -329,7 +329,7 @@ bool Foam::router::route(const labelList& path, const label pathValue)
}
// Search back from all endpoints to start and fix weights
for(label leafI = 1; leafI < path.size(); leafI++)
for (label leafI = 1; leafI < path.size(); leafI++)
{
fixWeights
(
@ -370,7 +370,7 @@ bool Foam::router::route(const labelList& path, const label pathValue)
{
weights_[nodeI] = 0;
}
}
}
return true;
}

2
applications/test/simpleMatrix/simpleMatrixTest.C
View File

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

3
applications/test/string/stringTest.C
View File

@ -102,8 +102,7 @@ int main(int argc, char *argv[])
Info<< "Ostream<< >" << s2 << "<\n";
Info<< "hash:" << hex << string::hash()(s2) << endl;
Info << "End\n" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

5
applications/test/testPointEdgeWave/testPointEdgeWave.C
View File

@ -52,7 +52,7 @@ int main(int argc, char *argv[])
// Get name of patch
word patchName(args.additionalArgs()[0]);
// Find the label in patches by name.
label patchI = patches.findPatchID(patchName);
@ -131,8 +131,7 @@ int main(int argc, char *argv[])
psf.write();
Info << nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}