songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dsmc

Browse Source
This commit is contained in:
graham 2009-03-09 11:20:58 +00:00
commit a7341a7e95
305 changed files with 4209 additions and 1535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/solvers/DNS/dnsFoam/dnsFoam.C
View File

@ -55,9 +55,8 @@ int main(int argc, char *argv[])
Info<< nl << "Starting time loop" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@ -123,7 +122,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

6
applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
View File

@ -53,10 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
Info<< "Evolving " << kinematicCloud.name() << endl;
@ -72,7 +70,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/basic/laplacianFoam/laplacianFoam.C
View File

@ -48,9 +48,8 @@ int main(int argc, char *argv[])
Info<< "\nCalculating temperature distribution\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
@ -72,7 +71,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

2
applications/solvers/basic/potentialFoam/potentialFoam.C
View File

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

5
applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
View File

@ -50,9 +50,8 @@ int main(int argc, char *argv[])
# include "CourantNo.H"
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
@ -72,7 +71,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

2
applications/solvers/combustion/PDRFoam/PDRFoam.C
View File

@ -130,7 +130,7 @@ scalar StCoNum = 0.0;
Info<< "\n end\n";
return(0);
return 0;
}

2
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
View File

@ -195,7 +195,7 @@ scalar StCoNum = 0.0;
Info<< "\n end\n";
return(0);
return 0;
}

2
applications/solvers/combustion/XiFoam/XiFoam.C
View File

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

2
applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
View File

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

2
applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
View File

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

2
applications/solvers/combustion/dieselFoam/dieselFoam.C
View File

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

2
applications/solvers/combustion/engineFoam/engineFoam.C
View File

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

2
applications/solvers/combustion/reactingFoam/reactingFoam.C
View File

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

2
applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
View File

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

2
applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
View File

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

3
applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
View File

@ -51,9 +51,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"

3
applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
View File

@ -49,9 +49,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readSIMPLEControls.H"

5
applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
View File

@ -47,9 +47,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
surfaceScalarField phiv
@ -124,7 +123,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
View File

@ -53,9 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.value() << nl << endl;
# include "readPISOControls.H"
@ -187,7 +186,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
View File

@ -52,9 +52,8 @@ int main(int argc, char *argv[])
autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
@ -134,7 +133,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/compressible/sonicFoam/sonicFoam.C
View File

@ -49,9 +49,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
@ -127,7 +126,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
View File

@ -50,9 +50,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@ -118,7 +117,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
View File

@ -47,9 +47,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting iteration loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Iteration = " << runTime.timeName() << nl << endl;
solve
@ -73,7 +72,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
View File

@ -71,9 +71,8 @@ int main(int argc, char *argv[])
Info<< nl << "Starting time loop" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
# include "readPISOControls.H"
# include "readBPISOControls.H"
@ -163,7 +162,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/financial/financialFoam/financialFoam.C
View File

@ -55,9 +55,8 @@ int main(int argc, char *argv[])
Info<< "Starting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
delta == fvc::grad(V)().component(Foam::vector::X);
solve
@ -85,7 +84,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

3
applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
View File

@ -69,9 +69,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readTimeControls.H"

3
applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
View File

@ -66,9 +66,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"

3
applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
View File

@ -51,9 +51,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"

3
applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
View File

@ -54,9 +54,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
View File

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

5
applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
View File

@ -58,9 +58,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
fvVectorMatrix divR = turbulence->divDevReff(U);
@ -145,7 +144,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/incompressible/channelFoam/channelFoam.C
View File

@ -51,9 +51,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
@ -149,7 +148,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/incompressible/icoFoam/icoFoam.C
View File

@ -48,9 +48,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@ -108,7 +107,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
View File

@ -49,9 +49,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@ -111,7 +110,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

2
applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
View File

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

5
applications/solvers/incompressible/pisoFoam/pisoFoam.C
View File

@ -52,9 +52,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@ -139,7 +138,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

2
applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
View File

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

5
applications/solvers/incompressible/simpleFoam/simpleFoam.C
View File

@ -49,9 +49,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
@ -78,7 +77,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
View File

@ -52,9 +52,8 @@ int main(int argc, char *argv[])
Info << "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
nAveragingSteps++;
@ -82,5 +81,5 @@ int main(int argc, char *argv[])
Info << "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/molecularDynamics/mdFoam/mdFoam.C
View File

@ -50,9 +50,8 @@ int main(int argc, char *argv[])
Info << "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
nAveragingSteps++;
@ -78,5 +77,5 @@ int main(int argc, char *argv[])
Info << "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
View File

@ -53,9 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readBubbleFoamControls.H"
@ -90,7 +89,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

2
applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
View File

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

2
applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
View File

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

2
applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
View File

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

2
applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
View File

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

2
applications/solvers/multiphase/interFoam/interFoam.C
View File

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

2
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
View File

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

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
View File

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

11
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
View File

@ -57,7 +57,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class multiphaseMixture Declaration
Class multiphaseMixture Declaration
\*---------------------------------------------------------------------------*/
class multiphaseMixture
@ -85,15 +85,6 @@ public:
{
return word::hash()(key.first()) + word::hash()(key.second());
}
label operator()
(
const interfacePair& key,
const label tableSize
) const
{
return mag(operator()(key)) % tableSize;
}
};

5
applications/solvers/multiphase/settlingFoam/settlingFoam.C
View File

@ -57,9 +57,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@ -93,7 +92,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
View File

@ -52,9 +52,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@ -87,7 +86,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
View File

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

5
applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
View File

@ -57,9 +57,8 @@ int main(int argc, char *argv[])
Info<< "\nCalculating displacement field\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Iteration: " << runTime.value() << nl << endl;
# include "readSolidDisplacementFoamControls.H"
@ -133,7 +132,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

5
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
View File

@ -55,9 +55,8 @@ int main(int argc, char *argv[])
Info<< "\nCalculating displacement field\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Iteration: " << runTime.value() << nl << endl;
# include "readSteadyStressFoamControls.H"
@ -90,7 +89,7 @@ int main(int argc, char *argv[])
Info<< "\n end \n";
return(0);
return 0;
}

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

@ -52,16 +52,24 @@ int main(int argc, char *argv[])
list[1] = 2;
list[2] = 3;
list[3] = 4;
Info<< list << endl;
Info<< "list:" << list
<< " hash:" << FixedList<label, 4>::Hash<>()(list) << endl;
Info<< "FixedList<label, ..> is contiguous, "
"thus hashing function is irrelevant: with string::hash" << endl;
Info<< "list:" << list
<< " hash:" << FixedList<label, 4>::Hash<string::hash>()(list) << endl;
label a[4] = {0, 1, 2, 3};
FixedList<label, 4> list2(a);
Info<< list2 << endl;
Info<< FixedList<label, 4>::Hash<>()(list2) << endl;
Info<< "list:" << list2
<< " hash:" << FixedList<label, 4>::Hash<>()(list2) << endl;
//FixedList<label, 3> hmm(Sin);
//Info<< hmm << endl;
// FixedList<label, 3> hmm(Sin);
// Info<< hmm << endl;
if (Pstream::parRun())
{
@ -69,7 +77,12 @@ int main(int argc, char *argv[])
{
Serr<< "slave sending to master "
<< Pstream::masterNo() << endl;
OPstream toMaster(Pstream::masterNo(), IOstream::ASCII);
OPstream toMaster
(
Pstream::blocking, Pstream::masterNo(), IOstream::ASCII
);
FixedList<label, 2> list3;
list3[0] = 0;
list3[1] = 1;
@ -79,13 +92,16 @@ int main(int argc, char *argv[])
{
for
(
int slave=Pstream::firstSlave();
slave<=Pstream::lastSlave();
int slave = Pstream::firstSlave();
slave <= Pstream::lastSlave();
slave++
)
{
Serr << "master receiving from slave " << slave << endl;
IPstream fromSlave(slave, IOstream::ASCII);
IPstream fromSlave
(
Pstream::blocking, slave, IOstream::ASCII
);
FixedList<label, 2> list3(fromSlave);
Serr<< list3 << endl;

2
applications/test/Gstream/GsTest.C
View File

@ -43,5 +43,5 @@ int main()
} while (wind.waitForEvent());
return(0);
return 0;
}

3
applications/test/Hashing/Make/files Normal file
View File

@ -0,0 +1,3 @@
testHashing.C
EXE = $(FOAM_USER_APPBIN)/testHashing

0
applications/test/Hashing/Make/options Normal file
View File

59
applications/test/Hashing/hashingTests Normal file
View File

@ -0,0 +1,59 @@
/*-------------------------------*- C++ -*---------------------------------*\
| ========= |
| \\ / OpenFOAM |
| \\ / |
| \\ / The Open Source CFD Toolbox |
| \\/ http://www.OpenFOAM.org |
\*-------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
stringList
(
"The quick brown fox jumps over the lazy dog"
"The best hash is the one you don't write yourself!"
)
labelList
(
0
1
100
1000
-1
-10
-100
)
labelListList
(
(0)
(0 0)
(0 0 0)
(0 1)
(100 1000)
(0 1 100 1000)
)
// edges are hashed commutatively
edgeList
(
(0 1)
(1 0)
(45 100)
(100 45)
(128 1000)
(1000 128)
)
// triFaces are also hashed commutatively (via multiply/add)
triFaceList
(
(10 20 30)
(30 20 10)
(20 10 30)
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

166
applications/test/Hashing/testHashing.C Normal file
View File

@ -0,0 +1,166 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Application
testHashing
Description
\*---------------------------------------------------------------------------*/
#include "IOstreams.H"
#include "IOobject.H"
#include "IFstream.H"
#include "stringList.H"
#include "labelList.H"
#include "labelPair.H"
#include "edgeList.H"
#include "triFaceList.H"
#include "Hash.H"
using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
int main(int argc, char *argv[])
{
IFstream is("hashingTests");
while (is.good())
{
const word listType(is);
Info<< endl;
IOobject::writeDivider(Info) << listType << endl;
if (listType == "stringList")
{
Info<< "contiguous = " << contiguous<string>() << endl << endl;
stringList lst(is);
forAll(lst, i)
{
unsigned hash1 = string::hash()(lst[i]);
Info<< hex << hash1 << ": " << lst[i] << endl;
}
}
else if (listType == "labelList")
{
Info<<"contiguous = " << contiguous<label>() << endl << endl;
labelList lst(is);
forAll(lst, i)
{
// direct value
unsigned hash1 = Hash<label>()(lst[i]);
// hashed byte-wise
unsigned hash2 = Hash<label>()(lst[i], 0);
Info<< hex << hash1
<< " (seeded: " << hash2 << ")"
<< ": " << dec << lst[i] << endl;
}
if (contiguous<label>())
{
unsigned hash3 = Hasher
(
lst.cdata(),
lst.size() * sizeof(label)
);
Info<<"contiguous hashed value " << hex << hash3 << endl;
}
}
else if (listType == "labelListList")
{
List< List<label> > lst(is);
forAll(lst, i)
{
unsigned hash1 = Hasher
(
lst[i].cdata(),
lst[i].size() * sizeof(label)
);
Info<< hex << hash1
<< ": " << dec << lst[i] << endl;
}
}
else if (listType == "edgeList")
{
Info<<"contiguous = " << contiguous<edge>() << endl << endl;
edgeList lst(is);
forAll(lst, i)
{
unsigned hash1 = Hash<edge>()(lst[i]);
// as FixedList
unsigned hash2 = labelPair::Hash<>()(lst[i]);
Info<< hex << hash1 << " (as FixedList: " << hash2
<< "): " << dec << lst[i] << endl;
}
}
else if (listType == "triFaceList")
{
Info<<"contiguous = " << contiguous<triFace>() << endl << endl;
triFaceList lst(is);
forAll(lst, i)
{
// direct value
unsigned hash1 = Hash<triFace>()(lst[i]);
unsigned hash2 = FixedList<label, 3>::Hash<>()(lst[i]);
Info<< hex << hash1 << " (as FixedList: " << hash2
<< "): " << dec << lst[i] << endl;
}
}
else
{
Info<< "unknown type: " << listType << endl;
}
}
return 0;
}
// ************************************************************************* //

3
applications/test/HashingSpeed/Make/files Normal file
View File

@ -0,0 +1,3 @@
testHashingSpeed.C
EXE = $(FOAM_USER_APPBIN)/testHashingSpeed

0
applications/test/HashingSpeed/Make/options Normal file
View File

1070
applications/test/HashingSpeed/testHashingSpeed.C Normal file
View File

File diff suppressed because it is too large Load Diff

5
applications/test/LduMatrix/LduMatrixTest3.C
View File

@ -53,9 +53,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
@ -143,7 +142,7 @@ int main(int argc, char *argv[])
Info<< "End\n" << endl;
return(0);
return 0;
}

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

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

47
applications/test/PackedList/PackedListTest.C
View File

@ -28,6 +28,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "uLabel.H"
#include "IOstreams.H"
#include "PackedBoolList.H"
@ -38,7 +39,7 @@ using namespace Foam;
int main(int argc, char *argv[])
{
Info<< "PackedList max_bits() = " << PackedList<0>::max_bits() << nl;
Info<< "PackedList max_bits() = " << PackedList<>::max_bits() << nl;
Info<< "\ntest allocation with value\n";
PackedList<3> list1(5,1);
@ -73,6 +74,50 @@ int main(int argc, char *argv[])
list1[1] = list1[8] = list1[10] = list1[14] = 2;
list1.print(Info);
Info<< "\ntest operator== between references\n";
if (list1[1] == list1[8])
{
Info<< "[1] == [8] (expected)\n";
}
else
{
Info<< "[1] != [8] (unexpected)\n";
}
if (list1[0] != list1[1])
{
Info<< "[0] != [1] (expected)\n";
}
else
{
Info<< "[0] == [1] (unexpected)\n";
}
Info<< "\ntest operator== with iterator\n";
{
PackedList<3>::iterator iter = list1[1];
if (iter != list1[8])
{
Info<< "iter != [8] (expected)\n";
}
else
{
Info<< "iter == [8] (unexpected)\n";
}
if (*iter != list1[8])
{
Info<< "*iter != [8] (unexpected)\n";
}
else
{
Info<< "*iter == [8] (expected)\n";
}
}
{
const PackedList<3>& constLst = list1;
Info<< "\ntest operator[] const with out-of-range index\n";

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

@ -32,6 +32,7 @@ Description
#include "boolList.H"
#include "PackedBoolList.H"
#include "HashSet.H"
#include "StaticHashTable.H"
#include "cpuTime.H"
#include <vector>
@ -55,11 +56,26 @@ int main(int argc, char *argv[])
labelHashSet emptyHash;
labelHashSet fullHash(1000);
for(label i = 0; i < n; i++)
for (label i = 0; i < n; i++)
{
fullHash.insert(i);
}
// fullStaticHash is really slow
// give it lots of slots to help
StaticHashTable<nil, label, Hash<label> > emptyStaticHash;
StaticHashTable<nil, label, Hash<label> > fullStaticHash(100000);
for (label i = 0; i < n; i++)
{
fullStaticHash.insert(i, nil());
}
emptyHash.printInfo(Info);
fullHash.printInfo(Info);
emptyStaticHash.printInfo(Info);
fullStaticHash.printInfo(Info);
cpuTime timer;
for (label iter = 0; iter < nIters; ++iter)
@ -235,6 +251,37 @@ int main(int argc, char *argv[])
Info<< " sum " << sum << endl;
// Read empty static hash
sum = 0;
for (label iter = 0; iter < nIters; ++iter)
{
forAll(unpacked, i)
{
sum += emptyStaticHash.found(i);
}
}
Info<< "Reading empty StaticHash:" << timer.cpuTimeIncrement()
<< " s" << endl;
Info<< " sum " << sum << endl;
#if 0
// we can skip this test - it is usually quite slow
// Read full static hash
sum = 0;
for (label iter = 0; iter < nIters; ++iter)
{
forAll(unpacked, i)
{
sum += fullStaticHash.found(i);
}
}
Info<< "Reading full StaticHash:" << timer.cpuTimeIncrement()
<< " s" << endl;
Info<< " sum " << sum << endl;
#endif
Info<< "Starting write tests" << endl;
//
// Write
//

2
applications/test/dataEntry/testDataEntry.C
View File

@ -82,7 +82,7 @@ int main(int argc, char *argv[])
<< " int(f(x)) lim(x0->x1) = " << dataEntry().integrate(x0, x1) << nl
<< endl;
return(0);
return 0;
}

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

@ -60,7 +60,7 @@ int main()
Info<< "end" << endl;
return(0);
return 0;
}

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

@ -28,5 +28,5 @@ int main(int argc, char *argv[])
cout << "allocated " << i*nBytes/(1024U*1024U) << " Mbytes" << endl;
}
return(0);
return 0;
}

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

@ -120,9 +120,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << endl;

2
applications/test/parallel/parallelTest.C
View File

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

2
applications/test/pointField/testPointField.C
View File

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

3
applications/test/regex/regexTest.C
View File

@ -43,8 +43,7 @@ int main(int argc, char *argv[])
List<Tuple2<string, string> > rawList(IFstream("testRegexps")());
Info<< "input list:" << rawList << endl;
IOobject::writeDivider(Info);
Info<< endl;
IOobject::writeDivider(Info) << endl;
List<string> groups;

2
applications/test/slicedField/slicedFieldTest.C
View File

@ -107,7 +107,7 @@ int main(int argc, char *argv[])
Info<< Sf << endl;
return(0);
return 0;
}

2
applications/test/sphericalTensorField/sphericalTensorFieldTest.C
View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
Info<< ((sf1 + sf2) & (sf1 + sf2)) << endl;
return(0);
return 0;
}

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

@ -38,10 +38,11 @@ int main(int argc, char *argv[])
{
string test("$HOME kjhkjhkjh \" \\$HOME/tyetyery ${FOAM_RUN} \n ; hkjh ;$");
Info<< test << endl;
Info<< "string:" << test << nl << "hash:"
<< unsigned(string::hash()(test)) << endl;
// test sub-strings via iterators
string::const_iterator iter = test.end();
string::const_iterator iter = test.end();
string::const_iterator iter2 = test.end();
string::size_type fnd = test.find('\\');
@ -77,6 +78,8 @@ int main(int argc, char *argv[])
cout<< "output string with " << s2.length() << " characters\n";
cout<< "ostream<< >" << s2 << "<\n";
Info<< "Ostream<< >" << s2 << "<\n";
Info<< "hash:" << unsigned(string::hash()(s2)) << endl;
Info << "End\n" << endl;

2
applications/test/symmTensorField/symmTensorFieldTest.C
View File

@ -52,7 +52,7 @@ int main(int argc, char *argv[])
Info<< symm(tf1) << endl;
return(0);
return 0;
}

2
applications/test/tensor/tensorTest.C
View File

@ -65,5 +65,5 @@ int main()
Info<< (symm(t7) && t7) - (0.5*(t7 + t7.T()) && t7) << endl;
Info<< (t7 && symm(t7)) - (t7 && 0.5*(t7 + t7.T())) << endl;
return(0);
return 0;
}

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

@ -36,5 +36,5 @@ int main()
Info<< "tet circumRadius = "
<< tetrahedron<point, point>(a, b, c, d).circumRadius() << endl;
return(0);
return 0;
}

2
applications/test/volField/volFieldTest.C
View File

@ -94,7 +94,7 @@ int main(int argc, char *argv[])
solve(fvm::ddt(st) + fvm::div(phi, st) - fvm::laplacian(st));
return(0);
return 0;
}

2
applications/test/volPointInterpolation/volPointInterpolationTest.C
View File

@ -77,7 +77,7 @@ int main(int argc, char *argv[])
pointVectorField pU(pInterp.interpolate(U));
pU.write();
return(0);
return 0;
}

3
applications/test/wordRe/wordReTest.C
View File

@ -86,8 +86,7 @@ int main(int argc, char *argv[])
List<Tuple2<wordRe, string> > rawList(IFstream("testRegexps")());
Info<< "input list:" << rawList << endl;
IOobject::writeDivider(Info);
Info<< endl;
IOobject::writeDivider(Info) << endl;
forAll(rawList, elemI)
{

2
applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
View File

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

2
applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
View File

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

2
applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
View File

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

2
applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
View File

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

2
applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
View File

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

2
applications/utilities/mesh/conversion/starToFoam/starToFoam.C
View File

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

2
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

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

2
applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
View File

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

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

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

2
applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
View File

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

2
applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
Info << "Writing points into directory " << points.path() << nl << endl;
points.write();
return(0);
return 0;
}

2
applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
View File

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

3
applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
View File

@ -46,9 +46,8 @@ int main(int argc, char *argv[])
# include "createTime.H"
# include "createDynamicFvMesh.H"
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << endl;
mesh.update();

5
applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
View File

@ -47,9 +47,8 @@ int main(int argc, char *argv[])
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.theta() << " CA-deg\n" << endl;
mesh.move();
@ -63,7 +62,7 @@ int main(int argc, char *argv[])
Info<< "\n end\n";
return(0);
return 0;
}

3
applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
View File

@ -46,9 +46,8 @@ int main(int argc, char *argv[])
autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
while (runTime.run())
while (runTime.loop())
{
runTime++;
Info<< "Time = " << runTime.timeName() << endl;
mesh.movePoints(motionPtr->newPoints());

2
applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
View File

@ -203,7 +203,7 @@ int main(int argc, char *argv[])
Info << "Writing points into directory " << points.path() << nl << endl;
points.write();
return(0);
return 0;
}

2
applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
View File

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

Some files were not shown because too many files have changed in this diff Show More