mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -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
|
||||
{
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ dictionaryReplacement
|
||||
{
|
||||
"region0_to.*"
|
||||
{
|
||||
type compressible::thermoBaffle;
|
||||
type compressible::thermalBaffle;
|
||||
neighbourFieldName T;
|
||||
kappa solidThermo;
|
||||
kappaName none;
|
||||
|
||||
@ -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]
|
||||
|
||||
@ -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]
|
||||
|
||||
@ -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
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -44,6 +44,6 @@ timePrecision 6;
|
||||
|
||||
runTimeModifiable true;
|
||||
|
||||
libs ("libthermoBaffleModels.so" "libcompressibleRASModels.so");
|
||||
libs ("libthermalBaffleModels.so" "libcompressibleRASModels.so");
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -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]
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
location "constant";
|
||||
object thermophysicalProperties;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,53 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
location "constant";
|
||||
object thermophysicalProperties;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
thermoType
|
||||
{
|
||||
type heRhoThermo;
|
||||
mixture pureMixture;
|
||||
transport const;
|
||||
thermo hConst;
|
||||
equationOfState perfectFluid;
|
||||
specie specie;
|
||||
energy sensibleInternalEnergy;
|
||||
}
|
||||
|
||||
mixture
|
||||
{
|
||||
specie
|
||||
{
|
||||
nMoles 1;
|
||||
molWeight 28.9; //2.77;
|
||||
}
|
||||
equationOfState
|
||||
{
|
||||
rho0 1027;
|
||||
}
|
||||
thermodynamics
|
||||
{
|
||||
Cp 4195;
|
||||
Hf 0;
|
||||
}
|
||||
transport
|
||||
{
|
||||
mu 3.645e-4;
|
||||
Pr 2.289;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,49 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.org |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
location "constant";
|
||||
object thermophysicalProperties;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
thermoType
|
||||
{
|
||||
type heRhoThermo;
|
||||
mixture pureMixture;
|
||||
transport const;
|
||||
thermo hConst;
|
||||
equationOfState perfectGas;
|
||||
specie specie;
|
||||
energy sensibleInternalEnergy;
|
||||
}
|
||||
|
||||
mixture
|
||||
{
|
||||
specie
|
||||
{
|
||||
nMoles 1;
|
||||
molWeight 28.9;
|
||||
}
|
||||
thermodynamics
|
||||
{
|
||||
Cp 1007;
|
||||
Hf 0;
|
||||
}
|
||||
transport
|
||||
{
|
||||
mu 1.84e-05;
|
||||
Pr 0.7;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -22,16 +22,6 @@ water
|
||||
transportModel Newtonian;
|
||||
nu 1e-06;
|
||||
rho 1000;
|
||||
k 0; // 0.613;
|
||||
Cv 4179;
|
||||
|
||||
equationOfState
|
||||
{
|
||||
type perfectFluid;
|
||||
|
||||
rho0 1000;
|
||||
R 3000;
|
||||
}
|
||||
}
|
||||
|
||||
air
|
||||
@ -39,16 +29,6 @@ air
|
||||
transportModel Newtonian;
|
||||
nu 1.589e-05;
|
||||
rho 1;
|
||||
k 0; // 2.63e-2;
|
||||
Cv 721;
|
||||
|
||||
equationOfState
|
||||
{
|
||||
type perfectFluid;
|
||||
|
||||
rho0 0;
|
||||
R 287;
|
||||
}
|
||||
}
|
||||
|
||||
pMin pMin [ 1 -1 -2 0 0 0 0 ] 10000;
|
||||
|
||||
@ -33,6 +33,7 @@ divSchemes
|
||||
div(phid1,p_rgh) Gauss upwind;
|
||||
div(phid2,p_rgh) Gauss upwind;
|
||||
div(rho*phi,T) Gauss upwind;
|
||||
div(rho*phi,K) Gauss upwind;
|
||||
div(phi,k) Gauss vanLeer;
|
||||
div((muEff*dev(T(grad(U))))) Gauss linear;
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ solvers
|
||||
maxIter 100;
|
||||
}
|
||||
|
||||
"(rho|rhoFinal)"
|
||||
".*(rho|rhoFinal)"
|
||||
{
|
||||
solver diagonal;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user