From a1cc51b116695d61085ebb017f57089418640c2c Mon Sep 17 00:00:00 2001 From: Chris Greenshields Date: Wed, 15 Jun 2016 07:39:12 +0100 Subject: [PATCH] Tutorials fvSolution files: removed solver entries which use default values; formatted Switch entries consistently across all cases --- .../potentialFoam/cylinder/system/fvSolution | 4 - .../potentialFoam/pitzDaily/system/fvSolution | 4 - .../system/fvSolution | 2 +- .../system/filmRegion/fvSolution | 2 +- .../system/fvSolution | 12 --- .../oppositeBurningPanels/system/fvSolution | 9 -- .../les/smallPoolFire2D/system/fvSolution | 9 -- .../les/smallPoolFire3D/system/fvSolution | 9 -- .../annularThermalMixer/system/fvSolution | 4 - .../ras/angledDuct/system/fvSolution | 2 +- .../ras/mixerVessel2D/system/fvSolution | 6 -- .../angledDuctExplicit/system/fvSolution | 3 - .../angledDuctImplicit/system/fvSolution | 3 - .../system/fvSolution | 3 - .../squareBend/system/fvSolution | 12 --- .../buoyantCavity/system/fvSolution | 4 - .../circuitBoardCooling/system/fvSolution | 4 - .../externalCoupledCavity/system/fvSolution | 4 - .../hotRadiationRoomFvDOM/system/fvSolution | 5 - .../system/bottomWater/fvSolution | 6 +- .../system/leftSolid/fvSolution | 41 ++++++- .../system/rightSolid/fvSolution | 41 ++++++- .../system/topAir/fvSolution | 84 ++++++++++++++- .../system/bottomAir/fvSolution | 6 +- .../system/leftSolid/fvSolution | 41 ++++++- .../system/rightSolid/fvSolution | 41 ++++++- .../system/topAir/fvSolution | 77 ++++++++++++- .../heatExchanger/system/air/fvSolution | 4 - .../heatExchanger/system/porous/fvSolution | 4 - .../system/bottomAir/fvSolution | 6 +- .../system/leftSolid/fvSolution | 42 +++++++- .../system/rightSolid/fvSolution | 42 +++++++- .../system/topAir/fvSolution | 82 +++++++++++++- .../SRFPimpleFoam/rotor2D/system/fvSolution | 3 - .../pitzDaily/system/fvSolution | 6 -- .../offsetCylinder/system/fvSolution | 6 -- .../mixerVesselAMI2D/system/fvSolution | 7 +- .../movingCone/system/fvSolution | 5 - .../oscillatingInletACMI2D/system/fvSolution | 3 - .../pimpleDyMFoam/propeller/system/fvSolution | 3 - .../system/fvSolution | 10 -- .../wingMotion2D_simpleFoam/system/fvSolution | 6 -- .../pimpleFoam/TJunction/system/fvSolution | 8 -- .../pimpleFoam/TJunctionFan/system/fvSolution | 8 -- .../pimpleFoam/channel395/system/fvSolution | 6 -- .../elipsekkLOmega/system/fvSolution | 4 - .../pimpleFoam/pitzDaily/system/fvSolution | 4 - .../laminar/porousBlockage/system/fvSolution | 6 -- .../les/motorBike/lesFiles/fvSolution | 5 - .../les/motorBike/motorBike/system/fvSolution | 6 -- .../pisoFoam/les/pitzDaily/system/fvSolution | 6 -- .../les/pitzDailyMapped/system/fvSolution | 6 -- .../pisoFoam/ras/cavity/system/fvSolution | 6 -- .../ras/cavityCoupledU/system/fvSolution | 6 -- .../angledDuctExplicit/system/fvSolution | 3 - .../angledDuctImplicit/system/fvSolution | 3 - .../backgroundMeshDecomposition/fvSolution | 61 ++++++++++- .../system/cellShapeControlMesh/fvSolution | 61 ++++++++++- .../straightDuctImplicit/system/fvSolution | 3 - .../simpleFoam/airFoil2D/system/fvSolution | 6 -- .../mixerVessel2D/system/fvSolution | 3 - .../simpleFoam/motorBike/system/fvSolution | 6 -- .../simpleFoam/pipeCyclic/system/fvSolution | 4 - .../simpleFoam/pitzDaily/system/fvSolution | 6 -- .../pitzDailyExptInlet/system/fvSolution | 6 -- .../simpleFoam/rotorDisk/system/fvSolution | 4 - .../turbineSiting/system/fvSolution | 6 -- .../windAroundBuildings/system/fvSolution | 4 - .../DPMFoam/Goldschmidt/system/fvSolution | 8 -- .../MPPICFoam/Goldschmidt/system/fvSolution | 12 --- .../MPPICFoam/column/system/fvSolution | 6 -- .../MPPICFoam/cyclone/system/fvSolution | 12 --- .../injectionChannel/system/fvSolution | 8 -- .../simplifiedSiwek/system/fvSolution | 7 -- .../cylinder/system/fvSolution | 6 -- .../cylinder/system/wallFilmRegion/fvSolution | 2 +- .../hotBoxes/system/fvSolution | 6 -- .../system/wallFilmRegion.orig/fvSolution | 2 +- .../rivuletPanel/system/fvSolution | 6 -- .../system/wallFilmRegion/fvSolution | 2 +- .../splashPanel/system/fvSolution | 6 -- .../system/wallFilmRegion/fvSolution | 2 +- .../counterFlowFlame2DLTS/system/fvSolution | 6 -- .../filter/system/fvSolution | 6 -- .../parcelInBox/system/fvSolution | 6 -- .../verticalChannel/system/fvSolution | 6 -- .../verticalChannelLTS/system/fvSolution | 6 -- .../verticalChannel/system/fvSolution | 6 -- .../sprayFoam/aachenBomb/system/fvSolution | 6 -- .../backgroundMeshDecomposition/fvSolution | 23 +++- .../backgroundMeshDecomposition/fvSolution | 30 +++++- .../backgroundMeshDecomposition/fvSolution | 102 +++++++++++++++++- .../mixerVessel/system/fvSolution | 7 -- .../simpleShapes/system/fvSolution | 3 - .../SnakeRiverCanyon/system/fvSolution | 4 - .../les/throttle/system/fvSolution | 6 -- .../les/throttle3D/system/fvSolution | 6 -- .../ras/throttle/system/fvSolution | 6 -- .../ras/sloshingTank2D/system/fvSolution | 21 +--- .../laminar/depthCharge2D/system/fvSolution | 20 ---- .../laminar/depthCharge3D/system/fvSolution | 20 ---- .../laminar/damBreak4phase/system/fvSolution | 21 ---- .../driftFluxFoam/ras/dahl/system/fvSolution | 3 - .../ras/mixerVessel2D/system/fvSolution | 3 - .../ras/tank3D/system/fvSolution | 3 - .../ras/DTCHull/system/fvSolution | 8 -- .../damBreakWithObstacle/system/fvSolution | 8 +- .../ras/floatingObject/system/fvSolution | 23 +--- .../ras/mixerVesselAMI/system/fvSolution | 7 -- .../ras/sloshingTank2D/system/fvSolution | 21 +--- .../ras/sloshingTank2D3DoF/system/fvSolution | 21 +--- .../ras/sloshingTank3D/system/fvSolution | 21 +--- .../ras/sloshingTank3D3DoF/system/fvSolution | 21 +--- .../ras/sloshingTank3D6DoF/system/fvSolution | 21 +--- .../ras/testTubeMixer/system/fvSolution | 21 +--- .../les/nozzleFlow2D/system/fvSolution | 20 ---- .../interFoam/ras/DTCHull/system/fvSolution | 8 -- .../ras/angledDuct/system/fvSolution | 13 --- .../ras/waterChannel/system/fvSolution | 13 --- .../propeller/system/fvSolution | 3 - .../cavitatingBullet/system/fvSolution | 13 --- .../bubbleColumn/system/fvSolution | 7 -- .../damBreak4phase/system/fvSolution | 14 --- .../damBreak4phaseFine/system/fvSolution | 14 --- .../mixerVessel2D/system/fvSolution | 14 --- .../laminar/damBreak4phase/system/fvSolution | 21 ---- .../damBreak4phaseFine/system/fvSolution | 21 ---- .../oscillatingBox/system/fvSolution | 10 -- .../oscillatingBox/system/fvSolution | 6 -- .../laminar/bubbleColumn/system/fvSolution | 7 -- .../laminar/mixerVessel2D/system/fvSolution | 14 --- .../LES/bubbleColumn/system/fvSolution | 7 -- .../RAS/LBend/system/fvSolution | 7 -- .../RAS/bubbleColumn/system/fvSolution | 7 -- .../system/fvSolution | 7 -- .../RAS/fluidisedBed/system/fvSolution | 7 -- .../RAS/wallBoiling/system/fvSolution | 9 +- .../laminar/bubbleColumn/system/fvSolution | 7 -- .../bubbleColumnEvaporating/system/fvSolution | 7 -- .../system/fvSolution | 7 -- .../bubbleColumnIATE/system/fvSolution | 7 -- .../laminar/fluidisedBed/system/fvSolution | 7 -- .../laminar/injection/system/fvSolution | 7 -- .../laminar/mixerVessel2D/system/fvSolution | 7 -- .../laminar/steamInjection/system/fvSolution | 2 +- .../lockExchange/system/fvSolution | 4 - .../LES/bubbleColumn/system/fvSolution | 7 -- .../RAS/bubbleColumn/system/fvSolution | 7 -- .../RAS/fluidisedBed/system/fvSolution | 7 -- .../laminar/bubbleColumn/system/fvSolution | 7 -- .../bubbleColumnIATE/system/fvSolution | 7 -- .../laminar/fluidisedBed/system/fvSolution | 7 -- .../laminar/injection/system/fvSolution | 7 -- .../laminar/mixerVessel2D/system/fvSolution | 7 -- .../plateHole/system/fvSolution | 3 - .../beamEndLoad/system/fvSolution | 3 - 156 files changed, 777 insertions(+), 1073 deletions(-) mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution mode change 120000 => 100644 tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution mode change 120000 => 100644 tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution mode change 120000 => 100644 tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution mode change 120000 => 100644 tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution mode change 120000 => 100644 tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution mode change 120000 => 100644 tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSolution b/tutorials/basic/potentialFoam/cylinder/system/fvSolution index 41a58da20..ab5811d81 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/fvSolution +++ b/tutorials/basic/potentialFoam/cylinder/system/fvSolution @@ -21,10 +21,6 @@ solvers { solver GAMG; smoother DIC; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; tolerance 1e-06; relTol 0.01; diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution index 4682f4cc8..efddc7e60 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution +++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution @@ -21,10 +21,6 @@ solvers { solver GAMG; smoother DIC; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; tolerance 1e-06; relTol 0.01; diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution index 58314bd62..b76b24182 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution @@ -69,7 +69,7 @@ PIMPLE nCorrectors 2; nOuterCorrectors 1; nNonOrthogonalCorrectors 0; - momentumPredictor true; + momentumPredictor yes; } diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution index 9872d8c84..e247ccbf4 100644 --- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution +++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution @@ -43,7 +43,7 @@ solvers PISO { - momentumPredictor true; + momentumPredictor yes; nOuterCorr 1; nCorr 1; nNonOrthCorr 0; diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution index c41caf799..12f3b6643 100644 --- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution +++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution @@ -39,10 +39,6 @@ solvers tolerance 1e-5; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; }; p_rghFinal @@ -51,11 +47,7 @@ solvers tolerance 1e-6; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; //nCellsInCoarsestLevel 1; - agglomerator faceAreaPair; - mergeLevels 1; }; ph_rgh @@ -84,10 +76,6 @@ solvers tolerance 1e-4; relTol 0; smoother DILU; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 20; } } diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution index 0182eed8b..1329cb1ca 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution @@ -31,10 +31,6 @@ solvers tolerance 1e-6; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; }; p_rghFinal @@ -70,12 +66,7 @@ solvers tolerance 1e-4; relTol 0; smoother symGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 1; - nPreSweeps 0; nPostSweeps 1; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution index 674390637..dcf0353bf 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution @@ -39,10 +39,6 @@ solvers tolerance 1e-6; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; }; p_rghFinal @@ -81,12 +77,7 @@ solvers tolerance 1e-4; relTol 0.1; smoother symGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 3; - nPreSweeps 0; nPostSweeps 1; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution index a80537572..a26c2f30b 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution @@ -31,10 +31,6 @@ solvers tolerance 1e-6; relTol 0.1; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; }; p_rghFinal @@ -72,12 +68,7 @@ solvers tolerance 1e-4; relTol 0; smoother symGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 1; - nPreSweeps 0; nPostSweeps 1; } diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSolution b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSolution index c23f49d6d..66786f377 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSolution +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSolution @@ -22,10 +22,6 @@ solvers solver GAMG; smoother GaussSeidel; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; tolerance 1e-6; relTol 0.01; diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution index 6e49a505c..ff2440678 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution @@ -69,7 +69,7 @@ PIMPLE } } - turbOnFinalIterOnly off; + turbOnFinalIterOnly no; } relaxationFactors diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution index af90c13eb..d4a55d13c 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution @@ -54,10 +54,7 @@ solvers tolerance 1e-6; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal @@ -66,10 +63,7 @@ solvers tolerance 1e-6; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|h|k|epsilon)" diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution index 6d5e3b2a4..9eee4c23f 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration on; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } U diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution index 357917a0b..8699fd709 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration on; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } e diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution index 22580533e..a054853c3 100644 --- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution +++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration on; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } U diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution index 8fe57aeb7..01cb4393d 100644 --- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution +++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution @@ -23,13 +23,7 @@ solvers tolerance 1e-08; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|e|k|epsilon)" @@ -38,13 +32,7 @@ solvers tolerance 1e-08; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution index b19527e0c..90ffdd49b 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution @@ -25,10 +25,6 @@ solvers smoother DICGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|h|k|epsilon|omega)" diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution index a5f011bb0..66346036c 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution @@ -25,10 +25,6 @@ solvers smoother DICGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|h|k|epsilon|omega)" diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution index d30cdf20b..d9b7d98e9 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution @@ -25,10 +25,6 @@ solvers smoother DICGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|h|k|epsilon|omega)" diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution index 8ce57081a..42b3fef28 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution @@ -31,12 +31,7 @@ solvers tolerance 1e-4; relTol 0; smoother symGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 5; - nPreSweeps 0; nPostSweeps 1; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution index 102345b38..07635c7d2 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution @@ -39,10 +39,6 @@ solvers smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -70,7 +66,7 @@ solvers PIMPLE { - momentumPredictor on; + momentumPredictor yes; nCorrectors 2; nNonOrthogonalCorrectors 0; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution deleted file mode 120000 index 0bde0fc62..000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution new file mode 100644 index 000000000..ccb0d3183 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution @@ -0,0 +1,40 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + h + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.1; + } + + hFinal + { + $h; + tolerance 1e-06; + relTol 0; + } +} + +PIMPLE +{ + nNonOrthogonalCorrectors 0; +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution deleted file mode 120000 index 0bde0fc62..000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution new file mode 100644 index 000000000..ccb0d3183 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution @@ -0,0 +1,40 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + h + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.1; + } + + hFinal + { + $h; + tolerance 1e-06; + relTol 0; + } +} + +PIMPLE +{ + nNonOrthogonalCorrectors 0; +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution deleted file mode 120000 index 90d9c9234..000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../bottomWater/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution new file mode 100644 index 000000000..07635c7d2 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution @@ -0,0 +1,83 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-7; + relTol 0.1; + } + + rhoFinal + { + $rho; + tolerance 1e-7; + relTol 0; + } + + p_rgh + { + solver GAMG; + tolerance 1e-7; + relTol 0.01; + + smoother GaussSeidel; + + } + + p_rghFinal + { + $p_rgh; + tolerance 1e-7; + relTol 0; + } + + "(U|h|k|epsilon|R)" + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-7; + relTol 0.1; + } + + "(U|h|k|epsilon|R)Final" + { + $U; + tolerance 1e-7; + relTol 0; + } +} + +PIMPLE +{ + momentumPredictor yes; + nCorrectors 2; + nNonOrthogonalCorrectors 0; +} + +relaxationFactors +{ + equations + { + "h.*" 1; + "U.*" 1; + } +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution index ee88ddd67..1527d53d6 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution @@ -32,10 +32,6 @@ solvers smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -63,7 +59,7 @@ solvers PIMPLE { - momentumPredictor on; + momentumPredictor yes; nCorrectors 2; nNonOrthogonalCorrectors 0; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution deleted file mode 120000 index 0bde0fc62..000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution new file mode 100644 index 000000000..ccb0d3183 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution @@ -0,0 +1,40 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + h + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.1; + } + + hFinal + { + $h; + tolerance 1e-06; + relTol 0; + } +} + +PIMPLE +{ + nNonOrthogonalCorrectors 0; +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution deleted file mode 120000 index 0bde0fc62..000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution new file mode 100644 index 000000000..ccb0d3183 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution @@ -0,0 +1,40 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + h + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.1; + } + + hFinal + { + $h; + tolerance 1e-06; + relTol 0; + } +} + +PIMPLE +{ + nNonOrthogonalCorrectors 0; +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution deleted file mode 120000 index 745b2bcfe..000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../bottomAir/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution new file mode 100644 index 000000000..1527d53d6 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution @@ -0,0 +1,76 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + "(rho|rhoFinal)" + { + solver PCG + preconditioner DIC; + tolerance 1e-7; + relTol 0; + } + + p_rgh + { + solver GAMG; + tolerance 1e-7; + relTol 0.01; + + smoother GaussSeidel; + + } + + p_rghFinal + { + $p_rgh; + tolerance 1e-7; + relTol 0; + } + + "(U|h|k|epsilon|R)" + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-7; + relTol 0.1; + } + + "(U|h|k|epsilon|R)Final" + { + $U; + tolerance 1e-07; + relTol 0; + } +} + +PIMPLE +{ + momentumPredictor yes; + nCorrectors 2; + nNonOrthogonalCorrectors 0; +} + +relaxationFactors +{ + equations + { + "h.*" 1; + "U.*" 1; + } +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution index 622f5fe32..f8de0ffe7 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution @@ -25,10 +25,6 @@ solvers smoother DIC; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 100; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution index 9ba18c7a3..f912142c5 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution @@ -24,10 +24,6 @@ solvers smoother DIC; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 10; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution index debdfcc0b..fc149dff1 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution @@ -32,10 +32,6 @@ solvers smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|h|k|epsilon|G|Ii)" @@ -56,7 +52,7 @@ solvers SIMPLE { - momentumPredictor on; + momentumPredictor yes; nNonOrthogonalCorrectors 0; pRefCell 0; pRefValue 100000; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution deleted file mode 120000 index 0bde0fc62..000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution new file mode 100644 index 000000000..b743687b8 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution @@ -0,0 +1,41 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + h + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.1; + } +} + +SIMPLE +{ + nNonOrthogonalCorrectors 0; +} + +relaxationFactors +{ + equations + { + h 0.7; + } +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution deleted file mode 120000 index 0bde0fc62..000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../heater/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution new file mode 100644 index 000000000..b743687b8 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution @@ -0,0 +1,41 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + h + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.1; + } +} + +SIMPLE +{ + nNonOrthogonalCorrectors 0; +} + +relaxationFactors +{ + equations + { + h 0.7; + } +} + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution deleted file mode 120000 index 745b2bcfe..000000000 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../bottomAir/fvSolution \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution new file mode 100644 index 000000000..fc149dff1 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution @@ -0,0 +1,81 @@ +/*--------------------------------*- 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 fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG + preconditioner DIC; + tolerance 1e-7; + relTol 0; + } + + p_rgh + { + solver GAMG; + tolerance 1e-7; + relTol 0.01; + + smoother GaussSeidel; + + } + + "(U|h|k|epsilon|G|Ii)" + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-7; + relTol 0.1; + } + + G + { + $p_rgh; + tolerance 1e-05; + relTol 0.1; + } +} + +SIMPLE +{ + momentumPredictor yes; + nNonOrthogonalCorrectors 0; + pRefCell 0; + pRefValue 100000; + rhoMin 0.2; + rhoMax 2; +} + +relaxationFactors +{ + fields + { + rho 1.0; + p_rgh 0.7; + } + equations + { + U 0.3; + h 0.7; + "(k|epsilon|omega)" 0.7; + G 0.7; + "ILambda.*" 0.7; + Qr 0.7; + } +} + +// ************************************************************************* // diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution index 089ea62af..42ea366a4 100644 --- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution +++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution index 064d11bf5..3a4aed8e2 100644 --- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-08; relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|Ua|k|epsilon)" diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution index 1c7b310e9..9a44790f9 100644 --- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution +++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-6; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution index af2204ee4..584ab729f 100644 --- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution @@ -21,12 +21,7 @@ solvers { solver GAMG; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration off; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; + cacheAgglomeration no; tolerance 0.02; relTol 0; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution index 3f4c1cb3c..c99eed8db 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution @@ -23,12 +23,7 @@ solvers tolerance 0; relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; cacheAgglomeration no; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution index 61da67262..acef5b9e7 100644 --- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution @@ -23,9 +23,6 @@ solvers relTol 0; smoother GaussSeidel; cacheAgglomeration no; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; } diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution index 4bb239703..dd6b23ef4 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution @@ -23,9 +23,6 @@ solvers relTol 0; smoother DICGaussSeidel; cacheAgglomeration no; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; } diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution index 60cc53cf3..e9088c348 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution @@ -22,12 +22,6 @@ solvers tolerance 0.02; relTol 0; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } p @@ -65,10 +59,6 @@ solvers tolerance 1e-5; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } } diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution index 0505b50bb..a654467d6 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution @@ -22,12 +22,6 @@ solvers tolerance 1e-7; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } U diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution index 109f3af33..a9f80a1f9 100644 --- a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution @@ -23,10 +23,6 @@ solvers tolerance 1e-06; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal @@ -35,10 +31,6 @@ solvers tolerance 1e-06; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|k|epsilon)" diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution index 109f3af33..a9f80a1f9 100644 --- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution @@ -23,10 +23,6 @@ solvers tolerance 1e-06; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal @@ -35,10 +31,6 @@ solvers tolerance 1e-06; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|k|epsilon)" diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution b/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution index b3abd8eaf..eed8159e4 100644 --- a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 0; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution index 1065ac0db..1d070b6c0 100644 --- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution @@ -23,10 +23,6 @@ solvers tolerance 1e-06; relTol 0.01; smoother DICGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution index 9de439749..f6c22924c 100644 --- a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution @@ -25,10 +25,6 @@ solvers smoother DICGaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution index 7342e01eb..5de575bba 100644 --- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-06; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution index 75b0b6674..f60257b53 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution @@ -24,14 +24,9 @@ solvers relTol 0.05; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; nCellsInCoarsestLevel 50; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution index d499b12ea..4700d2f7e 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-07; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution index c2e8633ca..3febc2603 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-06; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution index 3c6eb61dd..b4c2035f9 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-07; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution index 7342e01eb..5de575bba 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-06; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution index f54b30c2e..be00a289e 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution +++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-06; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } pFinal diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution index 3feda21ae..124017adc 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration on; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } U diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution index e0337498e..e068ca4e2 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration on; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|k|epsilon)" diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution deleted file mode 120000 index 4a4e96ba7..000000000 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../fvSolution \ No newline at end of file diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution new file mode 100644 index 000000000..1f971d4c7 --- /dev/null +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution @@ -0,0 +1,60 @@ +/*--------------------------------*- 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 +{ + p + { + solver GAMG; + tolerance 1e-08; + relTol 0.05; + smoother GaussSeidel; + nCellsInCoarsestLevel 20; + } + + "(U|k|epsilon)" + { + solver smoothSolver; + smoother symGaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } +} + +SIMPLE +{ + nUCorrectors 2; + nNonOrthogonalCorrectors 0; +} + +relaxationFactors +{ + fields + { + p 0.3; + } + equations + { + U 0.7; + k 0.9; + epsilon 0.9; + } +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution deleted file mode 120000 index 4a4e96ba7..000000000 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../fvSolution \ No newline at end of file diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution new file mode 100644 index 000000000..1f971d4c7 --- /dev/null +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution @@ -0,0 +1,60 @@ +/*--------------------------------*- 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 +{ + p + { + solver GAMG; + tolerance 1e-08; + relTol 0.05; + smoother GaussSeidel; + nCellsInCoarsestLevel 20; + } + + "(U|k|epsilon)" + { + solver smoothSolver; + smoother symGaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } +} + +SIMPLE +{ + nUCorrectors 2; + nNonOrthogonalCorrectors 0; +} + +relaxationFactors +{ + fields + { + p 0.3; + } + equations + { + U 0.7; + k 0.9; + epsilon 0.9; + } +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution index 688dee189..1f971d4c7 100644 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration on; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|k|epsilon)" diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution index 38cb42ae2..887efa589 100644 --- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-06; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } U diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution index 474b439f8..b7d343d1c 100644 --- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-08; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } U diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution index 6f9e2f67b..1aa8af7b2 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution @@ -22,12 +22,6 @@ solvers tolerance 1e-7; relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } Phi diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution index 155643b2f..e12e33781 100644 --- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution @@ -21,10 +21,6 @@ solvers { solver GAMG; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-06; relTol 0.05; diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution index 230f9706d..74f3d4f9b 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-06; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } "(U|k|epsilon|omega|f|v2)" diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution index ed2f5b2fe..4439ae465 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-06; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } "(U|k|epsilon|R|nuTilda)" diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution index b0aac0d39..875c796d9 100644 --- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution @@ -20,10 +20,6 @@ solvers { solver GAMG; smoother GaussSeidel; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; tolerance 1e-6; relTol 0.1; } diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution index 0ddb5a5c7..ce454c4c7 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution @@ -22,12 +22,6 @@ solvers tolerance 1e-7; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; } U diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution index bdb34dd0f..903407531 100644 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution @@ -20,10 +20,6 @@ solvers { solver GAMG; smoother GaussSeidel; - cacheAgglomeration on; - agglomerator faceAreaPair; - nCellsInCoarsestLevel 10; - mergeLevels 1; tolerance 1e-6; relTol 0.1; } diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution index 87b08f21d..fde62247d 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution @@ -23,10 +23,6 @@ solvers tolerance 1e-06; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(p|kinematicCloud:theta)Final" @@ -35,10 +31,6 @@ solvers tolerance 1e-06; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U.air|k|omega)" diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution index c263fc92e..b850cd106 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution @@ -23,10 +23,6 @@ solvers tolerance 1e-06; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal @@ -35,10 +31,6 @@ solvers tolerance 1e-06; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U.air|k|omega)" @@ -63,10 +55,6 @@ solvers 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 58779e7c7..e2dba4273 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-6; relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution index c3d1c32b1..cf11296ea 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution @@ -23,10 +23,6 @@ solvers tolerance 1e-06; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal @@ -35,10 +31,6 @@ solvers tolerance 1e-06; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|k|epsilon|omega).air" @@ -63,10 +55,6 @@ solvers tolerance 1e-06; relTol 0.1; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } } diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution index c0af0e68f..c33fc5dfa 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution @@ -23,10 +23,6 @@ solvers tolerance 1e-06; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal @@ -35,10 +31,6 @@ solvers tolerance 1e-06; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(U|k|omega).*" diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution index 23f65f64b..75b45887c 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution @@ -38,13 +38,6 @@ solvers tolerance 1e-06; relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution index a7112d946..63c6e0ce0 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution @@ -59,12 +59,6 @@ solvers 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/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution index 669b3a56a..880e89f5e 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution @@ -36,7 +36,7 @@ solvers PISO { - momentumPredictor true; + momentumPredictor yes; nCorr 1; nNonOrthCorr 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution index 94c21573c..59523edc8 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution @@ -53,12 +53,6 @@ solvers tolerance 0; relTol 0.1; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 100; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution index 746ca9553..23cf96abf 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution @@ -38,7 +38,7 @@ solvers PISO { - momentumPredictor true; + momentumPredictor yes; nCorr 1; nNonOrthCorr 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution index be992a781..3ac9d3fe4 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution @@ -58,12 +58,6 @@ solvers 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 445075206..3e6a97245 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution @@ -36,7 +36,7 @@ solvers PISO { - momentumPredictor true; + momentumPredictor yes; nCorr 1; nNonOrthCorr 0; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution index 1933c385e..d10b1fda2 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution @@ -54,12 +54,6 @@ solvers tolerance 0; relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution index 91c65c420..ae07f4217 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution @@ -36,7 +36,7 @@ solvers PISO { - momentumPredictor true; + momentumPredictor yes; nCorr 1; nNonOrthCorr 0; } diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution index 0b9ca6259..eb44991a5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution @@ -28,12 +28,6 @@ solvers tolerance 1e-6; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution index 244dbcbcc..7248e662b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution @@ -53,12 +53,6 @@ solvers tolerance 0; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution index 1da4d9837..6d07e4ca2 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution @@ -53,12 +53,6 @@ solvers tolerance 0; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 20; } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution index 477392641..404226dba 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution @@ -53,12 +53,6 @@ solvers tolerance 0; relTol 0.05; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution index 99ee73e74..c1aa4609f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution @@ -33,14 +33,8 @@ solvers relTol 0.05; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; }; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution index aaf64c1f4..9127f669a 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution @@ -25,14 +25,8 @@ solvers relTol 0.05; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; }; diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution index 3c6aa13b4..a9aed26fb 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution @@ -46,12 +46,6 @@ solvers tolerance 0; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution deleted file mode 120000 index 4a4e96ba7..000000000 --- a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../fvSolution \ No newline at end of file diff --git a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution new file mode 100644 index 000000000..740eb61a4 --- /dev/null +++ b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution @@ -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 | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ +} + +// ************************************************************************* // diff --git a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution deleted file mode 120000 index 4a4e96ba7..000000000 --- a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../fvSolution \ No newline at end of file diff --git a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution new file mode 100644 index 000000000..6368c1229 --- /dev/null +++ b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution @@ -0,0 +1,29 @@ +/*--------------------------------*- 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 +{ + nn + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } +} + +// ************************************************************************* // diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution deleted file mode 120000 index 4a4e96ba7..000000000 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution +++ /dev/null @@ -1 +0,0 @@ -../fvSolution \ No newline at end of file diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution new file mode 100644 index 000000000..b5fc05a83 --- /dev/null +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution @@ -0,0 +1,101 @@ +/*--------------------------------*- 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 +{ + alpha.phase1 + { + nAlphaCorr 1; + nAlphaSubCycles 2; + cAlpha 1; + } + + p_rgh + { + solver GAMG; + tolerance 1e-6; + relTol 0.02; + smoother GaussSeidel; + } + + pcorr + { + $p_rgh; + tolerance 0.1; + relTol 0; + } + + p_rghFinal + { + $p_rgh; + relTol 0; + } + + pcorrFinal + { + $pcorr; + tolerance 0.1; + relTol 0; + } + + ".*(rho|rhoFinal)" + { + solver diagonal; + } + + "U.*" + { + solver smoothSolver; + smoother symGaussSeidel; + tolerance 1e-6; + relTol 0; + } + + "(T|k|epsilon).*" + { + solver smoothSolver; + smoother symGaussSeidel; + tolerance 1e-6; + relTol 0; + } +} + +PIMPLE +{ + momentumPredictor yes; + correctPhi yes; + nOuterCorrectors 1; + nCorrectors 3; + nNonOrthogonalCorrectors 0; + nAlphaCorr 1; + nAlphaSubCycles 2; + cAlpha 1; +} + +relaxationFactors +{ + equations + { + "U.*" 1; + "k.*" 1; + "epsilon.*" 1; + "T.*" 1; + } +} + + +// ************************************************************************* // diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution index 407b1f2cc..b5fc05a83 100644 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution @@ -30,12 +30,6 @@ solvers tolerance 1e-6; relTol 0.02; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - nPreSweeps 0; - nPostSweeps 2; - mergeLevels 1; } pcorr @@ -84,7 +78,6 @@ PIMPLE { momentumPredictor yes; correctPhi yes; - transSonic no; nOuterCorrectors 1; nCorrectors 3; nNonOrthogonalCorrectors 0; diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution index 8dabfdac0..a652bddc4 100644 --- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution +++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-06; relTol 0.99; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 6; - agglomerator faceAreaPair; - mergeLevels 1; } } diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution index 04d9fe6cc..028c7d881 100644 --- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution +++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution @@ -39,10 +39,6 @@ solvers tolerance 1e-08; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "(cellMotionU|cellMotionUz)" diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution index ca2022df7..8ce40d4bd 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution @@ -40,12 +40,6 @@ solvers tolerance 0; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution index 7e1a541e0..a7b0a0fad 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution @@ -38,12 +38,6 @@ solvers tolerance 0; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution index d2ebcca13..58cb7a60b 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution @@ -39,12 +39,6 @@ solvers tolerance 0; relTol 0.1; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } pFinal diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution index f8d6ef8c9..74b19b5c8 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution @@ -38,13 +38,7 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } tolerance 1e-05; @@ -58,13 +52,6 @@ solvers tolerance 1e-08; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -78,12 +65,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 2e-09; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution index 592be355b..7c97abb05 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution @@ -38,13 +38,6 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-05; relTol 0; @@ -57,13 +50,6 @@ solvers tolerance 1e-07; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -77,12 +63,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-07; relTol 0; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution index fef915a85..f75504c67 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution @@ -33,13 +33,6 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-05; relTol 0; @@ -57,13 +50,6 @@ solvers tolerance 1e-07; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -77,12 +63,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-07; relTol 0; diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index 06dd87a96..ab14e5ae1 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -32,13 +32,6 @@ solvers tolerance 1e-05; relTol 0; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-05; relTol 0; @@ -56,13 +49,6 @@ solvers tolerance 1e-07; relTol 0.05; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -75,13 +61,6 @@ solvers relTol 0; nVcycles 2; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-07; relTol 0; diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution index f646f34de..5cedaa31c 100644 --- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution +++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution @@ -48,10 +48,7 @@ solvers tolerance 1e-7; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution index b137e29fa..d2397321e 100644 --- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution @@ -56,10 +56,7 @@ solvers tolerance 1e-6; relTol 0.05; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution index 5e1559c67..ed4bd47af 100644 --- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution +++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution @@ -48,10 +48,7 @@ solvers tolerance 1e-7; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution index 4aaf52f6d..f215226a4 100644 --- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution @@ -40,10 +40,6 @@ solvers solver GAMG; smoother DIC; - agglomerator faceAreaPair; - mergeLevels 1; - nCellsInCoarsestLevel 10; - cacheAgglomeration true; tolerance 0.1; relTol 0; @@ -54,10 +50,6 @@ solvers solver GAMG; smoother DIC; - agglomerator faceAreaPair; - mergeLevels 1; - nCellsInCoarsestLevel 10; - cacheAgglomeration true; tolerance 5e-8; relTol 0; diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution index 5ca78b858..08b5a381b 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution @@ -30,13 +30,7 @@ solvers tolerance 1e-08; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } p_rghFinal diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution index ae6f2be17..51e12c2a4 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution @@ -25,7 +25,7 @@ solvers MULESCorr yes; nLimiterIter 5; - alphaApplyPrevCorr true; + alphaApplyPrevCorr yes; solver smoothSolver; smoother symGaussSeidel; @@ -42,13 +42,7 @@ solvers tolerance 1e-5; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } tolerance 1e-05; @@ -62,13 +56,6 @@ solvers tolerance 1e-8; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -82,12 +69,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-8; diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution index dbb250c1e..8e9e27854 100644 --- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution @@ -30,12 +30,6 @@ solvers tolerance 1e-6; relTol 0.02; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - nPreSweeps 0; - nPostSweeps 2; - mergeLevels 1; } "pcorr.*" @@ -70,7 +64,6 @@ PIMPLE { momentumPredictor yes; correctPhi yes; - transSonic no; nOuterCorrectors 2; nCorrectors 1; nNonOrthogonalCorrectors 0; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution index c01eee358..97f514400 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution @@ -33,13 +33,7 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } tolerance 1e-05; @@ -53,13 +47,6 @@ solvers tolerance 1e-08; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -73,12 +60,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 2e-09; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution index c01eee358..97f514400 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution @@ -33,13 +33,7 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } tolerance 1e-05; @@ -53,13 +47,6 @@ solvers tolerance 1e-08; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -73,12 +60,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 2e-09; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution index c01eee358..97f514400 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution @@ -33,13 +33,7 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } tolerance 1e-05; @@ -53,13 +47,6 @@ solvers tolerance 1e-08; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -73,12 +60,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 2e-09; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution index c01eee358..97f514400 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution @@ -33,13 +33,7 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } tolerance 1e-05; @@ -53,13 +47,6 @@ solvers tolerance 1e-08; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -73,12 +60,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 2e-09; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution index c01eee358..97f514400 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution @@ -33,13 +33,7 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } tolerance 1e-05; @@ -53,13 +47,6 @@ solvers tolerance 1e-08; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -73,12 +60,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 2e-09; diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution index 220b8425c..7ebbdec3b 100644 --- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution @@ -33,13 +33,7 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration false; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; + cacheAgglomeration no; } tolerance 1e-05; @@ -53,13 +47,6 @@ solvers tolerance 1e-08; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -73,12 +60,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 2e-09; diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution index 47a4540f6..ca68f313d 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution @@ -33,13 +33,6 @@ solvers tolerance 1e-05; relTol 0; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-05; relTol 0; @@ -52,13 +45,6 @@ solvers tolerance 1e-07; relTol 0.01; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -72,12 +58,6 @@ solvers nVcycles 2; smoother DICGaussSeidel; nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-07; relTol 0; diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution b/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution index d93f83214..92eca3e17 100644 --- a/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution @@ -44,10 +44,6 @@ solvers preconditioner GAMG; smoother GaussSeidel; - agglomerator faceAreaPair; - mergeLevels 1; - nCellsInCoarsestLevel 10; - cacheAgglomeration true; tolerance 1e-5; relTol 0; @@ -62,10 +58,6 @@ solvers solver GAMG; smoother DIC; - agglomerator faceAreaPair; - mergeLevels 1; - nCellsInCoarsestLevel 10; - cacheAgglomeration true; tolerance 1e-7; relTol 0.01; diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution b/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution index f33f407fb..8770c52d9 100644 --- a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution @@ -41,13 +41,6 @@ solvers tolerance 1e-5; relTol 0; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-5; relTol 0; @@ -61,14 +54,8 @@ solvers relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; }; diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution index f578f5dda..f9e1279b9 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution @@ -41,13 +41,6 @@ solvers tolerance 1e-5; relTol 0; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-5; relTol 0; @@ -61,14 +54,8 @@ solvers relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; }; diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution index 6fbe8482e..835f504df 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution @@ -40,9 +40,6 @@ solvers relTol 0; smoother DICGaussSeidel; cacheAgglomeration no; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; } diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution index e53ce0ba9..766fa5a91 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution @@ -47,14 +47,8 @@ solvers relTol 0.1; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 50; }; @@ -72,14 +66,7 @@ solvers nVcycles 2; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; }; tolerance 1e-7; relTol 0; diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution index 4cb5ca0ad..62f2e7e07 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution @@ -26,13 +26,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0.01; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution index 831f8a374..08ba5626d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution @@ -28,13 +28,6 @@ solvers tolerance 1e-7; relTol 0.05; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -47,13 +40,6 @@ solvers relTol 0; nVcycles 2; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-7; relTol 0; diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution index 831f8a374..08ba5626d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution @@ -28,13 +28,6 @@ solvers tolerance 1e-7; relTol 0.05; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -47,13 +40,6 @@ solvers relTol 0; nVcycles 2; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-7; relTol 0; diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution index c454f0e63..c0ba3a2d4 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution @@ -28,13 +28,6 @@ solvers tolerance 1e-7; relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -47,13 +40,6 @@ solvers relTol 0; nVcycles 2; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-7; relTol 0; diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index fe2ad08db..fc08f6f97 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -32,13 +32,6 @@ solvers tolerance 1e-05; relTol 0; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-05; relTol 0; @@ -51,13 +44,6 @@ solvers tolerance 1e-07; relTol 0.05; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -70,13 +56,6 @@ solvers relTol 0; nVcycles 2; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-07; relTol 0; diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution index 17f0b28c0..a9e02cb60 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution @@ -32,13 +32,6 @@ solvers tolerance 1e-05; relTol 0; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-05; relTol 0; @@ -51,13 +44,6 @@ solvers tolerance 1e-07; relTol 0.05; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -70,13 +56,6 @@ solvers relTol 0; nVcycles 2; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-07; relTol 0; diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution index 9a0ffe9d2..d701cd3d4 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution @@ -23,10 +23,6 @@ solvers tolerance 1e-5; relTol 0; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } "pcorr.*" @@ -35,12 +31,6 @@ solvers tolerance 1e-2; relTol 0; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 100; } diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution index 37bb8eff3..ec5b3a172 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution @@ -23,12 +23,6 @@ solvers tolerance 1e-7; relTol 0.1; smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; maxIter 100; } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution index 06c5db7ae..5ea62ead3 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution index a49313e5c..5b110e03e 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution @@ -28,13 +28,6 @@ solvers tolerance 1e-7; relTol 0.01; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal @@ -47,13 +40,6 @@ solvers relTol 0; nVcycles 2; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration on; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-7; relTol 0; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution index de1aecacf..9cc07cdb3 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution index 10ff75d72..50a63b082 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution @@ -34,15 +34,8 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; processorAgglomerator procFaces; nAgglomeratingCells 800; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0.01; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution index f6f72076f..596013999 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution index a629762ab..85c740142 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-11; relTol 0.001; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution index 0965029f8..ca361ecb8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution @@ -34,13 +34,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0.01; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution index 5d50886c6..e81a66529 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0.01; maxIter 100; @@ -91,7 +84,7 @@ PIMPLE nCorrectors 1; nNonOrthogonalCorrectors 0; nEnergyCorrectors 3; - faceMomentum on; + faceMomentum yes; } relaxationFactors diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution index 350b0c0c1..c0015575b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution index 323c36105..c6a73cdb3 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-11; relTol 0.001; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution index 8f0f17045..decde86b9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-12; relTol 0.001; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution index 171537ad3..a1b9a45e0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0.01; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution index 0081c9377..826be64c1 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution @@ -36,13 +36,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution index 350b0c0c1..c0015575b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution index a95a95240..d94b39c04 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution @@ -30,13 +30,6 @@ solvers { preconditioner GAMG; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-6; relTol 0; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution index 2486938d7..f1af1c490 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution @@ -82,7 +82,7 @@ PIMPLE nCorrectors 1; nNonOrthogonalCorrectors 0; nEnergyCorrectors 1; - faceMomentum on; + faceMomentum yes; } relaxationFactors diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution index 6ad387f71..5a35b2916 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution @@ -35,10 +35,6 @@ solvers tolerance 1e-7; relTol 0.01; smoother GaussSeidel; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } p_rghFinal diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution index de1aecacf..9cc07cdb3 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution index f6f72076f..596013999 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution index 0f5531cfc..a4574b262 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution @@ -36,13 +36,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution index 350b0c0c1..c0015575b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution index 28572b1e0..5e9972d99 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution index 0081c9377..826be64c1 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution @@ -36,13 +36,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution index 350b0c0c1..c0015575b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution @@ -27,13 +27,6 @@ solvers { solver GAMG; smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; tolerance 1e-8; relTol 0; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution index a95a95240..d94b39c04 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution @@ -30,13 +30,6 @@ solvers { preconditioner GAMG; smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; } tolerance 1e-6; relTol 0; diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution index 94b968c1c..9af48dc12 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-06; relTol 0.9; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; } } diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution index 26948af5b..9e59be62b 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution @@ -23,10 +23,7 @@ solvers tolerance 1e-06; relTol 0.99; smoother GaussSeidel; - cacheAgglomeration true; nCellsInCoarsestLevel 6; - agglomerator faceAreaPair; - mergeLevels 1; } }