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

Conflicts:
	src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
This commit is contained in:
sergio
2012-10-04 11:01:41 +01:00
153 changed files with 1237 additions and 1737 deletions

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture inhomogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture homogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heheuReactionThermo;
type heheuPsiThermo;
mixture inhomogeneousMixture;
transport sutherland;
thermo janaf;

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<reactingSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture reactingSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
solidComponents
(

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
chemistryThermo psi;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture singleStepReactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -110,7 +110,16 @@ dictionaryReplacement
// Solid thermo
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -52,16 +52,16 @@ functions
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
enabled yes;
outputControl outputTime;
region topAir;
// Output to log&file (true) or to file only
log true;
// Output to log&file (yes) or to file only
log yes;
// Output field values as well
valueOutput false; //true;
valueOutput no;
// Type of source: patch/faceZone/sampledSurface
source patch;
@ -85,16 +85,16 @@ functions
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
enabled yes;
outputControl outputTime;
region topAir;
// Output to log&file (true) or to file only
log true;
// Output to log&file (yes) or to file only
log yes;
// Output field values as well
valueOutput false; //true;
valueOutput no;
// Type of source: patch/faceZone/sampledSurface
source patch;

View File

@ -1,4 +1,4 @@
/*--------------------------------*- C++ -*----------------------------------*\
/*--------------------------------*- C++ -*----------------------------------* \
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -14,7 +14,16 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIso<const<hConst<rhoConst<specie>>,sensibleEnthalpy>>>>;
thermoType
{
type heSolidThermo;
mixture pureSolidMixture;
transport constIso;
thermo hConst;
equationOfState rhoConst;
specie specie;
energy sensibleEnthalpy;
}
mixture
{

View File

@ -62,7 +62,7 @@ functions
pName p;
UName U;
rhoName rhoInf;
log true;
log yes;
rhoInf 1000;
CofR (0 0 0);
}
@ -71,11 +71,11 @@ functions
{
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
enabled yes;
outputControl timeStep;
outputInterval 1;
log true;
valueOutput false;
log yes;
valueOutput no;
source faceZone;
sourceName f0;
operation areaAverage;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
chemistryThermo rho;
}
chemistry on; // off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
chemistryThermo rho;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -52,10 +52,10 @@ functions
{
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
enabled yes;
outputControl outputTime;
log true;
valueOutput true;
log yes;
valueOutput no;
source patch;
sourceName outlet;
operation weightedAverage;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry on;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
chemistryThermo psi;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
chemistryThermo psi;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
chemistryThermo psi;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver noChemistrySolver;
chemistryThermo psi;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo rho;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo rho;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo rho;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoReactionThermo;
type heRhoThermo;
mixture reactingMixture;
transport polynomial;
thermo hPolynomial;

View File

@ -57,10 +57,10 @@ functions
{
type faceSource;
functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
enabled yes;
outputControl outputTime;
log true;
valueOutput true;
log yes;
valueOutput no;
source patch;
sourceName outlet;
operation weightedAverage;

View File

@ -17,8 +17,8 @@ FoamFile
chemistryType
{
chemistryModel ODEChemistryModel;
chemistrySolver ode;
chemistryThermo psi;
}
chemistry off;

View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiReactionThermo;
type hePsiThermo;
mixture reactingMixture;
transport sutherland;
thermo janaf;