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

This commit is contained in:
andy
2013-02-07 09:59:47 +00:00
85 changed files with 1225 additions and 1002 deletions

View File

@ -11,17 +11,17 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object thermoBaffleProperties;
object thermalBaffleProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoBaffleModel none;
thermalBaffleModel none;
active no;
regionName none;
thermoBaffleCoeffs
thermalBaffleCoeffs
{
}

View File

@ -22,7 +22,7 @@ dictionaryReplacement
{
"region0_to.*"
{
type compressible::thermoBaffle;
type compressible::thermalBaffle;
neighbourFieldName T;
kappa solidThermo;
kappaName none;

View File

@ -88,7 +88,7 @@ dictionaryReplacement
{
"baffle.*"
{
type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
type compressible::thermalBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]

View File

@ -88,7 +88,7 @@ dictionaryReplacement
{
"baffle1Wall.*"
{
type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
type compressible::thermalBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]

View File

@ -91,7 +91,7 @@ dictionaryReplacement
"region0_to.*"
{
type compressible::thermoBaffle;
type compressible::thermalBaffle;
// Coupled BC.
neighbourFieldName T;
@ -99,11 +99,11 @@ dictionaryReplacement
kappaName none;
// Thermo baffle model
thermoBaffleModel thermoBaffle;
thermalBaffleModel thermalBaffle;
regionName baffleRegion;
infoOutput no;
active yes;
thermoBaffleCoeffs
thermalBaffleCoeffs
{
}

View File

@ -44,6 +44,6 @@ timePrecision 6;
runTimeModifiable true;
libs ("libthermoBaffleModels.so" "libcompressibleRASModels.so");
libs ("libthermalBaffleModels.so" "libcompressibleRASModels.so");
// ************************************************************************* //

View File

@ -52,7 +52,7 @@ baffles
{
T
{
type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
type compressible::thermalBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]