From ab1c1d1373849e3fcdd8aa0f963e022ed2286927 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 22 Jan 2014 17:51:51 +0000 Subject: [PATCH 01/19] ENH: simpleReactingParcelFoam - added density under-relaxation --- .../reactingParcelFoam/simpleReactingParcelFoam/pEqn.H | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H index 66ac498923..db14dfaa86 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H @@ -1,6 +1,4 @@ { - rho = thermo.rho(); - // Thermodynamic density needs to be updated by psi*d(p) after the // pressure solution - done in 2 parts. Part 1: thermo.rho() -= psi*p; @@ -54,6 +52,7 @@ rho = thermo.rho(); rho = max(rho, rhoMin); rho = min(rho, rhoMax); + rho.relax(); Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl; } From 17ed136e5edde2769f5b34a55c93ede5631def5d Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 22 Jan 2014 17:53:45 +0000 Subject: [PATCH 02/19] ENH: layer addition/removal - added debug info on deletion of addressing --- .../layerAdditionRemoval.C | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C index f99612eed6..a1a8d22846 100644 --- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C +++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,9 +108,27 @@ Foam::scalar Foam::layerAdditionRemoval::readOldThickness void Foam::layerAdditionRemoval::clearAddressing() const { - // Layer removal data - deleteDemandDrivenData(pointsPairingPtr_); - deleteDemandDrivenData(facesPairingPtr_); + if (pointsPairingPtr_) + { + if (debug) + { + Pout<< "layerAdditionRemoval::clearAddressing()" << nl + << " clearing pointsPairingPtr_" << endl; + } + + deleteDemandDrivenData(pointsPairingPtr_); + } + + if (facesPairingPtr_) + { + if (debug) + { + Pout<< "layerAdditionRemoval::clearAddressing()" << nl + << " clearing facesPairingPtr_" << endl; + } + + deleteDemandDrivenData(facesPairingPtr_); + } } From 1fe72a81322b875ad6ae27d5853259753dc1904d Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 22 Jan 2014 19:19:50 +0000 Subject: [PATCH 03/19] ENH: lagrangian tutorial updates --- .../lagrangian/DPMFoam/Goldschmidt/system/fvSolution | 8 ++++---- .../counterFlowFlame2D/system/fvSchemes | 4 ++-- .../counterFlowFlame2D/system/fvSolution | 4 ++-- .../MPPICFoam/Goldschmidt/system/controlDict | 2 +- .../MPPICFoam/Goldschmidt/system/fvSolution | 12 ++++++------ .../lagrangian/MPPICFoam/column/system/fvSolution | 12 ++++++------ .../MPPICFoam/injectionChannel/system/fvSolution | 4 ++-- .../simplifiedSiwek/system/fvSolution | 11 ++++------- .../cylinder/system/fvSolution | 6 ++++-- .../cylinder/system/wallFilmRegion/fvSolution | 8 ++++---- .../hotBoxes/system/fvSolution | 6 +++--- .../rivuletPanel/system/fvSolution | 4 ++-- .../rivuletPanel/system/wallFilmRegion/fvSolution | 8 ++++---- .../splashPanel/system/fvSolution | 4 ++-- .../splashPanel/system/wallFilmRegion/fvSolution | 8 ++++---- .../reactingParcelFoam/filter/system/fvSolution | 4 ++-- .../reactingParcelFoam/parcelInBox/system/fvSolution | 4 ++-- .../verticalChannel/system/fvSolution | 4 ++-- .../sprayFoam/aachenBomb/system/fvSolution | 4 ++-- 19 files changed, 58 insertions(+), 59 deletions(-) diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution index 984e70bf68..b78de15ced 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution @@ -43,16 +43,16 @@ solvers "(U.air|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } "(U.air|k|omega)Final" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes index 1e91b43fba..73cdf5dcaa 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes @@ -29,12 +29,12 @@ divSchemes { default none; - div(phi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinear 1; div(phi,Yi_h) Gauss limitedLinear 1; div(phi,K) Gauss limitedLinear 1; div(phid,p) Gauss limitedLinear 1; div(phi,epsilon) Gauss limitedLinear 1; - div(phi,k) Gauss limitedLinear 1; + div(phi,k) Gauss limitedLinear 1; div((muEff*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution index cf6feec247..2edbfb9c4e 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution @@ -38,8 +38,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-6; relTol 0.1; } diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict index 808ac7e71c..073b1ed886 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict @@ -23,7 +23,7 @@ startTime 0; stopAt endTime; -endTime 10; +endTime 5; deltaT 2e-4; diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution index e1353a6e33..96583c9110 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution @@ -43,24 +43,24 @@ solvers "(U.air|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } "(U.air|k|omega)Final" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } kinematicCloud:alpha { - solver PCG; //PBiCG; - preconditioner DIC; //DILU; + solver PCG; + preconditioner DIC; tolerance 1e-06; relTol 0; } diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution index d52e9d19e9..1fc9953c00 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution @@ -33,24 +33,24 @@ solvers U.air { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } U.airFinal { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } kinematicCloud:alpha { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0; } diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution index b79164acae..e53bc1e515 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution @@ -43,8 +43,8 @@ solvers "(U|k|omega).*" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution index 8294bbda04..b30a44e775 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution @@ -56,8 +56,8 @@ solvers "(U|h|R|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } @@ -71,16 +71,12 @@ solvers "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0.1; + $h; } "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)Final" { $Yi; - preconditioner DILU; tolerance 1e-06; relTol 0; } @@ -107,4 +103,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution index b05dd58db6..656cf19996 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -73,6 +73,7 @@ solvers } } + PIMPLE { nCorrectors 2; @@ -80,6 +81,7 @@ PIMPLE momentumPredictor yes; } + relaxationFactors { fields diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution index eedbd097d3..e52ac35a05 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution index fcce5dd225..331f1752d7 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -49,7 +49,7 @@ solvers p_rgh { - solver GAMG; + solver GAMG; tolerance 0; relTol 0.1; smoother DICGaussSeidel; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution index b05dd58db6..ec5c3dec0e 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution index 86cdc388bf..1d67d6d259 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution index b05dd58db6..ec5c3dec0e 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution index eedbd097d3..e52ac35a05 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution index 7af9d07fae..85d0e7b998 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution index 50950087e3..a42e10c1b5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution index f52df1d2f8..d77e5f75e9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0.1; } diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution index 9cff5583eb..a8d892dbdc 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } From 5fffbd7bc3c622372187f18031b1b45447b24421 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 22 Jan 2014 19:19:50 +0000 Subject: [PATCH 04/19] ENH: lagrangian tutorial updates --- .../DPMFoam/Goldschmidt/system/fvSolution | 8 +++---- .../counterFlowFlame2D/system/fvSchemes | 4 ++-- .../counterFlowFlame2D/system/fvSolution | 18 +++++++++----- .../MPPICFoam/Goldschmidt/system/controlDict | 2 +- .../MPPICFoam/Goldschmidt/system/fvSolution | 16 ++++++++----- .../MPPICFoam/column/system/fvSolution | 24 ++++++++++++------- .../injectionChannel/system/fvSolution | 4 ++-- .../simplifiedSiwek/system/fvSolution | 11 ++++----- .../cylinder/system/fvSolution | 16 +++++++++---- .../cylinder/system/wallFilmRegion/fvSolution | 8 +++---- .../hotBoxes/system/fvSolution | 6 ++--- .../rivuletPanel/system/fvSolution | 14 +++++++---- .../system/wallFilmRegion/fvSolution | 8 +++---- .../splashPanel/system/fvSolution | 14 +++++++---- .../system/wallFilmRegion/fvSolution | 8 +++---- .../filter/system/fvSolution | 4 ++-- .../parcelInBox/system/fvSolution | 4 ++-- .../verticalChannel/system/fvSolution | 4 ++-- .../sprayFoam/aachenBomb/system/fvSolution | 16 +++++++++---- 19 files changed, 114 insertions(+), 75 deletions(-) diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution index 984e70bf68..b78de15ced 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution @@ -43,16 +43,16 @@ solvers "(U.air|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } "(U.air|k|omega)Final" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes index 1e91b43fba..73cdf5dcaa 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes @@ -29,12 +29,12 @@ divSchemes { default none; - div(phi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinear 1; div(phi,Yi_h) Gauss limitedLinear 1; div(phi,K) Gauss limitedLinear 1; div(phid,p) Gauss limitedLinear 1; div(phi,epsilon) Gauss limitedLinear 1; - div(phi,k) Gauss limitedLinear 1; + div(phi,k) Gauss limitedLinear 1; div((muEff*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution index cf6feec247..205e4f6276 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution @@ -24,10 +24,16 @@ solvers p { - solver PCG; - preconditioner DIC; - tolerance 1e-6; - relTol 0.1; + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } pFinal @@ -38,8 +44,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-6; relTol 0.1; } diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict index 808ac7e71c..073b1ed886 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict @@ -23,7 +23,7 @@ startTime 0; stopAt endTime; -endTime 10; +endTime 5; deltaT 2e-4; diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution index e1353a6e33..6a9e257c0a 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution @@ -43,26 +43,30 @@ solvers "(U.air|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } "(U.air|k|omega)Final" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } kinematicCloud:alpha { - solver PCG; //PBiCG; - preconditioner DIC; //DILU; + solver GAMG; tolerance 1e-06; relTol 0; + smoother GaussSeidel; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } } diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution index d52e9d19e9..3603be1ce2 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution @@ -19,10 +19,16 @@ solvers { p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; + solver GAMG; + tolerance 0; relTol 0.01; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } pFinal @@ -33,24 +39,24 @@ solvers U.air { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } U.airFinal { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0; } kinematicCloud:alpha { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0; } diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution index b79164acae..e53bc1e515 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution @@ -43,8 +43,8 @@ solvers "(U|k|omega).*" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution index 8294bbda04..b30a44e775 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution @@ -56,8 +56,8 @@ solvers "(U|h|R|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } @@ -71,16 +71,12 @@ solvers "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0.1; + $h; } "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)Final" { $Yi; - preconditioner DILU; tolerance 1e-06; relTol 0; } @@ -107,4 +103,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution index b05dd58db6..b2d6387581 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -54,10 +54,16 @@ solvers p_rgh { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 0; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } p_rghFinal @@ -73,6 +79,7 @@ solvers } } + PIMPLE { nCorrectors 2; @@ -80,6 +87,7 @@ PIMPLE momentumPredictor yes; } + relaxationFactors { fields diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution index eedbd097d3..e52ac35a05 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution index fcce5dd225..331f1752d7 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -49,7 +49,7 @@ solvers p_rgh { - solver GAMG; + solver GAMG; tolerance 0; relTol 0.1; smoother DICGaussSeidel; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution index b05dd58db6..be992a7810 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -54,10 +54,16 @@ solvers p_rgh { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 0; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } p_rghFinal diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution index 86cdc388bf..1d67d6d259 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution index b05dd58db6..be992a7810 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 0; relTol 0.1; } @@ -54,10 +54,16 @@ solvers p_rgh { - solver PCG; - preconditioner DIC; + solver GAMG; tolerance 0; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } p_rghFinal diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution index eedbd097d3..e52ac35a05 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution @@ -19,15 +19,15 @@ solvers { "(Uf|hf|deltaf\*rhof)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } deltaf { - solver PBiCG; // PCG; - preconditioner DILU; // DIC; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-10; relTol 0; } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution index 7af9d07fae..85d0e7b998 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution index 50950087e3..a42e10c1b5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|epsilon)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution index f52df1d2f8..d77e5f75e9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution @@ -34,8 +34,8 @@ solvers "(U|h|k|omega)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-06; relTol 0.1; } diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution index 9cff5583eb..b9bb909f5b 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution @@ -34,18 +34,24 @@ solvers "(U|h)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-05; relTol 0.1; } p { - solver PCG; - preconditioner DIC; - tolerance 1e-06; + solver GAMG; + tolerance 0; relTol 0.1; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; } pFinal From 81670ff8e0e804bc44263b7f3f114a04a750617b Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 23 Jan 2014 09:51:57 +0000 Subject: [PATCH 05/19] ENH: propeller: added renumbering and vorticity --- tutorials/incompressible/pimpleDyMFoam/propeller/Allrun | 2 ++ tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun index b57761bc1d..5bd4bbf11d 100755 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun @@ -10,4 +10,6 @@ runApplication decomposePar runParallel `getApplication` 4 +runParallel vorticity 4 + runApplication reconstructPar diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre index e3b951232b..793ccb9c4f 100755 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre @@ -15,6 +15,9 @@ runApplication blockMesh runApplication surfaceFeatureExtract runApplication snappyHexMesh -overwrite + +runApplication renumberMesh -overwrite + # force removal of fields generated by snappy \rm -rf 0 cp -rf 0.org 0 From cb01bcec31a0f091ff57afacbb77e27b0b71c829 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 23 Jan 2014 10:53:24 +0000 Subject: [PATCH 06/19] ENH: propeller: use functionObjects --- .../pimpleDyMFoam/propeller/Allrun | 2 - .../pimpleDyMFoam/propeller/system/Q | 22 ++++++++ .../propeller/system/controlDict | 8 +++ .../pimpleDyMFoam/propeller/system/forces | 32 ++++++++++++ .../pimpleDyMFoam/propeller/system/readFields | 21 ++++++++ .../pimpleDyMFoam/propeller/system/surfaces | 52 +++++++++++++++++++ 6 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/Q create mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/forces create mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/readFields create mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun index 5bd4bbf11d..b57761bc1d 100755 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun @@ -10,6 +10,4 @@ runApplication decomposePar runParallel `getApplication` 4 -runParallel vorticity 4 - runApplication reconstructPar diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q new file mode 100644 index 0000000000..aaf32f8a3b --- /dev/null +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +// Calculate Q (from U) +Q +{ + // Where to load it from + functionObjectLibs ("libutilityFunctionObjects.so"); + + type Q; + + // Output every + outputControl outputTime; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict index 2dd542c3d5..264b5c1c1b 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict @@ -58,4 +58,12 @@ adjustTimeStep yes; maxCo 2; +functions +{ + #include "readFields" + #include "Q" + #include "surfaces" + #include "forces" +} + // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces new file mode 100644 index 0000000000..0349e3e87e --- /dev/null +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces @@ -0,0 +1,32 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +forces +{ + type forces; + + functionObjectLibs ( "libforces.so" ); + + outputControl timeStep; + timeInterval 1; + + log yes; + + patches ( "propeller.*" ); + pName p; + UName U; + rhoName rhoInf; // Indicates incompressible + log true; + rhoInf 1; // Redundant for incompressible + + CofR (0 0 0); // Rotation around centre line of propeller + pitchAxis (0 1 0); +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/readFields b/tutorials/incompressible/pimpleDyMFoam/propeller/system/readFields new file mode 100644 index 0000000000..57a93256db --- /dev/null +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/readFields @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +// Make sure all fields for functionObjects are loaded. Prevents any +// problems running with execFlowFunctionObjects. +readFields +{ + // Where to load it from (if not already in solver) + functionObjectLibs ("libfieldFunctionObjects.so"); + + type readFields; + fields (p U k); +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces new file mode 100644 index 0000000000..16d7041a89 --- /dev/null +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +surfaces +{ + type surfaces; + functionObjectLibs ("libsampling.so"); + outputControl outputTime; + + surfaceFormat vtk; + fields ( p U Q); + + interpolationScheme cellPoint; + + surfaces + ( + zNormal + { + type cuttingPlane; + planeType pointAndNormal; + pointAndNormalDict + { + basePoint (0 0 0); + normalVector (0 0 1); + } + interpolate true; + } + + isoQ + { + type isoSurface; + isoField Q; + isoValue 1000; + interpolate true; + } + + propeller + { + type patch; + patches ( "propeller.*" ); + interpolate true; + } + ); +} + + +// ************************************************************************* // From 36f3e513ea1f6554da4cb57ae6c24bc4fa6d2e4a Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 23 Jan 2014 11:24:50 +0000 Subject: [PATCH 07/19] sixDoFRigidBodyMotion: Update code and tutorial cases to use new explicit motion simpleHarmonicMotion case removed temporarily pending the introduction of a suitable motion solver --- .../sixDoFRigidBodyMotionAxisConstraint.C | 2 +- .../sixDoFRigidBodyMotionIO.C | 14 +--- .../sixDoFRigidBodyMotionSolver.C | 14 +++- .../0.org/pointDisplacement | 74 +---------------- .../constant/dynamicMeshDict | 66 +++++++++++++-- .../constant/polyMesh/boundary | 16 ++-- .../system/controlDict | 26 +----- .../constant/polyMesh/boundary | 16 ++-- .../0.org/pointDisplacement | 80 ------------------- .../simpleHarmonicMotion/Allclean | 11 --- .../simpleHarmonicMotion/Allrun | 19 ----- .../constant/dynamicMeshDict | 29 ------- .../constant/polyMesh/blockMeshDict | 66 --------------- .../simpleHarmonicMotion/extractData | 42 ---------- .../simpleHarmonicMotion/shm.gnuplot | 76 ------------------ .../simpleHarmonicMotion/system/controlDict | 61 -------------- .../simpleHarmonicMotion/system/fvSchemes | 50 ------------ .../simpleHarmonicMotion/system/fvSolution | 34 -------- .../simpleHarmonicMotion/system/topoSetDict | 38 --------- 19 files changed, 92 insertions(+), 642 deletions(-) delete mode 100644 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement delete mode 100755 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allclean delete mode 100755 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun delete mode 100644 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict delete mode 100644 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/polyMesh/blockMeshDict delete mode 100755 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/extractData delete mode 100644 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/shm.gnuplot delete mode 100644 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict delete mode 100644 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/fvSchemes delete mode 100644 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/fvSolution delete mode 100644 tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/topoSetDict diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C index 9154e51216..8d4f538326 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C @@ -80,7 +80,7 @@ void Foam::sixDoFRigidBodyMotionConstraints::axis::constrainRotation pointConstraint& pc ) const { - pc.combine(pointConstraint(Tuple2(2, vector(0,1,0)))); + pc.combine(pointConstraint(Tuple2(2, axis_))); } diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C index 11670ba623..f4c0b5b7ed 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,14 +60,8 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const os.writeKeyword("sixDoFRigidBodyMotionRestraint") << restraintType << token::END_STATEMENT << nl; - os.writeKeyword(word(restraintType + "Coeffs")) << nl; - - os << indent << token::BEGIN_BLOCK << nl << incrIndent; - restraints_[rI].write(os); - os << decrIndent << indent << token::END_BLOCK << nl; - os << decrIndent << indent << token::END_BLOCK << endl; } @@ -91,14 +85,8 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const constraints_[rI].sixDoFRigidBodyMotionConstraint::write(os); - os.writeKeyword(word(constraintType + "Coeffs")) << nl; - - os << indent << token::BEGIN_BLOCK << nl << incrIndent; - constraints_[rI].write(os); - os << decrIndent << indent << token::END_BLOCK << nl; - os << decrIndent << indent << token::END_BLOCK << endl; } diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C index e08f31d32f..60cc6bc69e 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C @@ -105,7 +105,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver { if (rhoName_ == "rhoInf") { - rhoInf_ = readScalar(dict.lookup("rhoInf")); + rhoInf_ = readScalar(coeffDict().lookup("rhoInf")); } // Calculate scaling factor everywhere @@ -202,8 +202,16 @@ void Foam::sixDoFRigidBodyMotionSolver::solve() f.calcForcesMoment(); - uniformDimensionedVectorField g = - db().lookupObject("g"); + dimensionedVector g("g", dimAcceleration, vector::zero); + + if (db().foundObject("g")) + { + g = db().lookupObject("g"); + } + else if (coeffDict().found("g")) + { + coeffDict().lookup("g") >> g; + } // scalar ramp = min(max((this->db().time().value() - 5)/10, 0), 1); scalar ramp = 1.0; diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement index 0f8d1bdf1f..71924be16e 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement @@ -23,79 +23,7 @@ boundaryField { wing { - type sixDoFRigidBodyDisplacement; - mass 22.9; - centreOfMass (0.4974612746 -0.01671895744 0.125); - momentOfInertia (1.958864357 3.920839234 2.057121362); - orientation - ( - 0.9953705935 0.09611129781 0 - -0.09611129781 0.9953705935 0 - 0 0 1 - ); - velocity (0 0 0); - acceleration (0 0 0); - angularMomentum (0 0 -2.0); - torque (0 0 0); - rhoName rhoInf; - rhoInf 1; - g (0 -9.81 0); - report on; - constraints - { - maxIterations 500; - - yLine - { - sixDoFRigidBodyMotionConstraint line; - lineCoeffs - { - refPoint (0.25 0.007 0.125); - direction (0 1 0); - } - tolerance 1e-9; - relaxationFactor 0.7; - } - - zAxis - { - sixDoFRigidBodyMotionConstraint axis; - axisCoeffs - { - axis (0 0 1); - } - tolerance 1e-06; - relaxationFactor 0.7; - } - } - restraints - { - verticalSpring - { - sixDoFRigidBodyMotionRestraint linearSpring; - - linearSpringCoeffs - { - anchor (0.25 0.007 0.125); - refAttachmentPt (0.25 0.007 0.125); - stiffness 4000; - damping 2; - restLength 0; - } - } - axialSpring - { - sixDoFRigidBodyMotionRestraint linearAxialAngularSpring; - - linearAxialAngularSpringCoeffs - { - axis (0 0 1); - stiffness 700; - damping 0.5; - referenceOrientation $orientation; - } - } - } + type calculated; value uniform (0 0 0); } diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict index 82d0874bde..438f0ef0ec 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict @@ -10,19 +10,75 @@ FoamFile version 2.0; format ascii; class dictionary; - object motionProperties; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dynamicFvMesh dynamicMotionSolverFvMesh; -motionSolverLibs ("libfvMotionSolvers.so" "libsixDoFRigidBodyMotion.so"); +motionSolverLibs ("libsixDoFRigidBodyMotion.so"); -solver displacementLaplacian; +solver sixDoFRigidBodyMotion; -displacementLaplacianCoeffs +sixDoFRigidBodyMotionCoeffs { - diffusivity inverseDistance (wing); + patches (wing); + innerDistance 0.3; + outerDistance 1; + + mass 22.9; + centreOfMass (0.4974612746 -0.01671895744 0.125); + momentOfInertia (1.958864357 3.920839234 2.057121362); + orientation + ( + 0.9953705935 0.09611129781 0 + -0.09611129781 0.9953705935 0 + 0 0 1 + ); + angularMomentum (0 0 -2); + g (0 -9.81 0); + rhoName rhoInf; + rhoInf 1; + report on; + + constraints + { + yLine + { + sixDoFRigidBodyMotionConstraint line; + direction (0 1 0); + } + + zAxis + { + sixDoFRigidBodyMotionConstraint axis; + axis (0 0 1); + } + } + + restraints + { + verticalSpring + { + sixDoFRigidBodyMotionRestraint linearSpring; + + anchor (0.25 0.007 0.125); + refAttachmentPt (0.25 0.007 0.125); + stiffness 4000; + damping 2; + restLength 0; + } + + axialSpring + { + sixDoFRigidBodyMotionRestraint linearAxialAngularSpring; + + axis (0 0 1); + stiffness 700; + damping 0.5; + referenceOrientation $orientation; + } + } } diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary index 927a3109ec..0dbb06744b 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary @@ -21,40 +21,40 @@ FoamFile { type patch; nFaces 72; - startFace 22911; + startFace 25179; } inlet { type patch; nFaces 40; - startFace 22983; + startFace 25251; } outlet { type patch; nFaces 62; - startFace 23023; + startFace 25291; } front { type empty; inGroups 1(empty); - nFaces 11431; - startFace 23085; + nFaces 12565; + startFace 25353; } back { type empty; inGroups 1(empty); - nFaces 11431; - startFace 34516; + nFaces 12565; + startFace 37918; } wing { type wall; inGroups 1(wall); nFaces 378; - startFace 45947; + startFace 50483; } ) diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict index 5222f6a60c..6f65d2d656 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict @@ -17,7 +17,7 @@ FoamFile application pimpleDyMFoam; -startFrom latestTime; +startFrom startTime; startTime 0; @@ -49,28 +49,4 @@ adjustTimeStep yes; maxCo 0.9; -libs -( - "libOpenFOAM.so" - "libforces.so" -); - -functions -{ - forces - { - type forces; - functionObjectLibs ("libforces.so"); - outputControl timeStep; - outputInterval 10; - patches (wing); - pName p; - UName U; - rhoName rhoInf; - log true; - rhoInf 1; - CofR (0.25 0.007 0.125); - } -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary index 927a3109ec..0dbb06744b 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary @@ -21,40 +21,40 @@ FoamFile { type patch; nFaces 72; - startFace 22911; + startFace 25179; } inlet { type patch; nFaces 40; - startFace 22983; + startFace 25251; } outlet { type patch; nFaces 62; - startFace 23023; + startFace 25291; } front { type empty; inGroups 1(empty); - nFaces 11431; - startFace 23085; + nFaces 12565; + startFace 25353; } back { type empty; inGroups 1(empty); - nFaces 11431; - startFace 34516; + nFaces 12565; + startFace 37918; } wing { type wall; inGroups 1(wall); nFaces 378; - startFace 45947; + startFace 50483; } ) diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement deleted file mode 100644 index 09efbce074..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement +++ /dev/null @@ -1,80 +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 pointVectorField; - location "0.01"; - object pointDisplacement; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 0 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - stationaryWalls - { - type fixedValue; - value uniform (0 0 0); - } - movingBlock - { - type uncoupledSixDoFRigidBodyDisplacement; - centreOfMass (0.5 0.5 0.5); - momentOfInertia (0.1052 0.1052 0.1778); - mass 9.6; - velocity (0 0 0); - acceleration (0 0 0); - angularMomentum (0 0 0); - torque (0 0 0); - gravity (0 0 0); - rhoInf 1; - report on; - restraints - { - topSpring - { - sixDoFRigidBodyMotionRestraint linearSpring; - - linearSpringCoeffs - { - anchor (0.5 0.5 1); - refAttachmentPt $centreOfMass; - stiffness 5000; - damping 50; - restLength 0.4; - } - } - } - constraints - { - fixedOrientation - { - sixDoFRigidBodyMotionConstraint orientation; - } - - zLine - { - sixDoFRigidBodyMotionConstraint line; - - lineCoeffs - { - direction (0 0 1); - } - } - } - value uniform (0 0 0); - } -} - - -// ************************************************************************* // diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allclean b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allclean deleted file mode 100755 index b134761b23..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allclean +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -rm -rf 0 t_vs_cm t_vs_lv shm.eps > /dev/null 2>&1 - -cleanCase - -# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun deleted file mode 100755 index a0ea6affe8..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -cd ${0%/*} || exit 1 # run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Set application name -application=`getApplication` - -runApplication blockMesh -runApplication topoSet -runApplication subsetMesh -overwrite c0 -patch movingBlock -cp -r 0.org 0 > /dev/null 2>&1 -runApplication $application -./extractData log.$application -gnuplot shm.gnuplot - -# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict deleted file mode 100644 index ad68458956..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict +++ /dev/null @@ -1,29 +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 dictionary; - object motionProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dynamicFvMesh dynamicMotionSolverFvMesh; - -motionSolverLibs ("libfvMotionSolvers.so" "libsixDoFRigidBodyMotion.so"); - -solver displacementLaplacian; - -displacementLaplacianCoeffs -{ - diffusivity inverseDistance (movingBlock); -} - - -// ************************************************************************* // diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/polyMesh/blockMeshDict b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/polyMesh/blockMeshDict deleted file mode 100644 index 93055e5f82..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/polyMesh/blockMeshDict +++ /dev/null @@ -1,66 +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 dictionary; - object blockMeshDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -convertToMeters 1; - -vertices -( - (0 0 0) - (1 0 0) - (1 1 0) - (0 1 0) - (0 0 1) - (1 0 1) - (1 1 1) - (0 1 1) -); - -blocks -( - hex (0 1 2 3 4 5 6 7) (9 9 14) simpleGrading (1 1 1) -); - -edges -( -); - -boundary -( - stationaryWalls - { - type patch; - faces - ( - (0 3 2 1) - (2 6 5 1) - (1 5 4 0) - (3 7 6 2) - (0 4 7 3) - (4 5 6 7) - ); - } - movingBlock - { - type patch; - faces (); - } -); - -mergePatchPairs -( -); - -// ************************************************************************* // diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/extractData b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/extractData deleted file mode 100755 index a3c02808aa..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/extractData +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation -# \\/ 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 3 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, see . -# -# Script -# extractData -# -# Description -# Extracts motion data from a simple harmonic motion dynamicMesh case -# -#------------------------------------------------------------------------------ - -grep "Centre of mass" $1 | cut -d ":" -f 2 | cut -d " " -f 4 | tr -d ")" > cM -grep "Linear velocity" $1 | cut -d ":" -f 2 | cut -d " " -f 4 | tr -d ")" > lV -grep -e "^Time = " $1 | cut -d " " -f 3 > times - -paste times cM > t_vs_cm -paste times lV > t_vs_lv - -rm cM lV times - -#------------------------------------------------------------------------------ \ No newline at end of file diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/shm.gnuplot b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/shm.gnuplot deleted file mode 100644 index 270a7f2257..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/shm.gnuplot +++ /dev/null @@ -1,76 +0,0 @@ -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation -# \\/ 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 3 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, see . -# -# Script -# shm.gnuplot -# -# Description -# Creates an .eps graph of OpenFOAM results vs analytical solution -# for a simple harmonic motion dynamicMesh case -# -#------------------------------------------------------------------------------ - -reset - -set samples 2000 - -k = 5000.0 -m = 9.6 -c = 50.0 -a = -0.1 - -omega = sqrt(k/m) -zeta = c/(2.0*m*omega) - -phi = atan((sqrt(1.0 - zeta**2))/zeta) -A = a/sin(phi) - -pos(A, t, omega, phi, zeta) = A*exp(-zeta*omega*t)*sin(sqrt(1-zeta**2)*omega*t + phi) -vel(A, t, omega, phi, zeta) = \ -A*exp(-zeta*omega*t)*\ -( \ - sqrt(1-zeta**2)*omega*cos(sqrt(1-zeta**2)*omega*t + phi) \ -- zeta*omega*sin(sqrt(1-zeta**2)*omega*t + phi) \ -) - -set xlabel "Time/[s]" -set ylabel "Position" - -set ytics nomirror -set y2tics - -set yrange [-0.1:0.1] -set y2range [-2:2] - -set xzeroaxis - -set terminal postscript eps color enhanced solid -set output "shm.eps" - -plot \ - "t_vs_cm" u 1:($2 - 0.6) w l t "Simulation, centre of mass relative to start", \ - pos(A, x, omega, phi, zeta) w l t "Analytical solution, centre of mass", \ - "t_vs_lv" u 1:2 w l axes x1y2 t "Simulation, vertical velocity", \ - vel(A, x, omega, phi, zeta) w l axes x1y2 t "Analytical solution, vertical velocity" - -#------------------------------------------------------------------------------ diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict deleted file mode 100644 index bcc70cf1e2..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict +++ /dev/null @@ -1,61 +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 dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application moveDynamicMesh; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 4; - -deltaT 0.002; - -writeControl adjustableRunTime; - -writeInterval 0.25; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 12; - -writeCompression uncompressed; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable yes; - -adjustTimeStep yes; - -maxCo 0.2; - -maxDeltaT 0.025; - -libs -( - "libOpenFOAM.so" - "libincompressibleRASModels.so" - "libforces.so" -); - -// ************************************************************************* // diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/fvSchemes deleted file mode 100644 index 9b11d59f3d..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/fvSchemes +++ /dev/null @@ -1,50 +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 dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ -} - -laplacianSchemes -{ - default Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ -} - -fluxRequired -{ -} - - -// ************************************************************************* // diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/fvSolution b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/fvSolution deleted file mode 100644 index 209b3b035f..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/fvSolution +++ /dev/null @@ -1,34 +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 dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - cellDisplacement - { - solver GAMG; - tolerance 1e-06; - relTol 0; - smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - } -} - - -// ************************************************************************* // diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/topoSetDict b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/topoSetDict deleted file mode 100644 index cc3385ad76..0000000000 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/topoSetDict +++ /dev/null @@ -1,38 +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 dictionary; - object topoSetDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -actions -( - { - name c0; - type cellSet; - action new; - source boxToCell; - sourceInfo - { - box (0.35 0.35 0.44) (0.65 0.65 0.56); - } - } - - { - name c0; - type cellSet; - action invert; - } -); - -// ************************************************************************* // From bd9b99e707c6a54cb7f694d9b402d781376dde13 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 23 Jan 2014 11:29:58 +0000 Subject: [PATCH 08/19] Updated header --- .../constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C | 2 +- .../sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C index 8d4f538326..c577954a36 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C index 60cc6bc69e..da97394dc4 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License From a7ad50ce7d28701027d3851b0138b2fd63ca1602 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 23 Jan 2014 11:30:45 +0000 Subject: [PATCH 09/19] VoF tutorials: changed interfaceCompression to linear This provided greater accuracy and stability while MULES guarantees boundedness --- tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes | 2 +- tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes | 2 +- .../multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes | 2 +- .../MRFMultiphaseInterFoam/mixerVessel2D/system/fvSchemes | 2 +- .../ras/sloshingTank2D/system/fvSchemes | 2 +- .../laminar/depthCharge2D/system/fvSchemes | 2 +- .../laminar/depthCharge3D/system/fvSchemes | 2 +- .../laminar/damBreak4phase/system/fvSchemes | 2 +- .../interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes | 2 +- .../multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes | 2 +- .../multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes | 2 +- .../multiphase/interFoam/laminar/capillaryRise/system/fvSchemes | 2 +- .../multiphase/interFoam/laminar/damBreak/system/fvSchemes | 2 +- .../multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes | 2 +- tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes | 2 +- .../interFoam/ras/damBreakPorousBaffle/system/fvSchemes | 2 +- .../interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes | 2 +- .../multiphase/interFoam/ras/waterChannel/system/fvSchemes | 2 +- .../multiphase/interFoam/ras/weirOverflow/system/fvSchemes | 2 +- .../interMixingFoam/laminar/damBreak/system/fvSchemes | 2 +- .../interPhaseChangeDyMFoam/propeller/system/fvSchemes | 2 +- .../interPhaseChangeFoam/cavitatingBullet/system/fvSchemes | 2 +- .../multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes | 2 +- .../laminar/damBreak4phaseFine/system/fvSchemes | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes index f9e967e839..6ecda2783c 100644 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes @@ -30,7 +30,7 @@ divSchemes { div(rhoPhi,U) Gauss linearUpwind grad(U); div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression 1; + div(phirb,alpha) Gauss linear; div(phid1,p_rgh) Gauss upwind; div(phid2,p_rgh) Gauss upwind; div(rhoPhi,T) Gauss linearUpwind unlimited; diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes index da652a662a..aaf9168e32 100644 --- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes +++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss linearUpwind grad(U); div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div(phi,k) Gauss upwind; div(phi,omega) Gauss upwind; div((muEff*dev(T(grad(U))))) Gauss linear; diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes index e6b91940f0..a90bcae2d3 100644 --- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss linear; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSchemes index 8c39152314..9f1495f172 100644 --- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss limitedLinearV 1; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes index 85be6a2abe..0e66203335 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes @@ -28,7 +28,7 @@ gradSchemes divSchemes { div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression 1; + div(phirb,alpha) Gauss linear; div(rhoPhi,U) Gauss vanLeerV; div(phi,thermo:rho.water) Gauss linear; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes index 2003e43e50..273c37e720 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes @@ -28,7 +28,7 @@ gradSchemes divSchemes { div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression 1; + div(phirb,alpha) Gauss linear; div(rhoPhi,U) Gauss upwind; div(phi,thermo:rho.water) Gauss upwind; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes index 2003e43e50..273c37e720 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes @@ -28,7 +28,7 @@ gradSchemes divSchemes { div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression 1; + div(phirb,alpha) Gauss linear; div(rhoPhi,U) Gauss upwind; div(phi,thermo:rho.water) Gauss upwind; diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes index fd25001435..0fb6563e2c 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; "div\(phi,.*rho.*\)" Gauss upwind; div(rhoPhi,T) Gauss upwind; div(rhoPhi,K) Gauss upwind; diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes index 6a01390f25..9fe758f3d1 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes index df7685da65..88424a730c 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div((muEff*dev(T(grad(U))))) Gauss linear; diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes index 84e4f5d57d..bf1d065bca 100644 --- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes @@ -30,7 +30,7 @@ divSchemes { div(rhoPhi,U) Gauss linearUpwind grad(U); div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression 1; + div(phirb,alpha) Gauss linear; div(phid1,p_rgh) Gauss upwind; div(phid2,p_rgh) Gauss upwind; div(rhoPhi,T) Gauss linearUpwind unlimited; diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes index ef8581b85f..cdfd201c6e 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes index 672ec59cc1..02317178c6 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss limitedLinearV 1; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes index 21e1243948..ddc0a7b6e4 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss linear; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div(phi,k) Gauss limitedLinear 1; div(phi,B) Gauss limitedLinear 1; div(B) Gauss linear; diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes index ca2cd3a2b8..86fad259ec 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss linear; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes index ca2cd3a2b8..86fad259ec 100644 --- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes +++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss linear; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes index 803b55e995..a05ac072d7 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes +++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss linearUpwind grad(U); div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div(phi,k) Gauss upwind; div(phi,omega) Gauss upwind; div((muEff*dev(T(grad(U))))) Gauss linear; diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes index 053e51aa7f..706b90b7b3 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes +++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes div(rhoPhi,U) Gauss linearUpwind grad(U); div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; "div\(phi,(k|omega)\)" Gauss upwind; div((muEff*dev(T(grad(U))))) Gauss linear; diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes index 3869ad107b..a23cf9d48b 100644 --- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes +++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss linear; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes index 1de7b2421d..31b1e85b56 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { div(rhoPhi,U) Gauss limitedLinearV 1; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes index e60864d7f5..b14f07a132 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes default none; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; UD Gauss upwind; div(rhoPhi,U) Gauss linearUpwind grad(U); div(phi,k) Gauss upwind; diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes index bc5571af9e..2c2507cfbf 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes div(phi,omega) Gauss linearUpwind grad(omega); div(phi,k) Gauss linearUpwind grad(k); div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes index 48eb9c4f98..69de4bdbcd 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes { div(rhoPhi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes index 48eb9c4f98..69de4bdbcd 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes { div(rhoPhi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression; + div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; } From 7899cd77b727ad555f4dfe6b422bfa0a3ef51787 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 23 Jan 2014 12:19:09 +0000 Subject: [PATCH 10/19] BUG: blob: clean up correctly --- tutorials/mesh/foamyHexMesh/blob/Allclean | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tutorials/mesh/foamyHexMesh/blob/Allclean b/tutorials/mesh/foamyHexMesh/blob/Allclean index 8a3c5a3f91..63d0864c3d 100755 --- a/tutorials/mesh/foamyHexMesh/blob/Allclean +++ b/tutorials/mesh/foamyHexMesh/blob/Allclean @@ -6,6 +6,8 @@ cd ${0%/*} || exit 1 # run from this directory cleanCase +rm -rf 0 > /dev/null 2>&1 + rm -rf constant/triSurface/blob.stl.gz > /dev/null 2>&1 rm -rf constant/cellAlignments > /dev/null 2>&1 From 3e414187fca4ad39474ea3947d5c5ceb211fb3ee Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 23 Jan 2014 13:00:00 +0000 Subject: [PATCH 11/19] ENH: simpleShapes: add additional collapsing --- tutorials/mesh/foamyHexMesh/simpleShapes/Allrun | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun index 497c84f91f..8d0a8f27c6 100755 --- a/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun +++ b/tutorials/mesh/foamyHexMesh/simpleShapes/Allrun @@ -23,6 +23,9 @@ runApplication surfaceBooleanFeatures intersection \ runApplication foamyHexMesh runApplication collapseEdges -latestTime -collapseFaceSet indirectPatchFaces +mv log.collapseEdges log.collapseFaceSet + +runApplication collapseEdges -latestTime -collapseFaces # ----------------------------------------------------------------- end-of-file From de78cf6901ed4f0fa62350b1135236ec1fa51544 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 23 Jan 2014 14:53:28 +0000 Subject: [PATCH 12/19] GIT: OpenCFD: removed boundary file --- .../OpenCFD/constant/polyMesh/boundary | 66 ------------------- 1 file changed, 66 deletions(-) delete mode 100644 tutorials/mesh/foamyQuadMesh/OpenCFD/constant/polyMesh/boundary diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/polyMesh/boundary b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/polyMesh/boundary deleted file mode 100644 index 35a7bfe82c..0000000000 --- a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/polyMesh/boundary +++ /dev/null @@ -1,66 +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; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -7 -( - letters_text - { - type patch; - nFaces 1064; - startFace 132063; - } - box_bottom - { - type patch; - nFaces 324; - startFace 133127; - } - box_top - { - type patch; - nFaces 324; - startFace 133451; - } - box_inlet - { - type patch; - nFaces 207; - startFace 133775; - } - box_outlet - { - type patch; - nFaces 207; - startFace 133982; - } - front - { - type empty; - inGroups 1(empty); - nFaces 64792; - startFace 134189; - } - back - { - type empty; - inGroups 1(empty); - nFaces 64792; - startFace 198981; - } -) - -// ************************************************************************* // From 936803562063b447bbe8d14f8758f29200eae0fd Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 23 Jan 2014 15:18:54 +0000 Subject: [PATCH 13/19] CoBlended: added support for mass-flux but currently assuming that the density needed to calculate the volumetric flux is "rho" --- .../schemes/CoBlended/CoBlended.H | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H index 3f15520061..2e2589ccb0 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H @@ -64,6 +64,7 @@ SourceFiles #include "surfaceInterpolationScheme.H" #include "blendedSchemeBase.H" +#include "surfaceInterpolate.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -181,11 +182,6 @@ public: } - //- Destructor - virtual ~CoBlended() - {} - - // Member Functions //- Return the face-based blending factor @@ -195,39 +191,48 @@ public: ) const { const fvMesh& mesh = this->mesh(); + tmp tUflux = faceFlux_; - tmp tbf + if (faceFlux_.dimensions() == dimDensity*dimVelocity*dimArea) + { + // Currently assume that the density field + // corresponding to the mass-flux is named "rho" + const volScalarField& rho = + mesh.objectRegistry::template lookupObject + ("rho"); + + tUflux = faceFlux_/fvc::interpolate(rho); + } + else if (faceFlux_.dimensions() != dimVelocity*dimArea) + { + FatalErrorIn + ( + "CoBlended::blendingFactor()" + ) << "dimensions of faceFlux are not correct" + << exit(FatalError); + } + + return tmp ( new surfaceScalarField ( - IOobject + vf.name() + "BlendingFactor", + scalar(1) + - max ( - vf.name() + "BlendingFactor", - mesh.time().timeName(), - mesh - ), - mesh, - dimensionedScalar("blendingFactor", dimless, 0.0) + min + ( + ( + mesh.time().deltaT()*mesh.deltaCoeffs() + *mag(tUflux)/mesh.magSf() + - Co1_ + )/(Co2_ - Co1_), + scalar(1) + ), + scalar(0) + ) ) ); - - tbf() = - scalar(1) - - max - ( - min - ( - ( - mesh.time().deltaT()*mesh.deltaCoeffs() - *mag(faceFlux_)/mesh.magSf() - - Co1_ - )/(Co2_ - Co1_), - scalar(1) - ), - scalar(0) - ); - - return tbf; } @@ -240,9 +245,6 @@ public: { surfaceScalarField bf(blendingFactor(vf)); - Info<< "weights " << max(bf).value() << " " << min(bf).value() - << endl; - return bf*tScheme1_().weights(vf) + (scalar(1.0) - bf)*tScheme2_().weights(vf); From 32560460e33bc3132b7235cd4b40760f626b1360 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 23 Jan 2014 15:19:34 +0000 Subject: [PATCH 14/19] Updated header --- .../surfaceInterpolation/schemes/CoBlended/CoBlended.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H index 2e2589ccb0..b282e36c93 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License From 1feae6d81372463fb87d9a0cd6075f919a36927b Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 23 Jan 2014 15:19:45 +0000 Subject: [PATCH 15/19] damBreak: use linearUpwind rather than limitedLinear --- .../multiphase/interFoam/laminar/damBreak/system/fvSchemes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes index 02317178c6..cdd6f1ed15 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes @@ -27,7 +27,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss limitedLinearV 1; + div(rhoPhi,U) Gauss linearUpwind grad(U); div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss linear; div((muEff*dev(T(grad(U))))) Gauss linear; From cd33aa2ae1ed7c6118dc457eb83ee5b93cb7b180 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 23 Jan 2014 16:59:40 +0000 Subject: [PATCH 16/19] tutorials/compressible/rhoPimpleFoam/les/pitzDaily: change from h to e to avoid instabilities from dp/dt Also updated schemes and BCs --- .../rhoPimpleFoam/les/pitzDaily/0/U | 2 +- .../rhoPimpleFoam/les/pitzDaily/0/p | 4 +-- .../constant/thermophysicalProperties | 35 +++++-------------- .../les/pitzDaily/system/controlDict | 2 +- .../les/pitzDaily/system/fvSchemes | 5 +-- .../les/pitzDaily/system/fvSolution | 10 +++--- 6 files changed, 19 insertions(+), 39 deletions(-) diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U index 510508331e..29279adbfe 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U @@ -30,7 +30,7 @@ boundaryField outlet { - type inletOutlet; + type pressureInletOutletVelocity; inletValue uniform (0 0 0); value uniform (0 0 0); } diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p index 0f1e50b4b8..ed1ce104ab 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p @@ -28,14 +28,12 @@ boundaryField outlet { type waveTransmissive; - field p; phi phi; - rho rho; psi thermo:psi; gamma 1.3; fieldInf 1e5; lInf 0.3; - value uniform 1e5; + value $internalField; } upperWall diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties index 955bebb2d5..392e2e045b 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties @@ -15,34 +15,15 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -gasThermoTypes -{ - constant - { - type hePsiThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleEnthalpy; - } - - janaf - { - type hePsiThermo; - mixture pureMixture; - transport sutherland; - thermo janaf; - equationOfState perfectGas; - specie specie; - energy sensibleEnthalpy; - } -} - thermoType { - ${:gasThermoTypes.constant}; + type hePsiThermo; + mixture pureMixture; + transport const; + thermo eConst; + equationOfState perfectGas; + specie specie; + energy sensibleInternalEnergy; } mixture @@ -54,7 +35,7 @@ mixture } thermodynamics { - Cp 1000; + Cv 712; Hf 0; } transport diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict index 4524b42aa5..06932c9369 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict @@ -17,7 +17,7 @@ FoamFile application rhoPimpleFoam; -startFrom latestTime; +startFrom startTime; startTime 0; diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes index 1b84b2505e..51d3236831 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes @@ -28,9 +28,10 @@ gradSchemes divSchemes { default none; - div(phi,U) Gauss filteredLinear2V 0.2 0; - div(phi,h) Gauss filteredLinear2 0.2 0; + div(phi,U) Gauss LUST grad(U); + div(phi,e) Gauss LUST grad(e); div(phi,K) Gauss linear; + div(phiv,p) Gauss linear; div(phi,k) Gauss limitedLinear 1; div(phi,B) Gauss limitedLinear 1; div(phi,muTilda) Gauss limitedLinear 1; diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution index bc41567cc8..bd907a689c 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution @@ -31,15 +31,15 @@ solvers relTol 0; } - "(U|h|k|nuTilda)" + "(U|e|k|nuTilda)" { - solver PBiCG; - preconditioner DILU; + solver smoothSolver; + smoother symGaussSeidel; tolerance 1e-6; relTol 0.01; } - "(U|h|k|nuTilda)Final" + "(U|e|k|nuTilda)Final" { $U; relTol 0; @@ -63,7 +63,7 @@ relaxationFactors } equations { - "(U|h|k|epsilon|omega).*" 1; + ".*" 1; } } From c392b0748a805010d5b52168552cc1f7cdd3146b Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 23 Jan 2014 17:13:58 +0000 Subject: [PATCH 17/19] tutorials: deprecate filteredLinear.* in favour of LUST for LES cases --- .../les/flameSpreadWaterSuppressionPanel/system/fvSchemes | 2 +- .../pisoFoam/les/pitzDailyMapped/system/fvSchemes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes index 460de94032..a5dcaf45b6 100755 --- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes +++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes @@ -28,7 +28,7 @@ gradSchemes divSchemes { default none; - div(phi,U) Gauss filteredLinear2V 0.2 0.05; + div(phi,U) Gauss LUST grad(U); div(phi,k) Gauss limitedLinear 1; div(phi,K) Gauss limitedLinear 1; div(phi,Yi_h) Gauss multivariateSelection diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes index 51df032f74..62b8ad368d 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes @@ -28,7 +28,7 @@ gradSchemes divSchemes { default none; - div(phi,U) Gauss filteredLinear2V 0.2 0; + div(phi,U) Gauss LUST grad(U); div(phi,k) Gauss limitedLinear 1; div(phi,B) Gauss limitedLinear 1; div(phi,nuTilda) Gauss limitedLinear 1; From 4ecc2d69f705b86247413b45247c87808de40cdd Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 23 Jan 2014 17:17:18 +0000 Subject: [PATCH 18/19] STYLE: meshRefinementBaffles: spacing --- .../autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C index e2f03c4fe2..76bb6150ef 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C @@ -323,7 +323,7 @@ void Foam::meshRefinement::getBafflePatches } -Foam::Map Foam::meshRefinement::getZoneBafflePatches +Foam::Map Foam::meshRefinement::getZoneBafflePatches ( const bool allowBoundary, const labelList& globalToMasterPatch, From 3341e7c7c1dc291c642a75f797063019a89292db Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 23 Jan 2014 17:40:47 +0000 Subject: [PATCH 19/19] ENH: GAMG: use cacheAgglomeration unless moving case --- .../rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution | 2 +- .../rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution | 2 +- .../angledDuctExplicitFixedCoeff/system/fvSolution | 2 +- .../porousSimpleFoam/angledDuctExplicit/system/fvSolution | 2 +- .../porousSimpleFoam/angledDuctImplicit/system/fvSolution | 2 +- .../porousSimpleFoam/straightDuctImplicit/system/fvSolution | 4 ++-- .../coalChemistryFoam/simplifiedSiwek/system/fvSolution | 2 +- .../laminar/depthCharge2D/system/fvSolution | 2 +- .../laminar/depthCharge3D/system/fvSolution | 2 +- .../laminar/damBreak4phase/system/fvSolution | 4 ++-- .../multiphase/interFoam/les/nozzleFlow2D/system/fvSolution | 2 +- .../interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution | 2 +- .../multiphase/interFoam/ras/waterChannel/system/fvSolution | 2 +- .../interPhaseChangeFoam/cavitatingBullet/system/fvSolution | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution index e2bc9c870d..a61ae9a85d 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -23,7 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution index 1fb7a16e85..13a08e5e1b 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -23,7 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution index 25b10212a3..c259abc052 100644 --- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution +++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution @@ -23,7 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution index 7b598444f7..3feda21ae1 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -23,7 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution index 27f43cb0bd..e0337498e5 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -23,7 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution index 27f43cb0bd..688dee189f 100644 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution @@ -23,7 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 20; agglomerator faceAreaPair; mergeLevels 1; @@ -32,7 +32,7 @@ solvers "(U|k|epsilon)" { solver smoothSolver; - smoother GaussSeidel; + smoother symGaussSeidel; nSweeps 2; tolerance 1e-07; relTol 0.1; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution index b30a44e775..23f65f64b3 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution @@ -41,7 +41,7 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration false; + cacheAgglomeration on; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution index 60308edee5..62218a50fb 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution @@ -41,7 +41,7 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration false; + cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution index 7a04bf3624..563ce52459 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution @@ -36,7 +36,7 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration false; + cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index 6f88113f81..bd2ac2e9f9 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -29,10 +29,10 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration off; + cacheAgglomeration on; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; - mergeLevels 2; + mergeLevels 1; } tolerance 1e-05; relTol 0; diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution index 479dee58a2..cb839db99a 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution @@ -36,7 +36,7 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration false; + cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution index cc69de4db5..1dd68d3063 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution @@ -36,7 +36,7 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration false; + cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution index 1a7bff2000..ba6bfb0754 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution @@ -44,7 +44,7 @@ solvers nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration false; + cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution index f19f2cd8b2..6e09921b2e 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution @@ -81,7 +81,7 @@ solvers nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration false; + cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1;