Merge branch 'master' into cvm

This commit is contained in:
graham
2011-05-13 10:17:22 +01:00
444 changed files with 2708 additions and 1782 deletions

View File

@ -78,15 +78,16 @@ solvers
PIMPLE
{
nCorrectors 2;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
momentumPredictor yes;
rhoMin rhoMin [1 -3 0 0 0] 0.1;
rhoMax rhoMax [1 -3 0 0 0] 1.5;
rhoMin rhoMin [1 -3 0 0 0] 0.1;
rhoMax rhoMax [1 -3 0 0 0] 1.5;
maxCo 0.5;
rDeltaTSmoothingCoeff 0.1;
maxDeltaT 1;
alphaTauTemp 0.005;
alphaTemp 0.005;
}
additional

View File

@ -110,13 +110,10 @@ subModels
surfaceReactionModel none;
postProcessingModel particleTracks;
surfaceFilmModel none;
radiation off;
patchInjectionCoeffs
{
massFlowRate 0.8e-03;
@ -190,14 +187,18 @@ subModels
enthalpyTransfer enthalpyDifference;
activeLiquids ( H2O );
}
}
patchPostProcessingCoeffs
cloudFunctions
{
patchPostProcessing
{
maxStoredParcels 100;
patches ( outlet );
}
particleTracksCoeffs
particleTracks
{
trackInterval 5;
maxSamples 1000000;

View File

@ -64,16 +64,16 @@ solvers
PIMPLE
{
nOuterCorrectors 1;
nCorrectors 2;
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
momentumPredictor yes;
rhoMin rhoMin [1 -3 0 0 0] 0.1;
rhoMax rhoMax [1 -3 0 0 0] 1.5;
rhoMin rhoMin [1 -3 0 0 0] 0.1;
rhoMax rhoMax [1 -3 0 0 0] 1.5;
maxCo 5;
alphaTauSmooth 1;
alphaTauTemp 1;
rDeltaTSmoothingCoeff 1;
alphaTemp 1;
maxDeltaT 1;
}

View File

@ -103,8 +103,6 @@ subModels
surfaceReactionModel COxidationKineticDiffusionLimitedRate;
postProcessingModel none;
surfaceFilmModel none;
radiation on;
@ -195,4 +193,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -23,7 +23,7 @@ FoamFile
duration 0.2;
selectionMode cellSet;
volumeMode absolute;
fieldData 15000;
fieldData 20000;
cellSet ignitionCells;
}
);

View File

@ -85,8 +85,6 @@ subModels
heatTransferModel RanzMarshall;
postProcessingModel none;
surfaceFilmModel none;
radiation on;
@ -125,4 +123,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -95,4 +95,9 @@ PIMPLE
}
relaxationFactors
{
".*Final" 1;
}
// ************************************************************************* //

View File

@ -42,6 +42,7 @@ solution
}
}
constantProperties
{
parcelTypeId 1;
@ -56,6 +57,7 @@ constantProperties
constantVolume false;
}
subModels
{
particleForces
@ -72,8 +74,6 @@ subModels
heatTransferModel none;
postProcessingModel none;
surfaceFilmModel none;
collisionModel pairCollision;
@ -129,4 +129,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -65,8 +65,6 @@ subModels
heatTransferModel none;
postProcessingModel none;
surfaceFilmModel none;
collisionModel pairCollision;
@ -140,4 +138,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -50,6 +50,7 @@ solution
}
}
constantProperties
{
parcelTypeId 1;
@ -78,6 +79,7 @@ constantProperties
constantVolume false;
}
subModels
{
particleForces
@ -98,8 +100,6 @@ subModels
phaseChangeModel liquidEvaporation;
postProcessingModel patchPostProcessing;
devolatilisationModel none;
surfaceReactionModel none;
@ -160,8 +160,12 @@ subModels
activeLiquids ( H2O );
}
}
patchPostProcessingCoeffs
cloudFunctions
{
patchPostProcessing
{
maxStoredParcels 20;

View File

@ -91,6 +91,7 @@ additional
relaxationFactors
{
".*Final" 1;
}

View File

@ -50,6 +50,7 @@ solution
}
}
constantProperties
{
parcelTypeId 1;
@ -78,6 +79,7 @@ constantProperties
constantVolume false;
}
subModels
{
particleForces
@ -102,8 +104,6 @@ subModels
surfaceReactionModel none;
postProcessingModel none;
surfaceFilmModel none;
radiation off;
@ -165,4 +165,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -87,5 +87,9 @@ additional
pressureWorkTimeDerivative true;
}
relaxationFactors
{
".*Final" 1;
}
// ************************************************************************* //

View File

@ -50,6 +50,7 @@ solution
}
}
constantProperties
{
parcelTypeId 1;
@ -78,6 +79,7 @@ constantProperties
constantVolume false;
}
subModels
{
particleForces
@ -102,8 +104,6 @@ subModels
surfaceReactionModel none;
postProcessingModel patchPostProcessing;
surfaceFilmModel none;
radiation off;
@ -183,8 +183,12 @@ subModels
activeLiquids ( H2O );
}
}
patchPostProcessingCoeffs
cloudFunctions
{
patchPostProcessing
{
maxStoredParcels 100;

View File

@ -93,5 +93,9 @@ additional
pressureWorkTimeDerivative false;
}
relaxationFactors
{
".*Final" 1;
}
// ************************************************************************* //

View File

@ -95,8 +95,6 @@ subModels
phaseChangeModel none;
postProcessingModel none;
surfaceFilmModel thermoSurfaceFilm;
radiation off;
@ -134,4 +132,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -82,7 +82,7 @@ PIMPLE
relaxationFactors
{
".*Final" 1;
".*Final" 1;
}

View File

@ -95,8 +95,6 @@ subModels
phaseChangeModel none;
postProcessingModel none;
surfaceFilmModel thermoSurfaceFilm;
radiation off;
@ -160,4 +158,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -84,7 +84,7 @@ PIMPLE
relaxationFactors
{
".*Final" 1;
".*Final" 1;
}

View File

@ -95,8 +95,6 @@ subModels
phaseChangeModel none;
postProcessingModel none;
surfaceFilmModel thermoSurfaceFilm;
radiation off;
@ -140,4 +138,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -82,7 +82,7 @@ PIMPLE
relaxationFactors
{
".*Final" 1;
".*Final" 1;
}

View File

@ -50,6 +50,7 @@ solution
}
}
constantProperties
{
parcelTypeId 1;
@ -75,6 +76,7 @@ constantProperties
constantVolume false;
}
subModels
{
particleForces
@ -95,8 +97,6 @@ subModels
phaseChangeModel liquidEvaporation;
postProcessingModel none;
surfaceFilmModel none;
radiation off;
@ -149,4 +149,8 @@ subModels
}
cloudFunctions
{}
// ************************************************************************* //

View File

@ -81,5 +81,9 @@ PIMPLE
momentumPredictor yes;
}
relaxationFactors
{
".*Final" 1;
}
// ************************************************************************* //