Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry
2013-02-07 12:31:25 +00:00
33 changed files with 566 additions and 171 deletions

View File

@ -33,8 +33,14 @@ porosity1
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e3 (0 0 1);
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e3 (0 0 1);
}
}
}
}

View File

@ -54,10 +54,17 @@ geometry
scale (1.0 1.0 2.1);
transform
{
type cartesian;
origin (2 2 0);
e1 (1 0 0);
e3 (0 0 1);
coordinateSystem
{
type cartesian;
origin (2 2 0);
coordinateRotation
{
type axesRotation;
e1 (1 0 0);
e3 (0 0 1);
}
}
}
}
herring
@ -66,10 +73,17 @@ geometry
scale (1.0 1.0 2.1);
transform
{
type cartesian;
origin (3.5 3 0);
e1 (1 0 0);
e3 (0 0 1);
coordinateSystem
{
type cartesian;
origin (3.5 3 0);
coordinateRotation
{
type axesRotation;
e1 (1 0 0);
e3 (0 0 1);
}
}
}
}
}

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
type heRhoThermo;
mixture pureMixture;
transport const;
thermo hConst;

View File

@ -42,16 +42,16 @@ solvers
SIMPLE
{
momentumPredictor yes;
momentumPredictor no;
nNonOrthogonalCorrectors 0;
pRefCell 0;
pRefValue 0;
residualControl
{
p_rgh 1e-2;
U 1e-3;
h 1e-3;
p_rgh 1e-4;
U 1e-4;
h 1e-4;
// possibly check turbulence fields
"(k|epsilon|omega)" 1e-3;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
type heRhoThermo;
mixture pureMixture;
transport const;
thermo hConst;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
type heRhoThermo;
mixture pureMixture;
transport const;
thermo hConst;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
type heRhoThermo;
mixture pureMixture;
transport const;
thermo hConst;

View File

@ -15,11 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// thermoType hePsiThermo<pureMixture<const<hConst<perfectGas<specie>>,sensibleEnthalpy>>>;
thermoType
{
type hePsiThermo;
type heRhoThermo;
mixture pureMixture;
transport const;
thermo hConst;

View File

@ -51,8 +51,14 @@ porosityBlockage
coordinateSystem
{
e1 (0 1 0);
e2 (0 0 1);
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0 1 0);
e2 (0 0 1);
}
}
}
}

View File

@ -21,7 +21,7 @@ chemistryType
chemistryThermo psi;
}
chemistry off;
chemistry on;
initialChemicalTimeStep 1e-07;

View File

@ -15,9 +15,9 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
combustionModel PaSR<psiChemistryCombustion>;
combustionModel PaSR<psiChemistryCombustion>;
active false;
active yes;
PaSRCoeffs
{

View File

@ -28,7 +28,9 @@ thermoType
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "~OpenFOAM/thermoData/therm.dat";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
newFormat yes;
inertSpecie N2;

View File

@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format binary;
format ascii;
class dictionary;
location "system";
object controlDict;