From 80b8071e7550c32e305bea1637004b1a9cc18938 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 20 May 2010 08:24:55 +0200 Subject: [PATCH] ENH: add default control values to ease SIMPLE->PIMPLE transition - add const-ness for control variables - drop unused fluxGradp variable - use lookupOrDefault instead of found/lookup combination --- .../mhdFoam/readBPISOControls.H | 5 +-- .../readFluidMultiRegionSIMPLEControls.H | 28 ++++----------- .../readSolidMultiRegionSIMPLEControls.H | 10 +++--- .../readFluidMultiRegionPIMPLEControls.H | 10 +++--- .../fluid/readFluidMultiRegionPISOControls.H | 34 +++++++------------ .../chtMultiRegionFoam/readPIMPLEControls.H | 4 ++- .../solid/readSolidMultiRegionPISOControls.H | 8 ++--- .../pimpleDyMFoam/readControls.H | 19 ++++------- .../compressibleInterDyMFoam/readControls.H | 19 ++++------- .../multiphase/interDyMFoam/readControls.H | 15 +++----- .../readSolidDisplacementFoamControls.H | 3 +- .../general/include/readPIMPLEControls.H | 20 ++++++----- .../general/include/readPISOControls.H | 20 ++++++----- .../general/include/readSIMPLEControls.H | 15 ++++---- .../general/include/readTimeControls.H | 14 +++----- .../engineFoam/kivaTest/system/fvSolution | 1 - .../boundaryWallFunctions/system/fvSolution | 1 - .../system/fvSolution | 1 - 18 files changed, 93 insertions(+), 134 deletions(-) diff --git a/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H b/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H index 4363850cdf..5ddbdab95e 100644 --- a/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H +++ b/applications/solvers/electromagnetics/mhdFoam/readBPISOControls.H @@ -1,3 +1,4 @@ -const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO"); + const dictionary& Bpiso = mesh.solutionDict().subDict("BPISO"); + + const int nBcorr = Bpiso.lookupOrDefault("nCorrectors", 1); -int nBcorr(readInt(Bpiso.lookup("nCorrectors"))); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H index 3054562d5d..e69527a97c 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H @@ -1,25 +1,11 @@ - dictionary simple = fluidRegions[i].solutionDict().subDict("SIMPLE"); + const dictionary& simple = fluidRegions[i].solutionDict().subDict("SIMPLE"); - int nNonOrthCorr = 0; - if (simple.found("nNonOrthogonalCorrectors")) - { - nNonOrthCorr = readInt(simple.lookup("nNonOrthogonalCorrectors")); - } + const int nNonOrthCorr = + simple.lookupOrDefault("nNonOrthogonalCorrectors", 0); - bool momentumPredictor = true; - if (simple.found("momentumPredictor")) - { - momentumPredictor = Switch(simple.lookup("momentumPredictor")); - } + const bool momentumPredictor = + simple.lookupOrDefault("momentumPredictor", true); - bool fluxGradp = false; - if (simple.found("fluxGradp")) - { - fluxGradp = Switch(simple.lookup("fluxGradp")); - } + const bool transonic = + simple.lookupOrDefault("transonic", false); - bool transonic = false; - if (simple.found("transonic")) - { - transonic = Switch(simple.lookup("transonic")); - } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H index 22e9b177f1..e1d58d9f65 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H @@ -1,7 +1,5 @@ - dictionary simple = solidRegions[i].solutionDict().subDict("SIMPLE"); + const dictionary& simple = solidRegions[i].solutionDict().subDict("SIMPLE"); + + const int nNonOrthCorr = + simple.lookupOrDefault("nNonOrthogonalCorrectors", 0); - int nNonOrthCorr = 0; - if (simple.found("nNonOrthogonalCorrectors")) - { - nNonOrthCorr = readInt(simple.lookup("nNonOrthogonalCorrectors")); - } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H index 413c0225f0..0591b36623 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H @@ -1,9 +1,11 @@ const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE"); - int nCorr(readInt(pimple.lookup("nCorrectors"))); + const int nCorr = + pimple.lookupOrDefault("nCorrectors", 1); - int nNonOrthCorr = + const int nNonOrthCorr = pimple.lookupOrDefault("nNonOrthogonalCorrectors", 0); - bool momentumPredictor = - pimple.lookupOrDefault("momentumPredictor", true); + const bool momentumPredictor = + pimple.lookupOrDefault("momentumPredictor", true); + diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H index 75d6d96d11..c03366ae7a 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPISOControls.H @@ -1,27 +1,17 @@ - dictionary piso = fluidRegions[i].solutionDict().subDict("PISO"); + const dictionary& piso = fluidRegions[i].solutionDict().subDict("PISO"); - int nCorr(readInt(piso.lookup("nCorrectors"))); + const int nOuterCorr = + piso.lookupOrDefault("nOuterCorrectors", 1); - int nNonOrthCorr = 0; - if (piso.found("nNonOrthogonalCorrectors")) - { - nNonOrthCorr = readInt(piso.lookup("nNonOrthogonalCorrectors")); - } + const int nCorr = + piso.lookupOrDefault("nCorrectors", 1); - bool momentumPredictor = true; - if (piso.found("momentumPredictor")) - { - momentumPredictor = Switch(piso.lookup("momentumPredictor")); - } + const int nNonOrthCorr = + piso.lookupOrDefault("nNonOrthogonalCorrectors", 0); - bool transonic = false; - if (piso.found("transonic")) - { - transonic = Switch(piso.lookup("transonic")); - } + const bool momentumPredictor = + piso.lookupOrDefault("momentumPredictor", true); + + const bool transonic = + piso.lookupOrDefault("transonic", false); - int nOuterCorr = 1; - if (piso.found("nOuterCorrectors")) - { - nOuterCorr = readInt(piso.lookup("nOuterCorrectors")); - } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H index 42793d9b9f..f6371c47cb 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H @@ -4,4 +4,6 @@ const dictionary& pimple = solutionDict.subDict("PIMPLE"); - int nOuterCorr(readInt(pimple.lookup("nOuterCorrectors"))); + const int nOuterCorr = + pimple.lookupOrDefault("nOuterCorrectors", 1); + diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H index ce6a1c5bb2..0c965a8322 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPISOControls.H @@ -1,7 +1,5 @@ const dictionary& piso = solidRegions[i].solutionDict().subDict("PISO"); - int nNonOrthCorr = 0; - if (piso.found("nNonOrthogonalCorrectors")) - { - nNonOrthCorr = readInt(piso.lookup("nNonOrthogonalCorrectors")); - } + const int nNonOrthCorr = + piso.lookupOrDefault("nNonOrthogonalCorrectors", 0); + diff --git a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H b/applications/solvers/incompressible/pimpleDyMFoam/readControls.H index 3bd20c5c5c..bee4e4d7b8 100644 --- a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H +++ b/applications/solvers/incompressible/pimpleDyMFoam/readControls.H @@ -1,14 +1,9 @@ -# include "readTimeControls.H" -# include "readPIMPLEControls.H" + #include "readTimeControls.H" + #include "readPIMPLEControls.H" - bool correctPhi = false; - if (pimple.found("correctPhi")) - { - correctPhi = Switch(pimple.lookup("correctPhi")); - } + const bool correctPhi = + pimple.lookupOrDefault("correctPhi", false); + + const bool checkMeshCourantNo = + pimple.lookupOrDefault("checkMeshCourantNo", false); - bool checkMeshCourantNo = false; - if (pimple.found("checkMeshCourantNo")) - { - checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo")); - } diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H index a2e4ef3747..11c3e8071e 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H @@ -1,5 +1,5 @@ - #include "readPISOControls.H" - #include "readTimeControls.H" + #include "readPISOControls.H" + #include "readTimeControls.H" label nAlphaCorr ( @@ -19,14 +19,9 @@ << exit(FatalError); } - bool correctPhi = true; - if (piso.found("correctPhi")) - { - correctPhi = Switch(piso.lookup("correctPhi")); - } + const bool correctPhi = + piso.lookupOrDefault("correctPhi", true); + + const bool checkMeshCourantNo = + piso.lookupOrDefault("checkMeshCourantNo", false); - bool checkMeshCourantNo = false; - if (piso.found("checkMeshCourantNo")) - { - checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo")); - } diff --git a/applications/solvers/multiphase/interDyMFoam/readControls.H b/applications/solvers/multiphase/interDyMFoam/readControls.H index 3640d73adc..8264a051c2 100644 --- a/applications/solvers/multiphase/interDyMFoam/readControls.H +++ b/applications/solvers/multiphase/interDyMFoam/readControls.H @@ -1,14 +1,9 @@ # include "readTimeControls.H" # include "readPISOControls.H" - bool correctPhi = true; - if (piso.found("correctPhi")) - { - correctPhi = Switch(piso.lookup("correctPhi")); - } + const bool correctPhi = + piso.lookupOrDefault("correctPhi", true); + + const bool checkMeshCourantNo = + piso.lookupOrDefault("checkMeshCourantNo", false); - bool checkMeshCourantNo = false; - if (piso.found("checkMeshCourantNo")) - { - checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo")); - } diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H index 343b7bcaed..8b59cc497e 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readSolidDisplacementFoamControls.H @@ -1,5 +1,6 @@ const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis"); -int nCorr(readInt(stressControl.lookup("nCorrectors"))); +const int nCorr = stressControl.lookupOrDefault("nCorrectors", 1); + scalar convergenceTolerance(readScalar(stressControl.lookup("D"))); Switch compactNormalStress(stressControl.lookup("compactNormalStress")); diff --git a/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H b/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H index 9de98ee20b..3d9fd3c7ec 100644 --- a/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H +++ b/src/finiteVolume/cfdTools/general/include/readPIMPLEControls.H @@ -1,13 +1,17 @@ - dictionary pimple = mesh.solutionDict().subDict("PIMPLE"); + const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE"); - int nOuterCorr(readInt(pimple.lookup("nOuterCorrectors"))); - int nCorr(readInt(pimple.lookup("nCorrectors"))); + const int nOuterCorr = + pimple.lookupOrDefault("nOuterCorrectors", 1); - int nNonOrthCorr = + const int nCorr = + pimple.lookupOrDefault("nCorrectors", 1); + + const int nNonOrthCorr = pimple.lookupOrDefault("nNonOrthogonalCorrectors", 0); - bool momentumPredictor = - pimple.lookupOrDefault("momentumPredictor", true); + const bool momentumPredictor = + pimple.lookupOrDefault("momentumPredictor", true); + + const bool transonic = + pimple.lookupOrDefault("transonic", false); - bool transonic = - pimple.lookupOrDefault("transonic", false); diff --git a/src/finiteVolume/cfdTools/general/include/readPISOControls.H b/src/finiteVolume/cfdTools/general/include/readPISOControls.H index de763e00b0..850ee1401d 100644 --- a/src/finiteVolume/cfdTools/general/include/readPISOControls.H +++ b/src/finiteVolume/cfdTools/general/include/readPISOControls.H @@ -1,15 +1,17 @@ - dictionary piso = mesh.solutionDict().subDict("PISO"); + const dictionary& piso = mesh.solutionDict().subDict("PISO"); - int nCorr(readInt(piso.lookup("nCorrectors"))); + const int nOuterCorr = + piso.lookupOrDefault("nOuterCorrectors", 1); - int nNonOrthCorr = + const int nCorr = + piso.lookupOrDefault("nCorrectors", 1); + + const int nNonOrthCorr = piso.lookupOrDefault("nNonOrthogonalCorrectors", 0); - bool momentumPredictor = - piso.lookupOrDefault("momentumPredictor", true); + const bool momentumPredictor = + piso.lookupOrDefault("momentumPredictor", true); - bool transonic = - piso.lookupOrDefault("transonic", false); + const bool transonic = + piso.lookupOrDefault("transonic", false); - int nOuterCorr = - piso.lookupOrDefault("nOuterCorrectors", 1); diff --git a/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H b/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H index b3ea4bf674..6019876e11 100644 --- a/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H +++ b/src/finiteVolume/cfdTools/general/include/readSIMPLEControls.H @@ -1,14 +1,11 @@ - dictionary simple = mesh.solutionDict().subDict("SIMPLE"); + const dictionary& simple = mesh.solutionDict().subDict("SIMPLE"); - int nNonOrthCorr = + const int nNonOrthCorr = simple.lookupOrDefault("nNonOrthogonalCorrectors", 0); - bool momentumPredictor = - simple.lookupOrDefault("momentumPredictor", true); + const bool momentumPredictor = + simple.lookupOrDefault("momentumPredictor", true); - bool fluxGradp = - simple.lookupOrDefault("fluxGradp", false); - - bool transonic = - simple.lookupOrDefault("transonic", false); + const bool transonic = + simple.lookupOrDefault("transonic", false); diff --git a/src/finiteVolume/cfdTools/general/include/readTimeControls.H b/src/finiteVolume/cfdTools/general/include/readTimeControls.H index 1bedd17557..8255c9af4c 100644 --- a/src/finiteVolume/cfdTools/general/include/readTimeControls.H +++ b/src/finiteVolume/cfdTools/general/include/readTimeControls.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,15 +29,11 @@ Description \*---------------------------------------------------------------------------*/ -Switch adjustTimeStep -( - runTime.controlDict().lookup("adjustTimeStep") -); +const bool adjustTimeStep = + runTime.controlDict().lookupOrDefault("adjustTimeStep", false); -scalar maxCo -( - readScalar(runTime.controlDict().lookup("maxCo")) -); +scalar maxCo = + runTime.controlDict().lookupOrDefault("maxCo", 1.0); scalar maxDeltaT = runTime.controlDict().lookupOrDefault("maxDeltaT", GREAT); diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution index 9c14f182e1..79eef886e4 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution @@ -46,7 +46,6 @@ PISO nCorrectors 2; nNonOrthogonalCorrectors 1; momentumPredictor yes; - fluxGradp no; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution index a165f8313b..a5181189a7 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution @@ -63,7 +63,6 @@ PISO nCorrectors 2; nNonOrthogonalCorrectors 0; momentumPredictor yes; - fluxGradp no; } relaxationFactors diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution index 0f80d7dab7..cc4a943f94 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution @@ -71,7 +71,6 @@ PISO nCorrectors 2; nNonOrthogonalCorrectors 0; momentumPredictor yes; - fluxGradp no; } relaxationFactors