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:
	applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
This commit is contained in:
graham
2010-05-11 13:00:25 +01:00
parent cddce779e8 140536cd60
commit f106f89f1f
1478 changed files with 24877 additions and 13760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ public:
friend Ostream& operator<<(Ostream& os, const ent& e)
{
os << e.keyword_ << ' ' << e.i_ << endl;
os << e.keyword_ << ' ' << e.i_ << endl;
return os;
}
};
@ -88,7 +88,7 @@ public:
friend Ostream& operator<<(Ostream& os, const Scalar& val)
{
os << val.data_;
os << val.data_;
return os;
}
};

4
applications/test/DynamicList/DynamicListTest.C
View File

@ -27,6 +27,7 @@ Description
#include "DynamicList.H"
#include "IOstreams.H"
#include "ListOps.H"
using namespace Foam;
@ -185,6 +186,9 @@ int main(int argc, char *argv[])
dlE3 = dlE2; // assign identical
Info<< "<dlE3>" << dlE3 << "</dlE3>" << endl;
DynamicList<label> dlE4(reorder(identity(dlE3.size()), dlE3));
Info<< "<dlE4>" << dlE4 << "</dlE4>" << endl;
Info<< "\nEnd\n";

2
applications/test/Field/testField.H
View File

@ -38,7 +38,7 @@ public:
friend std::ostream& operator<<(std::ostream& os, const Vector<C>& v)
{
os << v.X << '\t' << v.Y << '\n';
os << v.X << '\t' << v.Y << '\n';
return os;
}
};

1
applications/test/FixedList/FixedListTest.C
View File

@ -43,7 +43,6 @@ using namespace Foam;
int main(int argc, char *argv[])
{
argList::validArgs.clear();
argList args(argc, argv);
FixedList<label, 4> list;

2
applications/test/HashTable/hashTableTest.C
View File

@ -89,7 +89,7 @@ int main()
{
OStringStream os;
os << table1;
os << table1;
HASHTABLE_CLASS<double> readTable(IStringStream(os.str())(), 100);
Info<< "Istream constructor:" << readTable << endl;

2
applications/test/ISLList/ISLListTest.C
View File

@ -54,7 +54,7 @@ public:
friend Ostream& operator<<(Ostream& os, const Scalar& s)
{
os << s.data_;
os << s.data_;
return os;
}

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

@ -104,7 +104,6 @@ public:
int main(int argc, char *argv[])
{
argList::validArgs.clear();
argList::validArgs.append("ODESolver");
argList args(argc, argv);

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

@ -60,7 +60,7 @@ public:
friend Ostream& operator<<(Ostream& os, const Scalar& val)
{
os << val.data_;
os << val.data_;
return os;
}
};

2
applications/test/StaticHashTable/staticHashTableTest.C
View File

@ -83,7 +83,7 @@ int main()
{
OStringStream os;
os << table1;
os << table1;
HASHTABLE_CLASS<double> readTable(IStringStream(os.str())(), 100);
Info<< "Istream constructor:" << readTable << endl;

2
applications/test/UDictionary/UDictionaryTest.C
View File

@ -56,7 +56,7 @@ public:
friend Ostream& operator<<(Ostream& os, const ent& e)
{
os << e.keyword_ << ' ' << e.i_ << endl;
os << e.keyword_ << ' ' << e.i_ << endl;
return os;
}
};

1
applications/test/globalIndex/Make/files
View File

@ -1,4 +1,3 @@
globalIndex.C
globalIndexTest.C
EXE = $(FOAM_USER_APPBIN)/globalIndexTest

24
applications/test/nearWallDist-wave/testWallDist2.C
View File

@ -108,13 +108,17 @@ int main(int argc, char *argv[])
}
}
List<wallPoint> allFaceInfo(mesh.nFaces());
List<wallPoint> allCellInfo(mesh.nCells());
MeshWave<wallPoint> wallDistCalc
FaceCellWave<wallPoint> wallDistCalc
(
mesh,
changedFaces,
faceDist,
0 // max iterations
allFaceInfo,
allCellInfo,
0 // max iterations
);
Info<< "\nStarting time loop\n" << endl;
@ -148,16 +152,13 @@ int main(int argc, char *argv[])
// Copy face and cell values into field
//
const List<wallPoint>& cellInfo = wallDistCalc.allCellInfo();
const List<wallPoint>& faceInfo = wallDistCalc.allFaceInfo();
label nIllegal = 0;
// Copy cell values
forAll(cellInfo, cellI)
forAll(allCellInfo, cellI)
{
scalar dist = cellInfo[cellI].distSqr();
if (cellInfo[cellI].valid())
scalar dist = allCellInfo[cellI].distSqr();
if (allCellInfo[cellI].valid())
{
wallDistUncorrected[cellI] = Foam::sqrt(dist);
}
@ -176,11 +177,10 @@ int main(int argc, char *argv[])
forAll(patchField, patchFaceI)
{
label meshFaceI =
patchField.patch().patch().start() + patchFaceI;
const label meshFaceI = patchField.patch().start() + patchFaceI;
scalar dist = faceInfo[meshFaceI].distSqr();
if (faceInfo[meshFaceI].valid())
scalar dist = allFaceInfo[meshFaceI].distSqr();
if (allFaceInfo[meshFaceI].valid())
{
patchField[patchFaceI] = Foam::sqrt(dist);
}

1
applications/test/prefixOSstream/prefixOSstreamTest.C
View File

@ -45,7 +45,6 @@ using namespace Foam;
int main(int argc, char *argv[])
{
argList::validArgs.clear();
argList args(argc, argv);
//Pout.prefix() = '[' + name(Pstream::myProcNo()) + "] ";

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

@ -47,8 +47,7 @@ void writeObj(Ostream& os,const pointField& points)
{
const point& pt = points[pointI];
os << "v " << pt.x() << ' ' << pt.y()
<< ' ' << pt.z() << endl;
os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
}
}
@ -221,10 +220,7 @@ int main(int argc, char *argv[])
# include "createPolyMesh.H"
const word patchName = args[1];
label patchI = mesh.boundaryMesh().findPatchID(patchName);
const polyPatch& patch = mesh.boundaryMesh()[patchI];
const polyPatch& patch = mesh.boundaryMesh()[patchName];
Info<< "Patch:" << patch.name() << endl;

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

@ -35,7 +35,6 @@ using namespace Foam;
int main(int argc, char *argv[])
{
argList::validArgs.clear();
argList::validArgs.append("CHEMKINIIIFile");
argList::addOption("thermo", "fileName");
argList args(argc, argv);

6
applications/test/sha1/testSHA1.C
View File

@ -92,14 +92,14 @@ int main(int argc, char * argv[])
{
OSHA1stream os;
os << str;
os << str;
Info<< os.digest() << endl;
os << str;
os << str;
Info<< os.digest() << endl;
os.rewind();
os << "The quick brown fox jumps over the lazy dog";
os << "The quick brown fox jumps over the lazy dog";
Info<< os.digest() << endl;
}