GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
2311 changed files with 44971 additions and 26546 deletions

View File

@ -27,13 +27,6 @@ boundaryField
value $internalField;
}
top
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
burner
{
type flowRateInletVelocity;
@ -41,7 +34,7 @@ boundaryField
value uniform (0 0 0);
}
sides
"(top|sides)"
{
type pressureInletOutletVelocity;
phi phi;

View File

@ -27,19 +27,13 @@ boundaryField
value $internalField;
}
top
{
type zeroGradient;
value $internalField;
}
burner
{
type fixedFluxPressure;
value $internalField;
}
sides
"(top|sides)"
{
type totalPressure;
U U;

View File

@ -0,0 +1,21 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class uniformDimensionedScalarField;
location "constant";
object hRef;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 0 0 0 0 0];
value 4.2;
// ************************************************************************* //

View File

@ -96,4 +96,5 @@ LES
}
}
// ************************************************************************* //

View File

@ -28,9 +28,10 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss limitedLinear 1;
div(phi,U) Gauss LUST grad(U);
div(phi,K) Gauss limitedLinear 1;
div(phi,k) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss multivariateSelection
div(phi,Yi_h) Gauss multivariateSelection
{
O2 linearUpwind grad(O2);
N2 linearUpwind grad(N2);
@ -40,7 +41,6 @@ divSchemes
h linearUpwind grad(h);
};
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
div(phi,K) Gauss limitedLinear 1;
div(Ji,Ii_h) Gauss upwind;
}

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
rho
"rho.*"
{
solver PCG;
preconditioner DIC;
@ -25,12 +25,6 @@ solvers
relTol 0;
};
"(rho)Final"
{
$rho;
relTol 0;
}
p_rgh
{
solver GAMG;
@ -39,18 +33,16 @@ solvers
smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
agglomerator faceAreaPair;
mergeLevels 1;
};
p_rghFinal
{
$p_rgh;
tolerance 1e-6;
relTol 0;
};
"(U|Yi|k|h|omega)"
{
solver PBiCG;
@ -63,11 +55,9 @@ solvers
"(U|Yi|k|h|omega)Final"
{
$U;
tolerance 1e-6;
relTol 0;
};
Ii
{
solver GAMG;
@ -90,7 +80,6 @@ solvers
tolerance 1e-04;
relTol 0;
}
}
PIMPLE
@ -105,9 +94,9 @@ relaxationFactors
{
equations
{
"(U|k).*" 1;
"(C3H8|O2|H2O|CO2|h).*" 1;
".*" 1;
}
}
// ************************************************************************* //

View File

@ -21,18 +21,11 @@ internalField uniform 0;
boundaryField
{
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue uniform 0;
value uniform 0;
}
sides
{
type inletOutlet;
inletValue uniform 0;
value uniform 0;
inletValue $internalField;
value $internalField;
}
base

View File

@ -21,24 +21,22 @@ internalField uniform 0.76699;
boundaryField
{
outlet
{
type calculated;
}
sides
"(outlet|sides)"
{
type calculated;
value $internalField;
}
base
{
type calculated;
value $internalField;
}
inlet
{
type calculated;
value $internalField;
}
frontAndBack

View File

@ -21,14 +21,7 @@ internalField uniform 0.23301;
boundaryField
{
outlet
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
sides
"(outlet|sides)"
{
type inletOutlet;
inletValue $internalField;

View File

@ -21,18 +21,11 @@ internalField uniform 300;
boundaryField
{
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue uniform 300;
value uniform 300;
}
sides
{
type inletOutlet;
inletValue uniform 300;
value uniform 300;
inletValue $internalField;
value $internalField;
}
base

View File

@ -21,20 +21,12 @@ internalField uniform (0 0 0);
boundaryField
{
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue uniform (0 0 0);
value uniform (0 0 0);
}
sides
{
type pressureInletOutletVelocity;
outletValue uniform (0 0 0);
value uniform (0 0 0);
}
base

View File

@ -21,31 +21,24 @@ internalField uniform 0;
boundaryField
{
base
{
type zeroGradient;
}
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
base
{
type zeroGradient;
}
inlet
{
type fixedValue;
value uniform 0;
}
sides
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
frontAndBack
{
type empty;

View File

@ -21,12 +21,7 @@ internalField uniform 0;
boundaryField
{
outlet
{
type zeroGradient;
}
sides
"(outlet|sides)"
{
type zeroGradient;
}

View File

@ -21,11 +21,11 @@ internalField uniform 1e-4;
boundaryField
{
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue uniform 1e-4;
value uniform 1e-4;
inletValue $internalField;
value $internalField;
}
sides
@ -37,14 +37,13 @@ boundaryField
base
{
type fixedValue;
value uniform 1e-4;
type zeroGradient;
}
inlet
{
type fixedValue;
value uniform 1e-4;
value $internalField;
}
frontAndBack

View File

@ -21,12 +21,7 @@ internalField uniform 0;
boundaryField
{
outlet
{
type zeroGradient;
}
sides
"(outlet|sides)"
{
type zeroGradient;
}

View File

@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
object p_rgh;
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -21,13 +21,7 @@ internalField uniform 101325;
boundaryField
{
outlet
{
type calculated;
value $internalField;
}
sides
"(outlet|sides)"
{
type calculated;
value $internalField;

View File

@ -21,13 +21,7 @@ internalField uniform 101325;
boundaryField
{
outlet
{
type fixedFluxPressure;
value $internalField;
}
sides
"(outlet|sides)"
{
type totalPressure;
p0 $internalField;

View File

@ -0,0 +1,21 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class uniformDimensionedScalarField;
location "constant";
object hRef;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 0 0 0 0 0];
value 1;
// ************************************************************************* //

View File

@ -1,53 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev-OpenCFD |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
base
{
type patch;
nFaces 134;
startFace 44700;
}
outlet
{
type patch;
nFaces 150;
startFace 44834;
}
sides
{
type patch;
nFaces 300;
startFace 44984;
}
frontAndBack
{
type empty;
inGroups 1(empty);
nFaces 45000;
startFace 45284;
}
inlet
{
type patch;
nFaces 16;
startFace 90284;
}
)
// ************************************************************************* //

View File

@ -32,7 +32,7 @@ writeInterval 0.1;
purgeWrite 0;
writeFormat ascii;
writeFormat binary;
writePrecision 6;

View File

@ -28,9 +28,11 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss limitedLinear 1;
div(phi,U) Gauss LUST grad(U);
div(phi,K) Gauss limitedLinear 1;
div(phi,k) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss multivariateSelection
div(phi,Yi_h) Gauss multivariateSelection
{
O2 limitedLinear01 1;
CH4 limitedLinear01 1;
@ -42,7 +44,6 @@ divSchemes
};
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
div(phi,omega) Gauss upwind;
div(phi,K) Gauss limitedLinear 1;
div(U) Gauss linear;
div(Ji,Ii_h) Gauss upwind;
}

View File

@ -21,22 +21,18 @@ internalField uniform 0;
boundaryField
{
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue uniform 0;
value uniform 0;
}
sides
{
type inletOutlet;
inletValue uniform 0;
value uniform 0;
inletValue $internalField;
value $internalField;
}
base
{
type zeroGradient;
}
inlet
{
type fixedValue;

View File

@ -21,21 +21,22 @@ internalField uniform 0.76699;
boundaryField
{
outlet
{
type calculated;
}
sides
"(outlet|sides)"
{
type calculated;
value $internalField;
}
base
{
type calculated;
value $internalField;
}
inlet
{
type calculated;
value $internalField;
}
}

View File

@ -21,31 +21,23 @@ internalField uniform 0.23301;
boundaryField
{
outlet
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
sides
"(outlet|sides)"
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
base
{
type zeroGradient;
}
inlet
{
type fixedValue;
value uniform 0;
}
frontBack
{
type empty;
}
}

View File

@ -21,28 +21,23 @@ internalField uniform 300;
boundaryField
{
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue uniform 300;
value uniform 300;
}
sides
{
type inletOutlet;
inletValue uniform 300;
value uniform 300;
inletValue $internalField;
value $internalField;
}
base
{
type zeroGradient;
}
inlet
{
type fixedValue;
value uniform 300;
}
}

View File

@ -21,31 +21,24 @@ internalField uniform (0 0 0);
boundaryField
{
outlet
{
type inletOutlet;
inletValue uniform (0 0 0);
value uniform (0 0 0);
}
sides
"(outlet|sides)"
{
type pressureInletOutletVelocity;
value uniform (0 0 0);
phi phi;
}
base
{
type fixedValue;
value uniform (0 0 0);
}
inlet
{
type fixedValue;
value uniform (0 0.01 0);
}
}

View File

@ -21,30 +21,23 @@ internalField uniform 0;
boundaryField
{
base
{
type zeroGradient;
}
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
base
{
type zeroGradient;
}
inlet
{
type fixedValue;
value uniform 0;
}
sides
{
type inletOutlet;
inletValue $internalField;
value $internalField;
}
}

View File

@ -21,23 +21,20 @@ internalField uniform 0;
boundaryField
{
outlet
{
type zeroGradient;
}
sides
"(outlet|sides)"
{
type zeroGradient;
}
base
{
type zeroGradient;
}
inlet
{
type zeroGradient;
}
}

View File

@ -21,28 +21,23 @@ internalField uniform 1e-4;
boundaryField
{
outlet
"(outlet|sides)"
{
type inletOutlet;
inletValue uniform 1e-4;
value uniform 1e-4;
}
sides
{
type inletOutlet;
inletValue uniform 1e-4;
value uniform 1e-4;
inletValue $internalField;
value $internalField;
}
base
{
type zeroGradient;
}
inlet
{
type fixedValue;
value uniform 1e-4;
value $internalField;
}
}

View File

@ -21,18 +21,16 @@ internalField uniform 0;
boundaryField
{
outlet
{
type zeroGradient;
}
sides
"(outlet|sides)"
{
type zeroGradient;
}
base
{
type zeroGradient;
}
inlet
{
type zeroGradient;

View File

@ -21,26 +21,22 @@ internalField uniform 101325;
boundaryField
{
outlet
"(outlet|sides)"
{
type calculated;
value $internalField;
type calculated;
value $internalField;
}
sides
{
type calculated;
value $internalField;
}
base
{
type calculated;
value $internalField;
type calculated;
value $internalField;
}
inlet
{
type calculated;
value $internalField;
type calculated;
value $internalField;
}
}

View File

@ -21,12 +21,7 @@ internalField uniform 101325;
boundaryField
{
outlet
{
type fixedFluxPressure;
value $internalField;
}
sides
"(outlet|sides)"
{
type totalPressure;
p0 $internalField;
@ -34,14 +29,16 @@ boundaryField
phi phi;
rho rho;
psi none;
gamma 0;
gamma 1;
value $internalField;
}
base
{
type fixedFluxPressure;
value $internalField;
}
inlet
{
type fixedFluxPressure;

View File

@ -0,0 +1,21 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class uniformDimensionedScalarField;
location "constant";
object hRef;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 0 0 0 0 0];
value 1;
// ************************************************************************* //

View File

@ -32,7 +32,7 @@ writeInterval 0.1;
purgeWrite 0;
writeFormat ascii;
writeFormat binary;
writePrecision 6;

View File

@ -27,11 +27,12 @@ gradSchemes
divSchemes
{
default none;
div(phi,U) Gauss linear;
default none;
div(phi,U) Gauss LUST grad(U);
div(phi,K) Gauss linear;
div(phi,k) Gauss limitedLinear 1;
div(phi,Yi_h) Gauss multivariateSelection
div(phi,Yi_h) Gauss multivariateSelection
{
O2 limitedLinear01 1;
CH4 limitedLinear01 1;