diff --git a/ReleaseNotes-dev b/ReleaseNotes-dev index fa80518f35..9ba620e2dc 100644 --- a/ReleaseNotes-dev +++ b/ReleaseNotes-dev @@ -120,6 +120,8 @@ + reuses tracking state in interpolation - improves consistency and speed *** *Updated* split cyclics into two separate patches. See [[./doc/changes/splitCyclic.txt]] + * *New* cyclics (and all coupled patches) have optional + matchTolerance entry to allow looser area matching tolerance. * *Updated* interpolation (volPointInterpolation) now works without the globalPointPatch. Moving mesh cases can now be run non-parallel and continued in parallel and reconstructed without any limitation. @@ -312,8 +314,3 @@ * Other + compilable with =clang= In your prefs.sh set the WM_COMPILER to Clang - + dlclose error: upon exit of e.g. paraFoam you can get the error - Inconsistency detected by ld.so: dl-close.c: 731: _dl_close: Assertion - `map->l_init_called' failed! - This seems to happen with a mix of system libraries and a thirdParty - compiler. diff --git a/applications/solvers/DNS/dnsFoam/createFields.H b/applications/solvers/DNS/dnsFoam/createFields.H index 36fc513e02..6c1bb42929 100644 --- a/applications/solvers/DNS/dnsFoam/createFields.H +++ b/applications/solvers/DNS/dnsFoam/createFields.H @@ -26,4 +26,4 @@ mesh ); -# include "createPhi.H" + #include "createPhi.H" diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C index d3f1da2d99..befa5e9655 100644 --- a/applications/solvers/DNS/dnsFoam/dnsFoam.C +++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -110,7 +110,12 @@ int main(int argc, char *argv[]) if (runTime.outputTime()) { - calcEk(U, K).write(runTime.timePath()/"Ek", runTime.graphFormat()); + calcEk(U, K).write + ( + runTime.path()/"graphs"/runTime.timeName(), + "Ek", + runTime.graphFormat() + ); } Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C index 483cb276cd..3b27deb210 100644 --- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C +++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) Info<< "\nStarting time loop\n" << endl; - while (pimple.loop()) + while (runTime.loop()) { Info<< "Time = " << runTime.timeName() << nl << endl; diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C index 4e9559a6d1..92af69626c 100644 --- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C +++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C @@ -41,12 +41,27 @@ Description #include "faceSet.H" #include "DynamicList.H" +#include #include "MeshedSurfaces.H" using namespace Foam; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +namespace Foam +{ + template<> + inline unsigned Hash::operator()(const face& t, unsigned seed) const + { + return Hasher(t.cdata(),t.size()*sizeof(label), seed); + } + + template<> + inline unsigned Hash::operator()(const face& t) const + { + return Hash::operator()(t, 0); + } +} const string SEPARATOR(" -1"); bool isSeparator(const string& line) @@ -98,7 +113,7 @@ void readHeader(IFstream& is) } else { - Sout<< line << endl; + Info<< line << endl; } } } @@ -107,7 +122,7 @@ void readHeader(IFstream& is) // Skip void skipSection(IFstream& is) { - Sout<< "Skipping section at line " << is.lineNumber() << '.' << endl; + Info<< "Skipping section at line " << is.lineNumber() << '.' << endl; string line; @@ -119,10 +134,6 @@ void skipSection(IFstream& is) { break; } - else - { -// Sout<< line << endl; - } } } @@ -148,19 +159,19 @@ void readUnits scalar& tempOffset ) { - Sout<< "Starting reading units at line " << is.lineNumber() << '.' << endl; + Info<< "Starting reading units at line " << is.lineNumber() << '.' << endl; string line; is.getLine(line); label l = readLabel(IStringStream(line.substr(0, 10))()); - Sout<< "l:" << l << endl; + Info<< "l:" << l << endl; string units(line.substr(10, 20)); - Sout<< "units:" << units << endl; + Info<< "units:" << units << endl; label unitType = readLabel(IStringStream(line.substr(30, 10))()); - Sout<< "unitType:" << unitType << endl; + Info<< "unitType:" << unitType << endl; // Read lengthscales is.getLine(line); @@ -172,7 +183,7 @@ void readUnits is.getLine(line); tempOffset = readUnvScalar(line.substr(0, 25)); - Sout<< "Unit factors:" << nl + Info<< "Unit factors:" << nl << " Length scale : " << lengthScale << nl << " Force scale : " << forceScale << nl << " Temperature scale : " << tempScale << nl @@ -189,7 +200,7 @@ void readPoints DynamicList