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

This commit is contained in:
andy
2011-11-22 16:34:17 +00:00
2 changed files with 3 additions and 8 deletions

View File

@ -80,17 +80,12 @@ singleStepCombustion<CombThermoType, ThermoType>::R
{
const label specieI = this->thermo_->composition().species()[Y.name()];
const label fNorm = singleMixture_.specieProd()[specieI];
const volScalarField fres(singleMixture_.fres(specieI));
const volScalarField wSpecie
(
wFuel_*singleMixture_.specieStoichCoeffs()[specieI]
/ max(fNorm*(Y - fres), scalar(0.001))
);
return -fNorm*wSpecie*fres + fNorm*fvm::Sp(wSpecie, Y);
return wSpecie + fvm::Sp(0.0*wSpecie, Y);
}

View File

@ -15,8 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
//combustionModel infinitelyFastChemistry<psiCombustionModel,gasThermoPhysics>;
combustionModel FSD<psiCombustionModel,gasThermoPhysics>;
combustionModel infinitelyFastChemistry<psiCombustionModel,gasThermoPhysics>;
//combustionModel FSD<psiCombustionModel,gasThermoPhysics>;
active true;