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

This commit is contained in:
mattijs
2011-03-01 18:04:55 +00:00
344 changed files with 8293 additions and 8346 deletions

View File

@ -122,7 +122,7 @@ hollowConeInjectorCoeffs
{
sizeDistribution
{
pdfType RosinRammler;
type RosinRammler;
RosinRammlerDistribution
{
minValue 1e-06;

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev.olesenm |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -24,21 +24,12 @@ solution
sourceTerms
{
rho
schemes
{
semiImplicit false;
}
U
{
semiImplicit false;
}
Yi
{
semiImplicit false;
}
hs
{
semiImplicit false;
rho explicit;
U explicit;
Yi explicit;
hs explicit;
}
}
@ -56,7 +47,7 @@ solution
integrationSchemes
{
U Euler;
T Analytical;
T analytical;
}
}
@ -99,31 +90,29 @@ subModels
);
}
InjectionModel ManualInjection;
injectionModel manualInjection;
DispersionModel StochasticDispersionRAS;
dispersionModel stochasticDispersionRAS;
PatchInteractionModel StandardWallInteraction;
patchInteractionModel standardWallInteraction;
HeatTransferModel RanzMarshall;
heatTransferModel RanzMarshall;
CompositionModel SingleMixtureFraction;
compositionModel singleMixtureFraction;
PhaseChangeModel LiquidEvaporation;
phaseChangeModel liquidEvaporation;
DevolatilisationModel ConstantRateDevolatilisation;
devolatilisationModel constantRateDevolatilisation;
SurfaceReactionModel COxidationKineticDiffusionLimitedRate;
surfaceReactionModel COxidationKineticDiffusionLimitedRate;
PostProcessingModel none;
postProcessingModel none;
CollisionModel none;
SurfaceFilmModel none;
surfaceFilmModel none;
radiation on;
ManualInjectionCoeffs
manualInjectionCoeffs
{
massTotal 0.0001;
parcelBasisType mass;
@ -132,7 +121,7 @@ subModels
U0 ( 0 -10 0 );
sizeDistribution
{
pdfType RosinRammler;
type RosinRammler;
RosinRammlerDistribution
{
minValue 5e-06;
@ -143,7 +132,7 @@ subModels
}
}
StandardWallInteractionCoeffs
standardWallInteractionCoeffs
{
type rebound;
e 1;
@ -155,7 +144,7 @@ subModels
BirdCorrection true;
}
SingleMixtureFractionCoeffs
singleMixtureFractionCoeffs
{
phases
(
@ -180,7 +169,7 @@ subModels
YSolidTot0 0.763;
}
LiquidEvaporationCoeffs
liquidEvaporationCoeffs
{
enthalpyTransfer enthalpyDifference;
@ -190,7 +179,7 @@ subModels
);
}
ConstantRateDevolatilisationCoeffs
constantRateDevolatilisationCoeffs
{
volatileData
(
@ -201,6 +190,7 @@ subModels
COxidationKineticDiffusionLimitedRateCoeffs
{
Sb 1;
C1 5.0E-12;
C2 0.002;
E 7.9E+07;

View File

@ -24,13 +24,10 @@ solution
sourceTerms
{
U
schemes
{
semiImplicit false;
}
hs
{
semiImplicit false;
U explicit;
hs explicit;
}
}
@ -47,7 +44,7 @@ solution
integrationSchemes
{
U Euler;
T Analytical;
T analytical;
}
}
@ -83,23 +80,21 @@ subModels
);
}
InjectionModel ManualInjection;
injectionModel manualInjection;
DispersionModel StochasticDispersionRAS;
dispersionModel stochasticDispersionRAS;
PatchInteractionModel StandardWallInteraction;
patchInteractionModel standardWallInteraction;
HeatTransferModel RanzMarshall;
heatTransferModel RanzMarshall;
PostProcessingModel none;
postProcessingModel none;
CollisionModel none;
SurfaceFilmModel none;
surfaceFilmModel none;
radiation on;
ManualInjectionCoeffs
manualInjectionCoeffs
{
massTotal 0.0001;
parcelBasisType mass;
@ -108,7 +103,7 @@ subModels
U0 ( 0 0 0 );
sizeDistribution
{
pdfType RosinRammler;
type RosinRammler;
RosinRammlerDistribution
{
minValue 5e-06;
@ -119,7 +114,7 @@ subModels
}
}
StandardWallInteractionCoeffs
standardWallInteractionCoeffs
{
type rebound;
e 1;

View File

@ -25,6 +25,7 @@ boundaryField
{
type MarshakRadiation;
T T;
emissivityMode lookup;
emissivity 1;
value uniform 0;
refValue uniform 0;
@ -35,6 +36,7 @@ boundaryField
{
type MarshakRadiation;
T T;
emissivityMode lookup;
emissivity 1;
value uniform 0;
refValue uniform 0;

View File

@ -25,6 +25,7 @@ boundaryField
{
type MarshakRadiation;
T T;
emissivityMode lookup;
emissivity 1;
value uniform 0;
refValue uniform 0;
@ -35,6 +36,7 @@ boundaryField
{
type MarshakRadiation;
T T;
emissivityMode lookup;
emissivity 1;
value uniform 0;
refValue uniform 0;

View File

@ -24,8 +24,9 @@ createBaffles cycLeft '(cycLeft_half0 cycLeft_half1)' -overwrite > log.createBaf
# create the second cyclic - rhs of porous zone
createBaffles cycRight '(cycRight_half0 cycRight_half1)' -overwrite > log.createBaffles2 2>&1
# Initialise newly created patchFields to 0
changeDictionary
runApplication changeDictionary
runApplication $application

View File

@ -24,21 +24,12 @@ solution
sourceTerms
{
rho
schemes
{
semiImplicit false;
}
U
{
semiImplicit false;
}
Yi
{
semiImplicit false;
}
hs
{
semiImplicit false;
rho explicit;
U explicit;
Yi explicit;
hs explicit;
}
}
@ -55,7 +46,7 @@ solution
integrationSchemes
{
U Euler;
T Analytical;
T analytical;
}
}
@ -98,31 +89,29 @@ subModels
);
}
InjectionModel ReactingMultiphaseLookupTableInjection;
injectionModel reactingMultiphaseLookupTableInjection;
DispersionModel none;
dispersionModel none;
PatchInteractionModel LocalInteraction;
patchInteractionModel localInteraction;
HeatTransferModel RanzMarshall;
heatTransferModel RanzMarshall;
CompositionModel SingleMixtureFraction;
compositionModel singleMixtureFraction;
PhaseChangeModel LiquidEvaporation;
phaseChangeModel liquidEvaporation;
PostProcessingModel PatchPostProcessing;
postProcessingModel patchPostProcessing;
DevolatilisationModel none;
devolatilisationModel none;
SurfaceReactionModel none;
surfaceReactionModel none;
SurfaceFilmModel none;
CollisionModel none;
surfaceFilmModel none;
radiation off;
ReactingMultiphaseLookupTableInjectionCoeffs
reactingMultiphaseLookupTableInjectionCoeffs
{
massTotal 1e-2;
parcelBasisType mass;
@ -132,7 +121,7 @@ subModels
parcelsPerSecond 250;
}
LocalInteractionCoeffs
localInteractionCoeffs
{
patches
(
@ -156,7 +145,7 @@ subModels
BirdCorrection true;
}
SingleMixtureFractionCoeffs
singleMixtureFractionCoeffs
{
phases
(
@ -176,14 +165,14 @@ subModels
YSolidTot0 0;
}
LiquidEvaporationCoeffs
liquidEvaporationCoeffs
{
enthalpyTransfer enthalpyDifference;
activeLiquids ( H2O );
}
PatchPostProcessingCoeffs
patchPostProcessingCoeffs
{
maxStoredParcels 20;

View File

@ -56,7 +56,7 @@ libs
"libOpenFOAM.so"
"libcompressibleTurbulenceModel.so"
"libcompressibleRASModels.so"
"libradiation.so"
"libradiationModels.so"
);
// ************************************************************************* //

View File

@ -24,21 +24,12 @@ solution
sourceTerms
{
rho
schemes
{
semiImplicit false;
}
U
{
semiImplicit false;
}
Yi
{
semiImplicit false;
}
hs
{
semiImplicit false;
rho explicit;
U explicit;
Yi explicit;
hs explicit;
}
}
@ -98,31 +89,29 @@ subModels
);
}
InjectionModel ManualInjection;
injectionModel manualInjection;
DispersionModel none;
dispersionModel none;
PatchInteractionModel StandardWallInteraction;
patchInteractionModel standardWallInteraction;
HeatTransferModel RanzMarshall;
heatTransferModel RanzMarshall;
CompositionModel SingleMixtureFraction;
compositionModel singleMixtureFraction;
PhaseChangeModel LiquidEvaporation;
phaseChangeModel liquidEvaporation;
DevolatilisationModel none;
devolatilisationModel none;
SurfaceReactionModel none;
surfaceReactionModel none;
PostProcessingModel none;
postProcessingModel none;
SurfaceFilmModel none;
CollisionModel none;
surfaceFilmModel none;
radiation off;
ManualInjectionCoeffs
manualInjectionCoeffs
{
massTotal 5.23599e-10; // 1 droplet of density 1000 kg/m3
parcelBasisType mass;
@ -131,7 +120,7 @@ subModels
U0 (0 0 0);
sizeDistribution
{
distributionModelType uniform;
type uniform;
uniformDistribution
{
minValue 100e-06;
@ -139,7 +128,8 @@ subModels
}
}
}
StandardWallInteractionCoeffs
standardWallInteractionCoeffs
{
type rebound;
}
@ -149,7 +139,7 @@ subModels
BirdCorrection off;
}
SingleMixtureFractionCoeffs
singleMixtureFractionCoeffs
{
phases
(
@ -169,7 +159,7 @@ subModels
YSolidTot0 0;
}
LiquidEvaporationCoeffs
liquidEvaporationCoeffs
{
enthalpyTransfer enthalpyDifference; // latentHeat;

View File

@ -24,21 +24,12 @@ solution
sourceTerms
{
rho
schemes
{
semiImplicit false;
}
U
{
semiImplicit false;
}
Yi
{
semiImplicit false;
}
hs
{
semiImplicit false;
rho explicit;
U explicit;
Yi explicit;
hs explicit;
}
}
@ -55,7 +46,7 @@ solution
integrationSchemes
{
U Euler;
T Analytical;
T analytical;
}
}
@ -98,31 +89,29 @@ subModels
);
}
InjectionModel PatchInjection;
injectionModel patchInjection;
DispersionModel StochasticDispersionRAS;
dispersionModel stochasticDispersionRAS;
PatchInteractionModel StandardWallInteraction;
patchInteractionModel standardWallInteraction;
HeatTransferModel RanzMarshall;
heatTransferModel RanzMarshall;
CompositionModel SingleMixtureFraction;
compositionModel singleMixtureFraction;
PhaseChangeModel LiquidEvaporation;
phaseChangeModel liquidEvaporation;
DevolatilisationModel none;
devolatilisationModel none;
SurfaceReactionModel none;
surfaceReactionModel none;
PostProcessingModel PatchPostProcessing;
postProcessingModel patchPostProcessing;
SurfaceFilmModel none;
CollisionModel none;
surfaceFilmModel none;
radiation off;
PatchInjectionCoeffs
patchInjectionCoeffs
{
SOI 0.01;
massTotal 8;
@ -134,7 +123,7 @@ subModels
flowRateProfile constant 1;
sizeDistribution
{
distributionModelType general;
type general;
generalDistribution
{
distribution
@ -161,7 +150,7 @@ subModels
}
}
StandardWallInteractionCoeffs
standardWallInteractionCoeffs
{
type rebound;
}
@ -171,7 +160,7 @@ subModels
BirdCorrection off;
}
SingleMixtureFractionCoeffs
singleMixtureFractionCoeffs
{
phases
(
@ -191,14 +180,14 @@ subModels
YSolidTot0 0;
}
LiquidEvaporationCoeffs
liquidEvaporationCoeffs
{
enthalpyTransfer enthalpyDifference;
activeLiquids ( H2O );
}
PatchPostProcessingCoeffs
patchPostProcessingCoeffs
{
maxStoredParcels 100;

View File

@ -24,21 +24,12 @@ solution
sourceTerms
{
rho
schemes
{
semiImplicit false;
}
U
{
semiImplicit false;
}
Yi
{
semiImplicit false;
}
hs
{
semiImplicit false;
rho explicit;
U explicit;
Yi explicit;
hs explicit;
}
}
@ -55,7 +46,7 @@ solution
integrationSchemes
{
U Euler;
T Analytical;
T analytical;
}
}
@ -95,27 +86,25 @@ subModels
);
}
InjectionModel ManualInjection;
injectionModel manualInjection;
DispersionModel none;
dispersionModel none;
PatchInteractionModel StandardWallInteraction;
patchInteractionModel standardWallInteraction;
HeatTransferModel RanzMarshall;
heatTransferModel RanzMarshall;
CompositionModel SinglePhaseMixture;
compositionModel singlePhaseMixture;
PhaseChangeModel LiquidEvaporation;
phaseChangeModel liquidEvaporation;
PostProcessingModel none;
postProcessingModel none;
CollisionModel none;
SurfaceFilmModel none;
surfaceFilmModel none;
radiation off;
ManualInjectionCoeffs
manualInjectionCoeffs
{
massTotal 1e-8;
parcelBasisType mass;
@ -124,7 +113,7 @@ subModels
U0 ( 0 0 0 );
sizeDistribution
{
pdfType uniform;
type uniform;
uniformDistribution
{
minValue 1e-04;
@ -133,7 +122,7 @@ subModels
}
}
StandardWallInteractionCoeffs
standardWallInteractionCoeffs
{
type rebound;
}
@ -143,7 +132,7 @@ subModels
BirdCorrection true;
}
SinglePhaseMixtureCoeffs
singlePhaseMixtureCoeffs
{
phases
(
@ -154,7 +143,7 @@ subModels
);
}
LiquidEvaporationCoeffs
liquidEvaporationCoeffs
{
enthalpyTransfer enthalpyDifference;

View File

@ -4,10 +4,10 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \

View File

@ -24,9 +24,9 @@ solution
sourceTerms
{
U
schemes
{
semiImplicit false;
U explicit;
}
}
@ -67,19 +67,17 @@ subModels
);
}
InjectionModel ManualInjection;
injectionModel manualInjection;
DispersionModel StochasticDispersionRAS;
dispersionModel stochasticDispersionRAS;
PatchInteractionModel StandardWallInteraction;
patchInteractionModel standardWallInteraction;
PostProcessingModel none;
postProcessingModel none;
SurfaceFilmModel none;
surfaceFilmModel none;
CollisionModel none;
ManualInjectionCoeffs
manualInjectionCoeffs
{
massTotal 0.0002;
parcelBasisType mass;
@ -88,7 +86,7 @@ subModels
U0 ( 0 0 0 );
sizeDistribution
{
pdfType RosinRammler;
type RosinRammler;
RosinRammlerDistribution
{
minValue 5e-05;
@ -99,7 +97,7 @@ subModels
}
}
StandardWallInteractionCoeffs
standardWallInteractionCoeffs
{
type rebound;
}

View File

@ -24,13 +24,10 @@ solution
sourceTerms
{
U
schemes
{
semiImplicit false;
}
hs
{
semiImplicit false;
U explicit;
hs explicit;
}
}
@ -46,7 +43,7 @@ solution
integrationSchemes
{
U Euler;
T Analytical;
T analytical;
}
}
@ -82,23 +79,21 @@ subModels
);
}
InjectionModel ManualInjection;
injectionModel manualInjection;
DispersionModel StochasticDispersionRAS;
dispersionModel stochasticDispersionRAS;
PatchInteractionModel StandardWallInteraction;
patchInteractionModel standardWallInteraction;
HeatTransferModel RanzMarshall;
heatTransferModel RanzMarshall;
PostProcessingModel none;
postProcessingModel none;
CollisionModel none;
SurfaceFilmModel none;
surfaceFilmModel none;
radiation off;
ManualInjectionCoeffs
manualInjectionCoeffs
{
massTotal 0.0001;
parcelBasisType mass;
@ -107,7 +102,7 @@ subModels
U0 ( 0 0 0 );
sizeDistribution
{
pdfType RosinRammler;
type RosinRammler;
RosinRammlerDistribution
{
minValue 5e-06;
@ -118,7 +113,7 @@ subModels
}
}
StandardWallInteractionCoeffs
standardWallInteractionCoeffs
{
type rebound;
}

View File

@ -30,24 +30,12 @@ solution
sourceTerms
{
resetOnStartup false;
U
schemes
{
alpha 1;
semiImplicit true;
}
hs
{
alpha 1;
semiImplicit true;
}
rho
{
alpha 1;
semiImplicit false;
}
Yi
{
semiImplicit true;
rho semiImplicit 1;
U semiImplicit 1;
Yi semiImplicit 1;
hs semiImplicit 1;
}
}
@ -64,7 +52,7 @@ solution
integrationSchemes
{
U Euler;
T Analytical;
T analytical;
}
}
@ -109,32 +97,30 @@ subModels
);
}
InjectionModel PatchInjection;
injectionModel patchInjection;
DispersionModel StochasticDispersionRAS;
dispersionModel stochasticDispersionRAS;
PatchInteractionModel StandardWallInteraction;
patchInteractionModel standardWallInteraction;
HeatTransferModel RanzMarshall;
heatTransferModel RanzMarshall;
CompositionModel SingleMixtureFraction;
compositionModel singleMixtureFraction;
PhaseChangeModel LiquidEvaporation;
phaseChangeModel liquidEvaporation;
DevolatilisationModel none;
devolatilisationModel none;
SurfaceReactionModel none;
surfaceReactionModel none;
PostProcessingModel ParticleTracks;
postProcessingModel particleTracks;
SurfaceFilmModel none;
CollisionModel none;
surfaceFilmModel none;
radiation off;
PatchInjectionCoeffs
patchInjectionCoeffs
{
massFlowRate 0.8e-03;
parcelBasisType mass;
@ -145,7 +131,7 @@ subModels
flowRateProfile constant 1;
sizeDistribution
{
distributionModelType general;
type general;
generalDistribution
{
distribution
@ -172,7 +158,7 @@ subModels
}
}
StandardWallInteractionCoeffs
standardWallInteractionCoeffs
{
type rebound;
}
@ -182,7 +168,7 @@ subModels
BirdCorrection off;
}
SingleMixtureFractionCoeffs
singleMixtureFractionCoeffs
{
phases
(
@ -202,19 +188,19 @@ subModels
YSolidTot0 0;
}
LiquidEvaporationCoeffs
liquidEvaporationCoeffs
{
enthalpyTransfer enthalpyDifference;
activeLiquids ( H2O );
}
PatchPostProcessingCoeffs
patchPostProcessingCoeffs
{
maxStoredParcels 100;
patches ( outlet );
}
ParticleTracksCoeffs
particleTracksCoeffs
{
trackInterval 5;
maxSamples 1000000;