zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
henry
2009-07-08 22:45:26 +01:00
parent fda6bcbc0c e55c47478d
commit 92c973d65f
9 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
View File

@ -124,7 +124,10 @@ int main(int argc, char *argv[])
rho = thermo.rho();
runTime.write();
if (runTime.write())
{
chemistry.dQ()().write();
}
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"

5
applications/solvers/combustion/dieselFoam/dieselFoam.C
View File

@ -114,7 +114,10 @@ int main(int argc, char *argv[])
rho = thermo.rho();
runTime.write();
if (runTime.write())
{
chemistry.dQ()().write();
}
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"

5
applications/solvers/combustion/reactingFoam/reactingFoam.C
View File

@ -86,7 +86,10 @@ int main(int argc, char *argv[])
turbulence->correct();
rho = thermo.rho();
if (runTime.write())
{
chemistry.dQ()().write();
}
runTime.write();

5
applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
View File

@ -86,7 +86,10 @@ int main(int argc, char *argv[])
rho = thermo.rho();
runTime.write();
if (runTime.write())
{
chemistry.dQ()().write();
}
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"

5
applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
View File

@ -114,7 +114,10 @@ int main(int argc, char *argv[])
rho = thermo.rho();
runTime.write();
if (runTime.write())
{
chemistry.dQ()().write();
}
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"

6
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
View File

@ -99,12 +99,14 @@ int main(int argc, char *argv[])
#include "pEqn.H"
}
turbulence->correct();
rho = thermo.rho();
runTime.write();
if (runTime.write())
{
chemistry.dQ()().write();
}
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"

5
applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
View File

@ -101,7 +101,10 @@ int main(int argc, char *argv[])
rho = thermo.rho();
runTime.write();
if (runTime.write())
{
chemistry.dQ()().write();
}
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"

45
src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
View File

@ -246,11 +246,9 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::omega
{
pr *= pow(cr, exp - 1.0);
}
}
return pf*cf - pr*cr;
}
@ -468,10 +466,27 @@ Foam::ODEChemistryModel<CompType, ThermoType>::tc() const
this->thermo().rho()
);
label nCells = rho.size();
label nReaction = reactions_.size();
tmp<volScalarField> tsource
(
new volScalarField
(
IOobject
(
"tc",
this->time().timeName(),
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
this->mesh(),
dimensionedScalar("zero", dimTime, SMALL),
zeroGradientFvPatchScalarField::typeName
)
);
scalarField t(nCells, SMALL);
scalarField& t = tsource();
label nReaction = reactions_.size();
if (this->chemistry_)
{
@ -509,25 +524,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::tc() const
}
}
tmp<volScalarField> tsource
(
new volScalarField
(
IOobject
(
"tc",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
this->mesh_,
dimensionedScalar("zero", dimTime, 0.0),
zeroGradientFvPatchScalarField::typeName
)
);
tsource().internalField() = t;
tsource().correctBoundaryConditions();
return tsource;
@ -682,7 +679,7 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::solve
forAll(rho, celli)
{
for (label i=0; i<nSpecie(); i++)
for (label i=0; i<nSpecie_; i++)
{
RR_[i][celli] = 0.0;
}

2
src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
View File

@ -26,7 +26,7 @@ Class
Foam::rhoChemistryModel
Description
Chemistry model for compressibility-based thermodynamics
Chemistry model for density-based thermodynamics
SourceFiles
rhoChemistryModelI.H