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

This commit is contained in:
Henry
2011-09-09 10:45:13 +01:00
11 changed files with 12 additions and 16 deletions

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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;

View File

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

View File

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

View File

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

View File

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