GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
2311 changed files with 44971 additions and 26546 deletions

View File

@ -10,12 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object turbulenceProperties;
location "chemkin";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType laminar;
".*"
{
transport
{
As 0;
Ts 0;
}
}
// ************************************************************************* //

View File

@ -27,8 +27,7 @@ thermoType
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
// ************************************************************************* //

View File

@ -47,7 +47,9 @@ timePrecision 6;
runTimeModifiable yes;
suppressSolverInfo yes;
DebugSwitches
{
SolverPerformance 0;
}
// ************************************************************************* //

View File

@ -10,12 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object turbulenceProperties;
location "chemkin";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType laminar;
".*"
{
transport
{
As 0;
Ts 0;
}
}
// ************************************************************************* //

View File

@ -27,8 +27,7 @@ thermoType
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
// ************************************************************************* //

View File

@ -47,7 +47,9 @@ timePrecision 6;
runTimeModifiable yes;
suppressSolverInfo yes;
DebugSwitches
{
SolverPerformance 0;
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,12 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object turbulenceProperties;
location "chemkin";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType laminar;
".*"
{
transport
{
As 0;
Ts 0;
}
}
// ************************************************************************* //

View File

@ -27,8 +27,7 @@ thermoType
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
// ************************************************************************* //

View File

@ -47,7 +47,9 @@ timePrecision 6;
runTimeModifiable yes;
suppressSolverInfo yes;
DebugSwitches
{
SolverPerformance 0;
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,12 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object turbulenceProperties;
location "chemkin";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType laminar;
".*"
{
transport
{
As 0;
Ts 0;
}
}
// ************************************************************************* //

View File

@ -27,8 +27,7 @@ thermoType
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
// ************************************************************************* //

View File

@ -47,7 +47,9 @@ timePrecision 6;
runTimeModifiable yes;
suppressSolverInfo yes;
DebugSwitches
{
SolverPerformance 0;
}
// ************************************************************************* //