mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge commit 'OpenCFD/master' into olesenm
This commit is contained in:
@ -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 =
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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 | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
Reference in New Issue
Block a user