Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
laurence
2013-01-21 14:40:37 +00:00
52 changed files with 2514 additions and 1690 deletions

View File

@ -33,12 +33,18 @@ porosity1
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}
}
************************************************************************* //
//************************************************************************* //

View File

@ -10,29 +10,41 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object porosityProperties;
location "system";
object fvOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
porosity1
{
type DarcyForchheimer;
active yes;
type explicitPorositySource;
active true;
selectionMode cellZone;
cellZone porosity;
DarcyForchheimerCoeffs
explicitPorositySourceCoeffs
{
d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
type DarcyForchheimer;
coordinateSystem
DarcyForchheimerCoeffs
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}
}
// ************************************************************************* //
//************************************************************************* //

View File

@ -57,7 +57,7 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
rhoMin rhoMin [ 1 -3 0 0 0 ] 0.5;
rhoMax rhoMax [ 1 -3 0 0 0 ] 2.0;
rhoMax rhoMax [ 1 -3 0 0 0 ] 1.5;
residualControl
{
@ -76,7 +76,7 @@ relaxationFactors
fields
{
"p.*" 0.3;
"rho.*" 1;
"rho.*" 0.01;
}
equations
{

View File

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

View File

@ -10,28 +10,41 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object porosityProperties;
location "system";
object fvOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
porosity1
{
type DarcyForchheimer;
active yes;
type explicitPorositySource;
active false;
selectionMode cellZone;
cellZone porosity;
DarcyForchheimerCoeffs
explicitPorositySourceCoeffs
{
d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
type DarcyForchheimer;
coordinateSystem
DarcyForchheimerCoeffs
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
d d [0 -2 0 0 0 0 0] (5e5 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}
}
// ************************************************************************* //
//************************************************************************* //

View File

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

View File

@ -51,12 +51,18 @@ porosity1
coordinateSystem
{
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
type cartesian;
origin (0 0 0);
coordinateRotation
{
type axesRotation;
e1 (0.70710678 0.70710678 0);
e2 (0 0 1);
}
}
}
}
}
************************************************************************* //
//************************************************************************* //

View File

@ -23,7 +23,7 @@ internalFacesOnly true;
// Baffles to create.
baffles
{
baffleFaces
baffleFacesThermoBaffle1D
{
//- Use predefined faceZone to select faces and orientation.
type faceZone;
@ -52,61 +52,27 @@ baffles
{
T
{
type compressible::thermoBaffle;
// Coupled BC.
neighbourFieldName T;
kappa fluidThermo;
kappaName none;
// Thermo baffle model
thermoBaffleModel thermoBaffle;
regionName baffleRegion;
infoOutput no;
active yes;
thermoBaffleCoeffs
type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]
specie
{
nMoles 1;
molWeight 20;
}
// Solid thermo
thermoType
transport
{
type heSolidThermo;
mixture pureMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
kappa 1;
}
mixture
thermodynamics
{
specie
{
nMoles 1;
molWeight 20;
}
transport
{
kappa 0.01;
}
thermodynamics
{
Hf 0;
Cp 15;
}
equationOfState
{
rho 80;
}
Hf 0;
Cp 10;
}
radiation
equationOfState
{
radiationModel opaqueSolid;
absorptionEmissionModel none;
scatterModel none;
rho 10;
}
value uniform 300;
@ -160,7 +126,10 @@ baffles
offsetMode uniform;
offset (0 0 0);
${..master.patchFields}
patchFields
{
${...master.patchFields}
}
}
}
}

View File

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

View File

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