From c0882aef0c95ad0d47184e9969fc42c475d78e96 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 6 Jul 2012 17:42:22 +0100 Subject: [PATCH 01/10] ENH: flange: tighten min-tet volume since has little effect --- tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict index feb4f2f871..66499680bd 100644 --- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict +++ b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict @@ -292,7 +292,7 @@ meshQualityControls // <0 = inside out tet, // 0 = flat tet // 1 = regular tet - minTetQuality 1e-30; + minTetQuality 1e-9; //- Minimum face area. Set to <0 to disable. minArea -1; From 8f2874056886185c7d1e00ca3c4c6e5293142784 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 9 Jul 2012 09:06:41 +0100 Subject: [PATCH 02/10] COMP: Intel: add add-needed link flags for modern linux platforms --- wmake/rules/linux64Icc/c | 2 +- wmake/rules/linux64Icc/c++ | 4 ++-- wmake/rules/linuxIcc/c | 2 +- wmake/rules/linuxIcc/c++ | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wmake/rules/linux64Icc/c b/wmake/rules/linux64Icc/c index 08ea0f8049..1085d50498 100644 --- a/wmake/rules/linux64Icc/c +++ b/wmake/rules/linux64Icc/c @@ -13,4 +13,4 @@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ LINK_LIBS = $(cDBUG) -L$(IA32ROOT)/lib LINKLIBSO = $(cc) $(cFLAGS) -shared -LINKEXE = $(cc) $(cFLAGS) +LINKEXE = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++ index 5ad41fd9b4..dfad97cee6 100644 --- a/wmake/rules/linux64Icc/c++ +++ b/wmake/rules/linux64Icc/c++ @@ -17,5 +17,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -L$(IA64ROOT)/lib -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/linuxIcc/c b/wmake/rules/linuxIcc/c index 269eeaba47..e8059d9dbb 100644 --- a/wmake/rules/linuxIcc/c +++ b/wmake/rules/linuxIcc/c @@ -13,4 +13,4 @@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ LINK_LIBS = $(cDBUG) -L$(IA32ROOT)/lib LINKLIBSO = $(cc) $(cFLAGS) -shared -LINKEXE = $(cc) $(cFLAGS) +LINKEXE = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxIcc/c++ b/wmake/rules/linuxIcc/c++ index 409e289014..d06a874848 100644 --- a/wmake/rules/linuxIcc/c++ +++ b/wmake/rules/linuxIcc/c++ @@ -19,5 +19,5 @@ cpptoo = $(Ctoo) #LINK_LIBS = $(c++DBUG) -lstdc++ LINK_LIBS = $(c++DBUG) -L$(IA32ROOT)/lib -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed From 2587c7d641a1dc4757b43c1301bb8d94b99b5f50 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 9 Jul 2012 09:24:23 +0100 Subject: [PATCH 03/10] GIT: boundary: not needed --- .../icoFoam/cavity/constant/polyMesh/boundary | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary deleted file mode 100644 index 61feadd974..0000000000 --- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -3 -( - movingWall - { - type wall; - nFaces 20; - startFace 760; - } - fixedWalls - { - type wall; - nFaces 60; - startFace 780; - } - frontAndBack - { - type empty; - nFaces 800; - startFace 840; - } -) - -// ************************************************************************* // From 58cf28ffe5938fdb35309a62a5cebcad0d6e079d Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 9 Jul 2012 14:34:59 +0100 Subject: [PATCH 04/10] BUG: extendedLeastSquares: determinant is 0..8 only for face-area weighted --- .../extendedLeastSquaresGrad.H | 6 +++--- .../extendedLeastSquaresVectors.C | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H index 43c398bbf1..f734409d09 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ public: gradScheme(mesh), minDet_(readScalar(schemeData)) { - if (minDet_ < 0 || minDet_ > 8) + if (minDet_ < 0) //-for facearea weighted: || minDet_ > 8) { FatalIOErrorIn ( @@ -93,7 +93,7 @@ public: "(const fvMesh&, Istream& schemeData)", schemeData ) << "Minimum determinant = " << minDet_ - << " should be >= 0 and <= 8" + << " should be >= 0" // and <= 8" << exit(FatalIOError); } } diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C index e9ecd484c3..254038b3fa 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C @@ -138,7 +138,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const else if (nDims == 2) { Info<< "extendedLeastSquares : detected " << nDims - << " valid directions. Missing direction " << twoD << nl << endl; + << " valid directions. Missing direction " << twoD << endl; } @@ -207,6 +207,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const << "min(detdd) = " << min(detdd) << nl << "average(detdd) = " << average(detdd) << endl; + label nAdaptedCells = 0; label nAddCells = 0; label maxNaddCells = 4*detdd.size(); additionalCellsPtr_ = new List(maxNaddCells); @@ -216,6 +217,8 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const { label count = 0; + label oldNAddCells = nAddCells; + while (++count < 100 && detdd[i] < minDet_) { if (nAddCells == maxNaddCells) @@ -305,16 +308,24 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const detdd[i] = det(dd[i]); } } + + if (oldNAddCells < nAddCells) + { + nAdaptedCells++; + } } additionalCells_.setSize(nAddCells); reduce(nAddCells, sumOp