mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
GIT: Resolved conflict
This commit is contained in:
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -27,8 +27,7 @@ thermoType
|
||||
}
|
||||
|
||||
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
|
||||
|
||||
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
|
||||
|
||||
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -47,7 +47,9 @@ timePrecision 6;
|
||||
|
||||
runTimeModifiable yes;
|
||||
|
||||
suppressSolverInfo yes;
|
||||
|
||||
DebugSwitches
|
||||
{
|
||||
SolverPerformance 0;
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -27,8 +27,7 @@ thermoType
|
||||
}
|
||||
|
||||
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
|
||||
|
||||
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
|
||||
|
||||
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -47,7 +47,9 @@ timePrecision 6;
|
||||
|
||||
runTimeModifiable yes;
|
||||
|
||||
suppressSolverInfo yes;
|
||||
|
||||
DebugSwitches
|
||||
{
|
||||
SolverPerformance 0;
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -27,8 +27,7 @@ thermoType
|
||||
}
|
||||
|
||||
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
|
||||
|
||||
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
|
||||
|
||||
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -47,7 +47,9 @@ timePrecision 6;
|
||||
|
||||
runTimeModifiable yes;
|
||||
|
||||
suppressSolverInfo yes;
|
||||
|
||||
DebugSwitches
|
||||
{
|
||||
SolverPerformance 0;
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -27,8 +27,7 @@ thermoType
|
||||
}
|
||||
|
||||
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
|
||||
|
||||
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
|
||||
|
||||
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -47,7 +47,9 @@ timePrecision 6;
|
||||
|
||||
runTimeModifiable yes;
|
||||
|
||||
suppressSolverInfo yes;
|
||||
|
||||
DebugSwitches
|
||||
{
|
||||
SolverPerformance 0;
|
||||
}
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
Reference in New Issue
Block a user