Merge branch 'master' into feature/cvMesh

Conflicts:
	src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
This commit is contained in:
laurence
2013-04-16 16:00:59 +01:00
154 changed files with 8010 additions and 4507 deletions

View File

@ -28,19 +28,19 @@ boundaryField
}
ground
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
blockedFaces
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value nonuniform 0();
}
baffleWall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value nonuniform 0();
}

View File

@ -23,19 +23,19 @@ boundaryField
{
piston
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
liner
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
cylinderHead
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -23,7 +23,7 @@ boundaryField
{
ground
{
type alphatWallFunction;
type compressible::alphatWallFunction;
mut muSgs;
value uniform 0;
}
@ -45,7 +45,7 @@ boundaryField
"(region0_to.*)"
{
type alphatWallFunction;
type compressible::alphatWallFunction;
mut muSgs;
value uniform 0;
}

View File

@ -9,18 +9,18 @@ application=`getApplication`
runApplication blockMesh
runApplication topoSet -dict cRefine.topoSetDict
runApplication topoSet -dict system/cRefine.topoSetDict
runApplication refineMesh -overwrite -dict system/refineMeshDict
rm log.topoSet
runApplication topoSet -dict f.topoSetDict
runApplication topoSet -dict system/f.topoSetDict
# create the pyrolysis region.
runApplication extrudeToRegionMesh -overwrite
rm log.topoSet
runApplication topoSet -dict fBurner.topoSetDict
runApplication topoSet -dict system/fBurner.topoSetDict
runApplication createPatch -overwrite

View File

@ -23,22 +23,22 @@ boundaryField
{
front
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
back
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
wall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
porosityWall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
inlet

View File

@ -23,22 +23,22 @@ boundaryField
{
front
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
back
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
wall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
porosityWall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
inlet

View File

@ -23,13 +23,13 @@ boundaryField
{
movingWall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -23,13 +23,13 @@ boundaryField
{
rotor
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
stator
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -23,22 +23,22 @@ boundaryField
{
front
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
back
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
wall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
porosityWall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
inlet

View File

@ -23,22 +23,22 @@ boundaryField
{
front
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
back
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
wall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
porosityWall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
inlet

View File

@ -23,22 +23,22 @@ boundaryField
{
front
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
back
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
wall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
porosityWall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
inlet

View File

@ -23,7 +23,7 @@ boundaryField
{
Default_Boundary_Region
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -37,7 +37,7 @@ boundaryField
}
WALL10
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -43,7 +43,7 @@ boundaryField
}
prismWall
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
defaultFaces

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -1 0 0 0 0];
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
@ -23,17 +23,20 @@ boundaryField
{
floor
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
}

View File

@ -1,45 +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 volScalarField;
location "0";
object kappat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
floor
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
}
// ************************************************************************* //

View File

@ -42,7 +42,7 @@ laplacianSchemes
default none;
laplacian(nuEff,U) Gauss linear uncorrected;
laplacian(Dp,p_rgh) Gauss linear uncorrected;
laplacian(kappaEff,T) Gauss linear uncorrected;
laplacian(alphaEff,T) Gauss linear uncorrected;
laplacian(DkEff,k) Gauss linear uncorrected;
laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
laplacian(DREff,R) Gauss linear uncorrected;

View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -1 0 0 0 0];
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
@ -23,17 +23,20 @@ boundaryField
{
floor
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
}

View File

@ -1,45 +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 volScalarField;
location "0";
object kappat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
floor
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type kappatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}
}
// ************************************************************************* //

View File

@ -40,7 +40,7 @@ laplacianSchemes
default none;
laplacian(nuEff,U) Gauss linear corrected;
laplacian(Dp,p_rgh) Gauss linear corrected;
laplacian(kappaEff,T) Gauss linear corrected;
laplacian(alphaEff,T) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DREff,R) Gauss linear corrected;

View File

@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
object kappat;
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -26,7 +26,7 @@ boundaryField
wall
{
type kappatJayatillekeWallFunction;
type alphatJayatillekeWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -42,7 +42,7 @@ laplacianSchemes
default none;
laplacian(nuEff,U) Gauss linear limited corrected 0.333;
laplacian(Dp,p_rgh) Gauss linear limited corrected 0.333;
laplacian(kappaEff,T) Gauss linear limited corrected 0.333;
laplacian(alphaEff,T) Gauss linear limited corrected 0.333;
laplacian(DkEff,k) Gauss linear limited corrected 0.333;
laplacian(DepsilonEff,epsilon) Gauss linear limited corrected 0.333;
laplacian(DREff,R) Gauss linear limited corrected 0.333;

View File

@ -23,17 +23,17 @@ boundaryField
{
floor
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
}

View File

@ -23,25 +23,25 @@ boundaryField
{
frontAndBack
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
topAndBottom
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
hot
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
cold
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -23,12 +23,12 @@ boundaryField
{
floor
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
inlet

View File

@ -22,7 +22,7 @@ dictionaryReplacement
{
"baffle.*"
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
}

View File

@ -22,7 +22,7 @@ dictionaryReplacement
{
"baffle1.*"
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
}

View File

@ -22,7 +22,7 @@ dictionaryReplacement
{
"region0_to_.*"
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
}

View File

@ -80,7 +80,7 @@ baffles
alphat
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
epsilon

View File

@ -23,22 +23,22 @@ boundaryField
{
box
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
floor
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
}

View File

@ -23,25 +23,25 @@ boundaryField
{
box
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
floor
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -23,19 +23,19 @@ boundaryField
{
floor
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
ceiling
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}
fixedWalls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -20,6 +20,7 @@ FoamFile
frontAndBack
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 320;
startFace 3456;
}
@ -44,6 +45,7 @@ FoamFile
upperWall
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 160;
startFace 4064;
}

View File

@ -19,13 +19,13 @@ libs ("libOpenFOAM.so" "libfieldFunctionObjects.so");
application simpleFoam;
startFrom latestTime;
startFrom startTime;
startTime 0;
stopAt endTime;
endTime 500;
endTime 5;
deltaT 1;

View File

@ -23,7 +23,7 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) cellLimited Gauss linear 1;
grad(U) fourth; //cellLimited Gauss linear 1;
grad(nuTilda) cellLimited Gauss linear 1;
}

View File

@ -46,7 +46,7 @@ boundaryField
}
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -46,7 +46,7 @@ boundaryField
}
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -23,17 +23,17 @@ boundaryField
{
top
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
bottom
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
symmetry

View File

@ -23,7 +23,7 @@ boundaryField
{
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -23,7 +23,7 @@ boundaryField
{
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
inlet

View File

@ -23,7 +23,7 @@ boundaryField
{
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
inlet

View File

@ -46,7 +46,7 @@ boundaryField
}
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -46,7 +46,7 @@ boundaryField
}
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -46,7 +46,7 @@ boundaryField
}
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
Prt 0.85;
value uniform 0;
}

View File

@ -23,7 +23,7 @@ boundaryField
{
walls
{
type alphatWallFunction;
type compressible::alphatWallFunction;
value uniform 0;
}
}