GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 09:32:38 +00:00
246 changed files with 4020 additions and 788 deletions

View File

@ -0,0 +1,29 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object chemistryProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
chemistryType
{
chemistrySolver noChemistrySolver;
chemistryThermo psi;
}
chemistry on;
initialChemicalTimeStep 1e-07;
// ************************************************************************* //

View File

@ -16,7 +16,12 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel infinitelyFastChemistry<psiThermoCombustion,gasHThermoPhysics>;
//combustionModel FSD<psiThermoCombustion,gasHThermoPhysics>;
//combustionModel diffusionMulticomponent<psiChemistryCombustion,gasHThermoPhysics>;
//NOTE: To use diffusionMulticomponent combustion model you need to rename files:
// reactions.twoSteps -> reactions
// thermophysicalProperties.twoSteps -> thermophysicalProperties
active true;
@ -26,8 +31,22 @@ infinitelyFastChemistryCoeffs
C 5.0;
}
diffusionMulticomponentCoeffs
{
Ci (1.0 1.5);
fuels (CH4 CO);
oxydants (O2 O2);
YoxStream (0.23 0.23);
YfStream (1.0 1.0);
sigma (0.02 0.02);
oxydantRes (0.015 0.005);
ftCorr (0 0);
laminarIgn false;
}
FSDCoeffs
{
semiImplicit no;
Cv 0.1;
ftVarMin 1e-2;

View File

@ -189,7 +189,7 @@ greyMeanAbsorptionEmissionCoeffs
scatterModel none;
sootModel mixtureFractionSoot<gasHThermoPhysics>;
sootModel none;//mixtureFractionSoot<gasHThermoPhysics>;
mixtureFractionSootCoeffs
{

View File

@ -9,7 +9,7 @@ species
reactions
{
propaneReaction
methaneReaction
{
type irreversibleinfiniteReaction;
reaction "CH4 + 2O2 + 7.5N2 = CO2 + 2H2O + 7.5N2";

View File

@ -0,0 +1,30 @@
species
(
O2
H2O
CH4
CO2
CO
N2
);
reactions
{
methaneReaction
{
type irreversibleArrheniusReaction;
reaction "CH4^0.9 + 2O2^1.1 = CO + 2H2O";
A 2.119e12;
beta 0;
Ta 17676;
}
COReaction
{
type irreversibleArrheniusReaction;
reaction "CO + 0.5O2^0.25 = CO2";
A 1e6;
beta 0;
Ta 6060;
}
}

View File

@ -124,3 +124,26 @@ N2
Ts 170.672;
}
}
CO
{
specie
{
nMoles 1;
molWeight 28.0106;
}
thermodynamics
{
Tlow 200;
Thigh 6000;
Tcommon 1000;
highCpCoeffs ( 3.04849 0.00135173 -4.85794e-07 7.88536e-11 -4.69807e-15 -14266.1 6.0171 );
lowCpCoeffs ( 3.57953 -0.000610354 1.01681e-06 9.07006e-10 -9.04424e-13 -14344.1 3.50841 );
}
transport
{
As 1.67212e-06;
Ts 170.672;
}
}

View File

@ -0,0 +1,40 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 2.2.2 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType
{
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
inertSpecie N2;
fuel CH4;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
// ************************************************************************* //

View File

@ -30,7 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss LUST grad(U);
div(phi,K) Gauss linear;
div(phi,K) Gauss limitedLinear 1;
div(phi,k) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss multivariateSelection
{
@ -39,9 +39,12 @@ divSchemes
N2 limitedLinear01 1;
H2O limitedLinear01 1;
CO2 limitedLinear01 1;
CO limitedLinear01 1;
h limitedLinear 1;
};
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
div(phi,omega) Gauss upwind;
div(U) Gauss linear;
div(Ji,Ii_h) Gauss upwind;
}

View File

@ -9,26 +9,27 @@ runApplication blockMesh
#cp system/decomposeParDict-2 system/decomposeParDict
#runApplication decomposePar
#- redistributePar to do decomposition
# redistributePar to do decomposition
runParallel redistributePar 2 -decompose
#- bit of renumbering and running
# Bit of renumbering and running
runParallel -log log.renumberMesh-CuthillMcKee renumberMesh 2 -overwrite
runParallel -log log.icoFoam-CuthillMcKee icoFoam 2
#- bit of bad renumbering and running
# Bit of bad renumbering and running
runParallel -log log.renumberMesh-parallel renumberMesh 2 -overwrite -dict system/renumberMeshDict-random
runParallel -log log.icoFoam-random icoFoam 2
#- pick up last result
# Pick up last result
cp system/controlDict-latestTime system/controlDict
#- redistribute to 5 processors
# Redistribute to 5 processors
runParallel -log log.redistributePar-5 redistributePar 5 -decomposeParDict system/decomposeParDict-5 -cellDist
#- run a bit more
# Run a bit more
runParallel -log log.icoFoam-5 icoFoam 5 -decomposeParDict system/decomposeParDict-5
#- reconstruct mesh and results
# Reconstruct mesh and results
runParallel -log log.redistributePar-1 redistributePar 5 -reconstruct -decomposeParDict system/decomposeParDict