diff --git a/ReleaseNotes-dev b/ReleaseNotes-dev index 67e9bc7f33..fa80518f35 100644 --- a/ReleaseNotes-dev +++ b/ReleaseNotes-dev @@ -240,11 +240,14 @@ + =snappyHexMesh=: + extrude across multi-processor boundaries + preserve faceZones during layering + + combining patch faces after snapping + *Warning*: - minMedianAxisAngle angle fixed w.r.t. 17x. Set to 90 to get same behaviour as 130 in 17x. - nGrow did not work in 17x. Set to 0 to get same behaviour as 130 in 17x. + - nSolveIter reinstated to smooth internal mesh. Set to 0 + to get same behaviour at 17x. - new minTetQuality setting (see tracking). Disable for 17x compatibility. * Post-processing @@ -309,3 +312,8 @@ * 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/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H index 6587398dab..7e22883256 100644 --- a/applications/solvers/basic/potentialFoam/createFields.H +++ b/applications/solvers/basic/potentialFoam/createFields.H @@ -47,4 +47,10 @@ label pRefCell = 0; scalar pRefValue = 0.0; - setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue); + setRefCell + ( + p, + potentialFlow, + pRefCell, + pRefValue + ); diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index a08e356697..c691dd06e7 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.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 @@ -42,8 +42,8 @@ int main(int argc, char *argv[]) #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" + #include "readControls.H" #include "createFields.H" - #include "readSIMPLEControls.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/basic/potentialFoam/readControls.H b/applications/solvers/basic/potentialFoam/readControls.H new file mode 100644 index 0000000000..8bda4d5017 --- /dev/null +++ b/applications/solvers/basic/potentialFoam/readControls.H @@ -0,0 +1,6 @@ + const dictionary& potentialFlow = + mesh.solutionDict().subDict("potentialFlow"); + + const int nNonOrthCorr = + potentialFlow.lookupOrDefault("nNonOrthogonalCorrectors", 0); + diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H index 80ccb1a560..e854f03d35 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H @@ -19,7 +19,7 @@ pimple.lookupOrDefault("maxDeltaT", GREAT) ); - volScalarField rDeltaT0 = rDeltaT; + volScalarField rDeltaT0("rDeltaT0", rDeltaT); // Set the reciprocal time-step from the local Courant number rDeltaT.dimensionedInternalField() = max diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H index 2a9b92d9f0..4efb76bd45 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H @@ -3,7 +3,7 @@ tmp UEqn ( //pZones.ddt(rho, U) - fvc::ddt(rho, U) + fvm::ddt(rho, U) + fvm::div(phi, U) + turbulence->divDevRhoReff(U) ); diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H index 1e8d8da3e7..208d01b484 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H @@ -49,7 +49,7 @@ piso.lookupOrDefault("maxDeltaT", GREAT) ); - volScalarField rDeltaT0 = rDeltaT; + volScalarField rDeltaT0("rDeltaT0", rDeltaT); // Set the reciprocal time-step from the local Courant number rDeltaT.dimensionedInternalField() = max @@ -64,7 +64,7 @@ // Further limit the reciprocal time-step // in the vicinity of the interface - volScalarField alpha1Bar = fvc::average(alpha1); + volScalarField alpha1Bar(fvc::average(alpha1)); rDeltaT.dimensionedInternalField() = max ( diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H b/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H index 246a79d3c9..72ae38ba06 100644 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H +++ b/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H @@ -11,7 +11,7 @@ fvVectorMatrix UEqn ( //pZones.ddt(rho, U) - fvc::ddt(rho, U) + fvm::ddt(rho, U) + fvm::div(rhoPhi, U) - fvm::laplacian(muEff, U) - (fvc::grad(U) & fvc::grad(muEff)) diff --git a/applications/test/Hashing/hashingTests b/applications/test/Hashing/hashingTests index d1bc45b5d0..0472478422 100644 --- a/applications/test/Hashing/hashingTests +++ b/applications/test/Hashing/hashingTests @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex index fb5c6e972a..3e091a4d7f 100644 --- a/applications/test/dictionary/testDictRegex +++ b/applications/test/dictionary/testDictRegex @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/test/regex/testRegexps b/applications/test/regex/testRegexps index 13a2cf0079..3c89851f71 100644 --- a/applications/test/regex/testRegexps +++ b/applications/test/regex/testRegexps @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict index a20bc07e90..3ae07af37c 100644 --- a/applications/test/router/routerDict +++ b/applications/test/router/routerDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/test/spline/test-splines b/applications/test/spline/test-splines index 9f458f5805..f76c1532ff 100644 --- a/applications/test/spline/test-splines +++ b/applications/test/spline/test-splines @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/test/wordRe/testRegexps b/applications/test/wordRe/testRegexps index 77ec9eabe7..7b7bd2d4a7 100644 --- a/applications/test/wordRe/testRegexps +++ b/applications/test/wordRe/testRegexps @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict b/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict index 25c3b74d2c..342128a2f5 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict index ba1e507504..806c24f580 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict index 4e1bceb7f0..01628a0429 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C index 7b4d17764c..39d5c3db87 100644 --- a/applications/utilities/mesh/advanced/selectCells/selectCells.C +++ b/applications/utilities/mesh/advanced/selectCells/selectCells.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 @@ -268,7 +268,7 @@ label selectOutsideCells // Find cell containing point. Linear search. label cellI = queryMesh.findCell(outsidePts[outsidePtI], -1, false); - if (cellType[cellI] == MESH) + if (cellI != -1 && cellType[cellI] == MESH) { Info<< "Marking cell " << cellI << " containing outside point " << outsidePts[outsidePtI] << " with type " << cellType[cellI] @@ -388,7 +388,8 @@ int main(int argc, char *argv[]) { const point& outsidePoint = outsidePts[outsideI]; - if (queryMesh.findCell(outsidePoint, -1, false) == -1) + label cellI = queryMesh.findCell(outsidePoint, -1, false); + if (returnReduce(cellI, maxOp