Merge branch 'master' into particleInteractions

This commit is contained in:
graham
2009-11-11 13:26:30 +00:00
517 changed files with 18508 additions and 4296 deletions

View File

@ -107,8 +107,9 @@ ManualInjectionCoeffs
StandardWallInteractionCoeffs
{
e e [ 0 0 0 0 0 ] 1;
mu mu [ 0 0 0 0 0 ] 0;
type rebound;
e 1;
mu 0;
}
RanzMarshallCoeffs

View File

@ -92,8 +92,9 @@ ManualInjectionCoeffs
StandardWallInteractionCoeffs
{
e e [ 0 0 0 0 0 ] 1;
mu mu [ 0 0 0 0 0 ] 0;
type rebound;
e 1;
mu 0;
}
RanzMarshallCoeffs

View File

@ -110,8 +110,7 @@ ReactingLookupTableInjectionCoeffs
StandardWallInteractionCoeffs
{
e e [ 0 0 0 0 0 ] 1;
mu mu [ 0 0 0 0 0 ] 0;
type rebound;
}
LocalInteractionCoeffs
@ -120,13 +119,11 @@ LocalInteractionCoeffs
(
walls
{
e 1;
mu 0;
type rebound;
}
cycLeft
{
e 1;
mu 0;
type rebound;
}
);
}

View File

@ -1,5 +1,6 @@
(
N2 N2 1 28.0134
// Nitrogen
N2 N2 1 28.0134
rhoPolynomial
(
3.88E+000
@ -11,8 +12,8 @@ N2 N2 1 28.0134
0
0
)
0.0 // Heat of formation
0.0 // Standard entropy
0.0 // Heat of formation [J/kg]
6840 // Standard entropy [J/kg/K]
cpPolynomial
(
2.75E+004
@ -46,7 +47,9 @@ N2 N2 1 28.0134
0
0
)
O2 O2 1 31.9988
// Oxygen
O2 O2 1 31.9988
rhoPolynomial
(
4.43E+000
@ -58,8 +61,8 @@ O2 O2 1 31.9988
0
0
)
0.0 // Heat of formation
0.0 // Standard entropy
0.0 // Heat of formation [J/kg]
6408 // Standard entropy [J/kg/K]
cpPolynomial
(
2.67E+004
@ -93,7 +96,9 @@ O2 O2 1 31.9988
0
0
)
H2O H2O 1 18.0153
// Water vapour
H2O H2O 1 18.0153
rhoPolynomial
(
2.49E+000
@ -105,8 +110,8 @@ H2O H2O 1 18.0153
0
0
)
-241.8 // Heat of formation
0.0 // Standard entropy
-1.3423e07 // Heat of formation [J/kg]
1.0482e04 // Standard entropy [J/kg/K]
cpPolynomial
(
2.85E+004

View File

@ -99,8 +99,7 @@ ManualInjectionCoeffs
StandardWallInteractionCoeffs
{
e e [ 0 0 0 0 0 ] 1;
mu mu [ 0 0 0 0 0 ] 0;
type rebound;
}
RanzMarshallCoeffs

View File

@ -104,8 +104,7 @@ ConeInjectionCoeffs
StandardWallInteractionCoeffs
{
e e [ 0 0 0 0 0 ] 1;
mu mu [ 0 0 0 0 0 ] 0;
type rebound;
}

View File

@ -92,8 +92,7 @@ ManualInjectionCoeffs
StandardWallInteractionCoeffs
{
e e [ 0 0 0 0 0 ] 1;
mu mu [ 0 0 0 0 0 ] 0;
type rebound;
}
RanzMarshallCoeffs