GIT: conflict resolution

This commit is contained in:
andy
2012-09-26 12:13:44 +01:00
636 changed files with 20768 additions and 5580 deletions

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 -1 0 0 0 0 0 ];
internalField nonuniform List<scalar>
internalField nonuniform List<scalar>
8025
(
18.372496

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 0 0 0 0 0 0 ];
internalField nonuniform List<symmTensor>
internalField nonuniform List<symmTensor>
8025
(
(1.785697 0 0 1.785697 0 1.875)

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 -1 0 0 0 0 0 ];
internalField nonuniform List<symmTensor>
internalField nonuniform List<symmTensor>
8025
(
(98.997697 0 0 77.711245 0 30.754852)

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 -1 0 0 0 0 0 ];
internalField nonuniform List<symmTensor>
internalField nonuniform List<symmTensor>
8025
(
(4.501854 0 0 3.437531 0 1.537743)

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 1 0 0 0 0 0 ];
internalField nonuniform List<scalar>
internalField nonuniform List<scalar>
8025
(
0.2

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 0 0 0 0 0 0 ];
internalField nonuniform List<scalar>
internalField nonuniform List<scalar>
8025
(
2.019581

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 0 0 0 0 0 0 ];
internalField nonuniform List<scalar>
internalField nonuniform List<scalar>
8025
(
0

View File

@ -17,7 +17,7 @@ FoamFile
dimensions [ 0 0 0 0 0 0 0 ];
internalField nonuniform List<symmTensor>
internalField nonuniform List<symmTensor>
8025
(
(0.634791 0 0 0.634791 0 0.03)

View File

@ -6,6 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase
rm -rf VTK
rm -rf 0
rm -rf constant/polyMesh/sets constant/polyMesh/faces
rm -rf constant/polyMesh/faces
rm -rf constant/polyMesh/points

View File

@ -5,11 +5,13 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
rm -rf 0
cp -r 0.org 0
runApplication blockMesh
runApplication changeDictionary
runApplication topoSet
runApplication PDRMesh
runApplication PDRMesh -overwrite
# Run
runApplication `getApplication`

View File

@ -44,6 +44,7 @@ FoamFile
baffleCyclic_half0
{
type cyclic;
inGroups 1(cyclic);
nFaces 0;
startFace 24810;
matchTolerance 0.0001;
@ -52,6 +53,7 @@ FoamFile
baffleCyclic_half1
{
type cyclic;
inGroups 1(cyclic);
nFaces 0;
startFace 24810;
matchTolerance 0.0001;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<janafThermo<perfectGas<specie>>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<janafThermo<perfectGas<specie>>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<janafThermo<perfectGas<specie>>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;

View File

@ -37,7 +37,7 @@ boundaryField
burner
{
type flowRateInletVelocity;
flowRate constant 0.001294; //60kW C3H8
massFlowRate constant 0.001294; //60kW C3H8
value uniform (0 0 0);
}

View File

@ -53,7 +53,7 @@ boundaryField
"(region0_to.*)"
{
type buoyantPressure;
type fixedFluxPressure;
value $internalField;
}
}

View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
solidComponents
(

View File

@ -38,6 +38,7 @@ FoamFile
frontAndBack
{
type empty;
inGroups 1(empty);
nFaces 45000;
startFace 45284;
}

View File

@ -38,6 +38,7 @@ FoamFile
frontAndBack
{
type empty;
inGroups 1(empty);
nFaces 8000;
startFace 8140;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<janafThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
// Note: these are the properties for a "normalised" inviscid gas
// for which the speed of sound is 1 m/s at a temperature of 1K

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -26,6 +26,7 @@ FoamFile
empty
{
type empty;
inGroups 1(empty);
nFaces 400;
startFace 101;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

View File

@ -43,7 +43,7 @@ boundaryField
inlet
{
type flowRateInletVelocity;
flowRate constant 0.1;
massFlowRate constant 0.1;
value uniform (0 0 0);
}
outlet

View File

@ -17,41 +17,41 @@ FoamFile
6
(
back
{
type symmetryPlane;
nFaces 9340;
startFace 265900;
}
front
{
type symmetryPlane;
nFaces 9340;
startFace 275240;
type wall;
nFaces 700;
startFace 63400;
}
inletCentral
back
{
type wall;
nFaces 700;
startFace 64100;
}
wall
{
type wall;
nFaces 1400;
startFace 64800;
}
porosityWall
{
type wall;
nFaces 1600;
startFace 66200;
}
inlet
{
type patch;
nFaces 100;
startFace 284580;
}
inletSides
{
type patch;
nFaces 200;
startFace 284680;
nFaces 400;
startFace 67800;
}
outlet
{
type patch;
nFaces 300;
startFace 284880;
}
walls
{
type wall;
nFaces 9320;
startFace 285180;
nFaces 400;
startFace 68200;
}
)

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

View File

@ -32,6 +32,7 @@ FoamFile
frontAndBack
{
type empty;
inGroups 1(empty);
nFaces 800;
startFace 840;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

View File

@ -43,8 +43,8 @@ boundaryField
inlet
{
type flowRateInletVelocity;
flowRate constant 0.1;
value uniform (0 0 0);
massFlowRate constant 0.1;
rhoInlet 1; // estimate for initial rho
}
outlet
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

View File

@ -43,7 +43,7 @@ boundaryField
inlet
{
type flowRateInletVelocity;
flowRate constant 0.1;
massFlowRate constant 0.1;
value uniform (0 0 0);
}
outlet

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

View File

@ -27,12 +27,12 @@ gradSchemes
divSchemes
{
div(phi,U) Gauss upwind;
div(phi,U) bounded Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,Ekp) Gauss upwind;
div(phi,e) bounded Gauss upwind;
div(phi,epsilon) bounded Gauss upwind;
div(phi,k) bounded Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
}
laplacianSchemes

View File

@ -43,7 +43,7 @@ boundaryField
inlet
{
type flowRateInletVelocity;
flowRate constant 0.1;
massFlowRate constant 0.1;
value uniform (0 0 0);
}
outlet

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType heRhoThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -27,12 +27,12 @@ gradSchemes
divSchemes
{
div(phi,U) Gauss upwind;
div(phi,U) bounded Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,Ekp) Gauss upwind;
div(phi,e) bounded Gauss upwind;
div(phi,epsilon) bounded Gauss upwind;
div(phi,k) bounded Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
}
laplacianSchemes

View File

@ -28,8 +28,8 @@ boundaryField
inlet
{
type flowRateInletVelocity;
flowRate constant 0.5;
value uniform (0 0 0);
massFlowRate constant 0.5;
rhoInlet 0.5; // Guess for rho
}
outlet
{

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -29,14 +29,14 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
div(phi,U) bounded Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,e) bounded Gauss upwind;
div(phi,epsilon) bounded Gauss upwind;
div(phi,k) bounded Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,Ekp) Gauss upwind;
div(phi,Ekp) bounded Gauss upwind;
div((phi|interpolate(rho)),p) Gauss upwind;
}

View File

@ -32,12 +32,14 @@ FoamFile
bottom
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 25;
startFace 10415;
}
top
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 125;
startFace 10440;
}
@ -50,6 +52,7 @@ FoamFile
defaultFaces
{
type empty;
inGroups 1(empty);
nFaces 10500;
startFace 10675;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
// Note: these are the properties for a "normalised" inviscid gas
// for which the speed of sound is 1 m/s at a temperature of 1K

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
p
"p.*"
{
solver PBiCG;
preconditioner DILU;
@ -25,14 +25,14 @@ solvers
relTol 0;
}
"(U|e)"
"(U|e).*"
{
$p;
tolerance 1e-05;
relTol 0;
}
rho
"rho.*"
{
solver PCG;
preconditioner DIC;
@ -41,9 +41,10 @@ solvers
}
}
PISO
PIMPLE
{
nCorrectors 2;
nOuterCorrectors 2;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
}

View File

@ -26,6 +26,7 @@ FoamFile
empty
{
type empty;
inGroups 1(empty);
nFaces 4000;
startFace 1001;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
"(p|U|e)"
"(p|U|e).*"
{
solver PBiCG;
preconditioner DILU;
@ -25,7 +25,7 @@ solvers
relTol 0;
}
rho
"rho.*"
{
solver PCG;
preconditioner DIC;
@ -34,9 +34,10 @@ solvers
}
}
PISO
PIMPLE
{
nCorrectors 2;
nOuterCorrectors 2;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
}

View File

@ -32,6 +32,7 @@ FoamFile
SYMP3
{
type empty;
inGroups 1(empty);
nFaces 80000;
startFace 80170;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -17,12 +17,12 @@ FoamFile
solvers
{
rho
"rho.*"
{
solver diagonal;
}
p
"p.*"
{
solver PBiCG;
preconditioner DILU;
@ -30,22 +30,23 @@ solvers
relTol 0;
}
"(U|e)"
"(U|e).*"
{
$p;
tolerance 1e-9;
}
"(k|epsilon)"
"(k|epsilon).*"
{
$p;
tolerance 1e-10;
}
}
PISO
PIMPLE
{
nCorrectors 2;
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}

View File

@ -50,6 +50,7 @@ FoamFile
defaultFaces
{
type empty;
inGroups 1(empty);
nFaces 13272;
startFace 13463;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

View File

@ -17,12 +17,12 @@ FoamFile
solvers
{
rho
"rho.*"
{
solver diagonal;
}
p
"p.*"
{
solver PBiCG;
preconditioner DILU;
@ -30,22 +30,23 @@ solvers
relTol 0;
}
"(U|e|R)"
"(U|e|R).*"
{
$p;
tolerance 1e-05;
}
"(k|epsilon)"
"(k|epsilon).*"
{
$p;
tolerance 1e-08;
}
}
PISO
PIMPLE
{
nCorrectors 2;
nOuterCorrectors 2;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
}

View File

@ -26,6 +26,7 @@ FoamFile
axis
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 120;
startFace 7500;
}
@ -38,12 +39,14 @@ FoamFile
back
{
type empty;
inGroups 1(empty);
nFaces 3725;
startFace 7625;
}
front
{
type empty;
inGroups 1(empty);
nFaces 3725;
startFace 11350;
}

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
p
"p.*"
{
solver PBiCG;
preconditioner DILU;
@ -25,14 +25,14 @@ solvers
relTol 0;
}
U
"U.*"
{
$p;
tolerance 1e-05;
relTol 0;
}
rho
"rho.*"
{
solver PCG;
preconditioner DIC;
@ -41,9 +41,10 @@ solvers
}
}
PISO
PIMPLE
{
nCorrectors 2;
nOuterCorrectors 2;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
}

View File

@ -28,10 +28,10 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss upwind;
div(phi,T) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,U) bounded Gauss upwind;
div(phi,T) bounded Gauss upwind;
div(phi,k) bounded Gauss upwind;
div(phi,epsilon) bounded Gauss upwind;
div((nuEff*dev(T(grad(U))))) Gauss linear;
}

View File

@ -20,6 +20,9 @@ internalField uniform 265;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type fixedValue;

View File

@ -20,6 +20,9 @@ internalField uniform (0 0 0);
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type fixedValue;

View File

@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type alphatWallFunction;

View File

@ -21,6 +21,9 @@ internalField uniform 0.01;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type epsilonWallFunction;

View File

@ -21,6 +21,9 @@ internalField uniform 0.1;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type kqRWallFunction;

View File

@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type kappatJayatillekeWallFunction;

View File

@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type nutkWallFunction;

View File

@ -20,6 +20,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type calculated;

View File

@ -20,6 +20,9 @@ internalField uniform 0;
boundaryField
{
//- Set patchGroups for constraint patches
#include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
ground
{
type fixedFluxPressure;

View File

@ -42,7 +42,7 @@ boundary
(
maxY
{
type empty;
type symmetryPlane;
faces
(
(3 7 6 2)
@ -51,7 +51,7 @@ boundary
minX
{
type empty;
type symmetryPlane;
faces
(
(0 4 7 3)
@ -60,7 +60,7 @@ boundary
maxX
{
type empty;
type symmetryPlane;
faces
(
(2 6 5 1)
@ -69,7 +69,7 @@ boundary
minY
{
type empty;
type symmetryPlane;
faces
(
(1 5 4 0)
@ -87,7 +87,7 @@ boundary
maxZ
{
type empty;
type symmetryPlane;
faces
(
(4 5 6 7)

View File

@ -1,58 +0,0 @@
/*--------------------------------*- 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 polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
maxY
{
type empty;
nFaces 400;
startFace 22800;
}
minX
{
type empty;
nFaces 400;
startFace 23200;
}
maxX
{
type empty;
nFaces 400;
startFace 23600;
}
minY
{
type empty;
nFaces 400;
startFace 24000;
}
ground
{
type wall;
nFaces 400;
startFace 24400;
}
maxZ
{
type empty;
nFaces 400;
startFace 24800;
}
)
// ************************************************************************* //

View File

@ -28,11 +28,11 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss upwind;
div(phi,T) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
div(phi,U) bounded Gauss upwind;
div(phi,T) bounded Gauss upwind;
div(phi,k) bounded Gauss upwind;
div(phi,epsilon) bounded Gauss upwind;
div(phi,R) bounded Gauss upwind;
div(R) Gauss linear;
div((nuEff*dev(T(grad(U))))) Gauss linear;
}

View File

@ -0,0 +1,64 @@
/*--------------------------------*- 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;
object meshQualityDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
//- Maximum non-orthogonality allowed. Set to 180 to disable.
maxNonOrtho 65;
//- Max skewness allowed. Set to <0 to disable.
maxBoundarySkewness 20;
maxInternalSkewness 4;
//- Max concaveness allowed. Is angle (in degrees) below which concavity
// is allowed. 0 is straight face, <0 would be convex face.
// Set to 180 to disable.
maxConcave 80;
//- Minimum pyramid volume. Is absolute volume of cell pyramid.
// Set to a sensible fraction of the smallest cell volume expected.
// Set to very negative number (e.g. -1E30) to disable.
minVol 1e-13;
//- Minimum quality of the tet formed by the face-centre
// and variable base point minimum decomposition triangles and
// the cell centre. Set to very negative number (e.g. -1E30) to
// disable.
// <0 = inside out tet,
// 0 = flat tet
// 1 = regular tet
minTetQuality 1e-30;
//- Minimum face area. Set to <0 to disable.
minArea -1;
//- Minimum face twist. Set to <-1 to disable. dot product of face normal
//- and face centre triangles normal
minTwist 0.05;
//- minimum normalised cell determinant
//- 1 = hex, <= 0 = folded or flattened illegal cell
minDeterminant 0.001;
//- minFaceWeight (0 -> 0.5)
minFaceWeight 0.05;
//- minVolRatio (0 -> 1)
minVolRatio 0.01;
//must be >0 for Fluent compatibility
minTriangleTwist -1;
// ************************************************************************* //

View File

@ -240,7 +240,7 @@ snapControls
//- Relative distance for points to be attracted by surface feature point
// or edge. True distance is this factor times local
// maximum edge length.
tolerance 4.0;
tolerance 2.0;
//- Number of mesh displacement relaxation iterations.
nSolveIter 30;
@ -248,6 +248,19 @@ snapControls
//- Maximum number of snapping relaxation iterations. Should stop
// before upon reaching a correct mesh.
nRelaxIter 5;
// Feature snapping
//- Number of feature edge snapping iterations.
// Leave out altogether to disable.
nFeatureSnapIter 10;
//- Detect (geometric) features by sampling the surface (default=false)
implicitFeatureSnap true;
//- Use castellatedMeshControls::features (default = true)
explicitFeatureSnap false;
}
@ -342,52 +355,7 @@ addLayersControls
// where to undo.
meshQualityControls
{
//- Maximum non-orthogonality allowed. Set to 180 to disable.
maxNonOrtho 65;
//- Max skewness allowed. Set to <0 to disable.
maxBoundarySkewness 20;
maxInternalSkewness 4;
//- Max concaveness allowed. Is angle (in degrees) below which concavity
// is allowed. 0 is straight face, <0 would be convex face.
// Set to 180 to disable.
maxConcave 80;
//- Minimum pyramid volume. Is absolute volume of cell pyramid.
// Set to a sensible fraction of the smallest cell volume expected.
// Set to very negative number (e.g. -1E30) to disable.
minVol 1e-13;
//- Minimum quality of the tet formed by the face-centre
// and variable base point minimum decomposition triangles and
// the cell centre. Set to very negative number (e.g. -1E30) to
// disable.
// <0 = inside out tet,
// 0 = flat tet
// 1 = regular tet
minTetQuality 1e-30;
//- Minimum face area. Set to <0 to disable.
minArea -1;
//- Minimum face twist. Set to <-1 to disable. dot product of face normal
//- and face centre triangles normal
minTwist 0.05;
//- minimum normalised cell determinant
//- 1 = hex, <= 0 = folded or flattened illegal cell
minDeterminant 0.001;
//- minFaceWeight (0 -> 0.5)
minFaceWeight 0.05;
//- minVolRatio (0 -> 1)
minVolRatio 0.01;
//must be >0 for Fluent compatibility
minTriangleTwist -1;
#include "meshQualityDict"
// Advanced

View File

@ -15,7 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
//thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
pRef 100000;

View File

@ -30,23 +30,19 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,e) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
div(phi,K) Gauss linear;
div(phi,Ekp) Gauss linear;
div(R) Gauss linear;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
{
default none;
laplacian(muEff,U) Gauss linear corrected;
laplacian(Dp,p_rgh) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;
default Gauss linear corrected;
}
interpolationSchemes

View File

@ -39,7 +39,7 @@ solvers
relTol 0;
}
"(U|h|k|epsilon|R)"
"(U|h|e|k|epsilon|R)"
{
solver PBiCG;
preconditioner DILU;
@ -47,7 +47,7 @@ solvers
relTol 0.1;
}
"(U|h|k|epsilon|R)Final"
"(U|h|e|k|epsilon|R)Final"
{
$U;
relTol 0;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

View File

@ -27,12 +27,12 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss limitedLinear 0.2;
div(phi,K) Gauss limitedLinear 0.2;
div(phi,h) Gauss limitedLinear 0.2;
div(phi,k) Gauss limitedLinear 0.2;
div(phi,epsilon) Gauss limitedLinear 0.2;
div(phi,omega) Gauss limitedLinear 0.2;
div(phi,U) bounded Gauss limitedLinear 0.2;
div(phi,K) bounded Gauss limitedLinear 0.2;
div(phi,h) bounded Gauss limitedLinear 0.2;
div(phi,k) bounded Gauss limitedLinear 0.2;
div(phi,epsilon) bounded Gauss limitedLinear 0.2;
div(phi,omega) bounded Gauss limitedLinear 0.2;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}

View File

@ -15,32 +15,32 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [ 0 1 -1 0 0 0 0 ];
dimensions [0 1 -1 0 0 0 0];
internalField uniform ( 0.1 0 0 );
internalField uniform (0.1 0 0);
boundaryField
{
floor
{
type fixedValue;
value uniform ( 0 0 0 );
value uniform (0 0 0);
}
ceiling
{
type fixedValue;
value uniform ( 0 0 0 );
value uniform (0 0 0);
}
inlet
{
type fixedValue;
value uniform ( 0.1 0 0 );
value uniform (0.1 0 0);
}
outlet
{
type inletOutlet;
inletValue uniform ( 0 0 0 );
value uniform ( 0 0 0 );
inletValue uniform (0 0 0);
value uniform (0.1 0 0);
}
fixedWalls
{

View File

@ -44,6 +44,7 @@ FoamFile
fixedWalls
{
type empty;
inGroups 1(empty);
nFaces 4000;
startFace 4062;
}

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

View File

@ -77,7 +77,7 @@ dictionaryReplacement
{
"baffle.*"
{
type buoyantPressure;
type fixedFluxPressure;
value uniform 0;
}
}

View File

@ -77,7 +77,7 @@ dictionaryReplacement
{
"baffle1.*"
{
type buoyantPressure;
type fixedFluxPressure;
value $internalField;
}
}

View File

@ -78,7 +78,7 @@ dictionaryReplacement
{
"region0_to_.*"
{
type buoyantPressure;
type fixedFluxPressure;
value $internalField;
}
@ -110,7 +110,7 @@ dictionaryReplacement
// Solid thermo
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture

View File

@ -27,12 +27,12 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss limitedLinear 0.2;
div(phi,K) Gauss limitedLinear 0.2;
div(phi,h) Gauss limitedLinear 0.2;
div(phi,k) Gauss limitedLinear 0.2;
div(phi,epsilon) Gauss limitedLinear 0.2;
div(phi,omega) Gauss limitedLinear 0.2;
div(phi,U) bounded Gauss limitedLinear 0.2;
div(phi,K) bounded Gauss limitedLinear 0.2;
div(phi,h) bounded Gauss limitedLinear 0.2;
div(phi,k) bounded Gauss limitedLinear 0.2;
div(phi,epsilon) bounded Gauss limitedLinear 0.2;
div(phi,omega) bounded Gauss limitedLinear 0.2;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}

View File

@ -16,7 +16,6 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
value ( 0 -9.81 0 );
value (0 -9.81 0);
// ************************************************************************* //

Some files were not shown because too many files have changed in this diff Show More