Merge remote branch 'OpenCFD/master' into olesenm

Conflicts:
	tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
This commit is contained in:
Mark Olesen
2010-04-09 14:21:34 +02:00
12 changed files with 164 additions and 158 deletions

View File

@ -103,8 +103,8 @@ ManualInjectionCoeffs
{
minValue 5e-06;
maxValue 0.0005;
d ( 5e-05 );
n ( 0.5 );
d 5e-05;
n 0.5;
}
}
}

View File

@ -88,8 +88,8 @@ ManualInjectionCoeffs
{
minValue 5e-06;
maxValue 0.000565;
d ( 4.8e-05 );
n ( 0.5 );
d 4.8e-05;
n 0.5;
}
}
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
chemistryReader foamChemistryReader;

View File

@ -75,8 +75,8 @@ ManualInjectionCoeffs
{
minValue 5e-05;
maxValue 0.0001;
d ( 7.5e-05 );
n ( 0.5 );
d 7.5e-05;
n 0.5;
}
}
}

View File

@ -88,8 +88,8 @@ ManualInjectionCoeffs
{
minValue 5e-06;
maxValue 0.0005;
d ( 5e-05 );
n ( 0.5 );
d 5e-05;
n 0.5;
}
}
}