Merge commit 'OpenCFD/master' into olesenm

This commit is contained in:
Mark Olesen
2009-09-22 09:33:23 +02:00
138 changed files with 73792 additions and 471 deletions

View File

@ -53,9 +53,8 @@ forAll(Tpatches, patchI)
{
if
(
(typeid(Tpatches[patchI]) == typeid(fixedValueFvPatchScalarField))
&&
(mesh.boundaryMesh()[patchI].name() == "floor")
isA<fixedValueFvPatchScalarField>(Tpatches[patchI])
&& mesh.boundaryMesh()[patchI].name() == "floor"
)
{
fixedValueFvPatchScalarField& Tpatch =

View File

@ -86,7 +86,7 @@ dictionaryReplacement
}
bottomAir_to_leftSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
@ -94,14 +94,14 @@ dictionaryReplacement
}
bottomAir_to_heater
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
bottomAir_to_rightSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -71,7 +71,7 @@ dictionaryReplacement
heater_to_bottomAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
@ -79,21 +79,21 @@ dictionaryReplacement
}
heater_to_leftSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
heater_to_rightSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
heater_to_topAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -61,7 +61,7 @@ dictionaryReplacement
}
leftSolid_to_bottomAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
@ -69,14 +69,14 @@ dictionaryReplacement
}
leftSolid_to_heater
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
leftSolid_to_topAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -61,21 +61,21 @@ dictionaryReplacement
}
rightSolid_to_heater
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
rightSolid_to_bottomAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
rightSolid_to_topAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -87,7 +87,7 @@ dictionaryReplacement
}
topAir_to_leftSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
@ -95,14 +95,14 @@ dictionaryReplacement
}
topAir_to_heater
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
topAir_to_rightSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -120,21 +120,21 @@ dictionaryReplacement
}
bottomAir_to_leftSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
bottomAir_to_heater
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
bottomAir_to_rightSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -71,7 +71,7 @@ dictionaryReplacement
heater_to_bottomAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
@ -79,21 +79,21 @@ dictionaryReplacement
}
heater_to_leftSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
heater_to_rightSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
heater_to_topAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -61,7 +61,7 @@ dictionaryReplacement
}
leftSolid_to_bottomAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
@ -69,14 +69,14 @@ dictionaryReplacement
}
leftSolid_to_heater
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
leftSolid_to_topAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -61,21 +61,21 @@ dictionaryReplacement
}
rightSolid_to_heater
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
rightSolid_to_bottomAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
rightSolid_to_topAir
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -126,7 +126,7 @@ dictionaryReplacement
}
topAir_to_leftSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
@ -134,14 +134,14 @@ dictionaryReplacement
}
topAir_to_heater
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;
}
topAir_to_rightSolid
{
type solidWallMixedTemperatureCoupled;
type turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
K K;
value uniform 300;

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/