Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Sergio Ferraris
2011-09-09 11:40:09 +01:00
23 changed files with 39 additions and 371 deletions

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
{

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [0 0 0 0 0 0 0];
internalField nonuniform List<scalar>
internalField nonuniform List<scalar>
1875
(
1

View File

@ -29,8 +29,8 @@ divSchemes
{
default none;
div(phi,alpha) Gauss upwind; //limitedLinear01 1;
div(phirb,alpha) Gauss upwind;
"div\(phi,alpha.*\)" Gauss vanLeer;
"div\(phir,alpha.*,alpha.*\)" Gauss vanLeer;
"div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
div(Rc) Gauss linear;
@ -39,7 +39,7 @@ divSchemes
laplacianSchemes
{
default Gauss linear uncorrected;
default Gauss linear corrected;
}
interpolationSchemes
@ -49,7 +49,7 @@ interpolationSchemes
snGradSchemes
{
default uncorrected;
default corrected;
}
fluxRequired

View File

@ -22,25 +22,25 @@ boundaryField
{
leftWall
{
type buoyantPressure;
type multiphaseFixedFluxPressure;
value uniform 0;
}
rightWall
{
type buoyantPressure;
type multiphaseFixedFluxPressure;
value uniform 0;
}
lowerWall
{
type buoyantPressure;
type multiphaseFixedFluxPressure;
value uniform 0;
}
atmosphere
{
type fixedValue; //totalPressure;
type totalPressure;
p0 uniform 0;
U Uair;
phi phiair;

View File

@ -27,12 +27,12 @@ gradSchemes
divSchemes
{
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss vanLeer;
"div\(phi,alpha.*\)" Gauss vanLeer;
"div\(phir,alpha.*,alpha.*\)" Gauss vanLeer;
"div\(phiAlpha.*,U.*\)" Gauss upwind;
"div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
div(Rc) Gauss linear;
"div\(phi.*,U.*\)" Gauss upwind;
"div\(phi.*,U.*\)" Gauss limitedLinearV 1;
}
laplacianSchemes