From 9eb1502555a80cab21cb4f7fad6c525c00fa2737 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 9 Sep 2011 10:02:24 +0100 Subject: [PATCH 1/2] BUG: Corrected pimple control stroring of prev iter --- src/OpenFOAM/matrices/solution/solution.C | 4 ++-- .../general/solutionControl/pimpleControl/pimpleControlI.H | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C index aa4676f7e5..dde12a8553 100644 --- a/src/OpenFOAM/matrices/solution/solution.C +++ b/src/OpenFOAM/matrices/solution/solution.C @@ -57,9 +57,9 @@ void Foam::solution::read(const dictionary& dict) if (dict.found("relaxationFactors")) { const dictionary& relaxDict(dict.subDict("relaxationFactors")); - if (relaxDict.found("variables")) + if (relaxDict.found("fields")) { - fieldRelaxDict_ = relaxDict.subDict("variables"); + fieldRelaxDict_ = relaxDict.subDict("fields"); eqnRelaxDict_ = relaxDict.subDict("equations"); } else diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H index cc4062356f..59e4e14204 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H +++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H @@ -73,10 +73,6 @@ inline bool Foam::pimpleControl::loop() if (nOuterCorr_ != 1) { Info<< algorithmName_ << ": iteration " << corr_ + 1 << endl; - } - - if (corr_ != 0) - { storePrevIterFields(); } From 23feb21425a884f4ba346c889e8c3dcd04092965 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 9 Sep 2011 10:29:01 +0100 Subject: [PATCH 2/2] ENH: Updated film tutorial BCs directMapped->mapped --- .../cylinder/constant/polyMesh/boundary | 2 +- .../cylinder/system/extrudeToRegionMeshDict | 2 +- tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T | 2 +- tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U | 2 +- .../hotBoxes/system/changeDictionaryDict | 4 ++-- .../hotBoxes/system/extrudeToRegionMeshDict | 2 +- .../rivuletPanel/constant/polyMesh/boundary | 2 +- .../rivuletPanel/system/extrudeToRegionMeshDict | 2 +- .../splashPanel/system/extrudeToRegionMeshDict | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary index d095df6d18..962b9afbae 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary @@ -31,7 +31,7 @@ FoamFile } region0_to_wallFilmRegion_wallFilmFaces { - type directMappedWall; + type mappedWall; nFaces 1100; startFace 68110; sampleMode nearestPatchFace; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict index 3f479896a9..92b3f984e1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict @@ -26,7 +26,7 @@ nLayers 1; expansionRatio 1; -adaptMesh yes; // apply directMapped to both regions +adaptMesh yes; // apply mapped to both regions linearNormalCoeffs { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T index 3a51985a8d..070a82b341 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T @@ -29,7 +29,7 @@ boundaryField wallFilm { type zeroGradient; -// type directMapped; +// type mapped; // fieldName Tsf; // average 300; // setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U index 500f49a3e0..f996f5adf1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U @@ -30,7 +30,7 @@ boundaryField { type fixedValue; value uniform (0 0 0); -// type directMapped; +// type mapped; // fieldName Usf; // average (0 0 0); // setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict index 6dc270ec3c..d227805e92 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict @@ -22,7 +22,7 @@ dictionaryReplacement { wallFilm { - type directMapped; + type mapped; fieldName Tsf; average 300; setAverage no; @@ -37,7 +37,7 @@ dictionaryReplacement { wallFilm { - type directMapped; + type mapped; fieldName Usf; average (0 0 0); setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict index 0a2be0f2ab..35ce583303 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict @@ -30,7 +30,7 @@ nLayers 1; expansionRatio 1; -adaptMesh yes; // apply directMapped to both regions +adaptMesh yes; // apply mapped to both regions linearNormalCoeffs { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary index 70205845d7..006c08790d 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary @@ -37,7 +37,7 @@ FoamFile } region0_to_wallFilmRegion_wallFilmFaces { - type directMappedWall; + type mappedWall; nFaces 43200; startFace 130020; sampleMode nearestPatchFace; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict index 3f479896a9..92b3f984e1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict @@ -26,7 +26,7 @@ nLayers 1; expansionRatio 1; -adaptMesh yes; // apply directMapped to both regions +adaptMesh yes; // apply mapped to both regions linearNormalCoeffs { diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict index 3f479896a9..92b3f984e1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict @@ -26,7 +26,7 @@ nLayers 1; expansionRatio 1; -adaptMesh yes; // apply directMapped to both regions +adaptMesh yes; // apply mapped to both regions linearNormalCoeffs {