zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2011-09-09 10:45:13 +01:00
parent 4ff31e73ef 23feb21425
commit 71a5db4db0
11 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/matrices/solution/solution.C
View File

@ -57,9 +57,9 @@ void Foam::solution::read(const dictionary& dict)
if (dict.found("relaxationFactors")) if (dict.found("relaxationFactors"))
{ {
const dictionary& relaxDict(dict.subDict("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"); eqnRelaxDict_ = relaxDict.subDict("equations");
} }
else else

4
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
View File

@ -73,10 +73,6 @@ inline bool Foam::pimpleControl::loop()
if (nOuterCorr_ != 1) if (nOuterCorr_ != 1)
{ {
Info<< algorithmName_ << ": iteration " << corr_ + 1 << endl; Info<< algorithmName_ << ": iteration " << corr_ + 1 << endl;
}
if (corr_ != 0)
{
storePrevIterFields(); storePrevIterFields();
} }

2
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary
View File

@ -31,7 +31,7 @@ FoamFile
} }
region0_to_wallFilmRegion_wallFilmFaces region0_to_wallFilmRegion_wallFilmFaces
{ {
type directMappedWall; type mappedWall;
nFaces 1100; nFaces 1100;
startFace 68110; startFace 68110;
sampleMode nearestPatchFace; sampleMode nearestPatchFace;

2
tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict
View File

@ -26,7 +26,7 @@ nLayers 1;
expansionRatio 1; expansionRatio 1;
adaptMesh yes; // apply directMapped to both regions adaptMesh yes; // apply mapped to both regions
linearNormalCoeffs linearNormalCoeffs
{ {

2
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T
View File

@ -29,7 +29,7 @@ boundaryField
wallFilm wallFilm
{ {
type zeroGradient; type zeroGradient;
// type directMapped; // type mapped;
// fieldName Tsf; // fieldName Tsf;
// average 300; // average 300;
// setAverage no; // setAverage no;

2
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U
View File

@ -30,7 +30,7 @@ boundaryField
{ {
type fixedValue; type fixedValue;
value uniform (0 0 0); value uniform (0 0 0);
// type directMapped; // type mapped;
// fieldName Usf; // fieldName Usf;
// average (0 0 0); // average (0 0 0);
// setAverage no; // setAverage no;

4
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
View File

@ -22,7 +22,7 @@ dictionaryReplacement
{ {
wallFilm wallFilm
{ {
type directMapped; type mapped;
fieldName Tsf; fieldName Tsf;
average 300; average 300;
setAverage no; setAverage no;
@ -37,7 +37,7 @@ dictionaryReplacement
{ {
wallFilm wallFilm
{ {
type directMapped; type mapped;
fieldName Usf; fieldName Usf;
average (0 0 0); average (0 0 0);
setAverage no; setAverage no;

2
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict
View File

@ -30,7 +30,7 @@ nLayers 1;
expansionRatio 1; expansionRatio 1;
adaptMesh yes; // apply directMapped to both regions adaptMesh yes; // apply mapped to both regions
linearNormalCoeffs linearNormalCoeffs
{ {

2
tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/boundary
View File

@ -37,7 +37,7 @@ FoamFile
} }
region0_to_wallFilmRegion_wallFilmFaces region0_to_wallFilmRegion_wallFilmFaces
{ {
type directMappedWall; type mappedWall;
nFaces 43200; nFaces 43200;
startFace 130020; startFace 130020;
sampleMode nearestPatchFace; sampleMode nearestPatchFace;

2
tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict
View File

@ -26,7 +26,7 @@ nLayers 1;
expansionRatio 1; expansionRatio 1;
adaptMesh yes; // apply directMapped to both regions adaptMesh yes; // apply mapped to both regions
linearNormalCoeffs linearNormalCoeffs
{ {

2
tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict
View File

@ -26,7 +26,7 @@ nLayers 1;
expansionRatio 1; expansionRatio 1;
adaptMesh yes; // apply directMapped to both regions adaptMesh yes; // apply mapped to both regions
linearNormalCoeffs linearNormalCoeffs
{ {