GIT: resolve conflict

This commit is contained in:
andy
2013-11-05 16:39:20 +00:00
103 changed files with 5187 additions and 1968 deletions

View File

@ -17,7 +17,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistrySolver EulerImplicit;
chemistryThermo psi;
}
@ -33,8 +33,9 @@ EulerImplicitCoeffs
odeCoeffs
{
solver KRR4;
eps 0.05;
solver Rosenbrock43;
absTol 1e-12;
relTol 0.01;
}
// ************************************************************************* //

View File

@ -33,8 +33,9 @@ EulerImplicitCoeffs
odeCoeffs
{
solver SIBS;
eps 0.01;
solver Rosenbrock43;
absTol 1e-12;
relTol 1e-2;
}

View File

@ -28,7 +28,8 @@ initialChemicalTimeStep 1e-10;
odeCoeffs
{
solver SIBS;
eps 0.001;
absTol 1e-12;
relTol 1e-2;
}

View File

@ -28,7 +28,8 @@ initialChemicalTimeStep 1e-10;
odeCoeffs
{
solver SIBS;
eps 1e-03;
absTol 1e-12;
relTol 1e-3;
}

View File

@ -28,7 +28,8 @@ initialChemicalTimeStep 1e-10;
odeCoeffs
{
solver SIBS;
eps 1e-04;
absTol 1e-14;
relTol 1e-4;
}

View File

@ -28,7 +28,8 @@ initialChemicalTimeStep 1e-07;
odeCoeffs
{
solver SIBS;
eps 0.05;
absTol 1e-12;
relTol 0.01;
}

View File

@ -33,8 +33,9 @@ EulerImplicitCoeffs
odeCoeffs
{
solver KRR4;
eps 0.05;
solver Rosenbrock43;
absTol 1e-12;
relTol 0.01;
}
// ************************************************************************* //