Merge commit 'OpenCFD/master' into olesenm

Conflicts:

	src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
	src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
This commit is contained in:
Mark Olesen
2009-01-07 09:39:17 +01:00
171 changed files with 2187 additions and 1309 deletions

View File

@ -10,50 +10,13 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
object fvSchemes;
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
default Euler;
}
//simulationType laminar;
simulationType RASModel;
//simulationType LESModel;
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(gamma) Gauss linear;
}
divSchemes
{
div(rho*phi,U) Gauss upwind; //limitedLinearV 1;
div(phi,gamma) Gauss vanLeer;
div(phirb,gamma) Gauss interfaceCompression;
}
laplacianSchemes
{
default Gauss linear corrected;
}
interpolationSchemes
{
default linear;
}
snGradSchemes
{
default corrected;
}
fluxRequired
{
default no;
pd;
pcorr;
gamma;
}
// ************************************************************************* //

View File

@ -61,7 +61,7 @@ dictionaryReplacement
}
bottomAir_to_leftSolid
{
type solidWallTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName leftSolid;
neighbourPatchName leftSolid_to_bottomAir;
neighbourFieldName T;
@ -71,7 +71,7 @@ dictionaryReplacement
}
bottomAir_to_heater
{
type solidWallTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName heater;
neighbourPatchName heater_to_bottomAir;
neighbourFieldName T;
@ -80,7 +80,7 @@ dictionaryReplacement
}
bottomAir_to_rightSolid
{
type solidWallTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName rightSolid;
neighbourPatchName rightSolid_to_bottomAir;
neighbourFieldName T;
@ -254,49 +254,49 @@ dictionaryReplacement
p
{
internalField uniform 1000000;
internalField uniform 100000;
boundaryField
{
minX
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
maxX
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
minY
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
minZ
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
maxZ
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
bottomAir_to_leftSolid
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
bottomAir_to_heater
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
bottomAir_to_rightSolid
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
}
}

View File

@ -1,192 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object changeDictionaryDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
{
T
{
internalField uniform 300;
boundaryField
{
minY
{
type fixedValue;
value uniform 500;
}
minZ
{
type zeroGradient;
}
maxZ
{
type zeroGradient;
}
heater_to_domain0
{
type solidWallHeatFluxTemperatureCoupled;
neighbourRegionName domain0;
neighbourPatchName domain0_to_heater;
neighbourFieldName T;
K K;
value uniform 300;
}
heater_to_solid1
{
type solidWallHeatFluxTemperatureCoupled;
neighbourRegionName solid1;
neighbourPatchName solid1_to_heater;
neighbourFieldName T;
K K;
value uniform 300;
}
heater_to_solid3
{
type solidWallHeatFluxTemperatureCoupled;
neighbourRegionName solid3;
neighbourPatchName solid3_to_heater;
neighbourFieldName T;
K K;
value uniform 300;
}
heater_to_domain3
{
type solidWallHeatFluxTemperatureCoupled;
neighbourRegionName domain3;
neighbourPatchName domain3_to_heater;
neighbourFieldName T;
K K;
value uniform 300;
}
}
}
rho
{
internalField uniform 8000;
boundaryField
{
minY
{
type zeroGradient;
}
minZ
{
type zeroGradient;
}
maxZ
{
type zeroGradient;
}
heater_to_domain0
{
type zeroGradient;
}
heater_to_solid1
{
type zeroGradient;
}
heater_to_solid3
{
type zeroGradient;
}
heater_to_domain3
{
type zeroGradient;
}
}
}
K
{
internalField uniform 80;
boundaryField
{
minY
{
type zeroGradient;
}
minZ
{
type zeroGradient;
}
maxZ
{
type zeroGradient;
}
heater_to_domain0
{
type zeroGradient;
}
heater_to_solid1
{
type zeroGradient;
}
heater_to_solid3
{
type zeroGradient;
}
heater_to_domain3
{
type zeroGradient;
}
}
}
cp
{
internalField uniform 450;
boundaryField
{
minY
{
type zeroGradient;
}
minZ
{
type zeroGradient;
}
maxZ
{
type zeroGradient;
}
heater_to_domain0
{
type zeroGradient;
}
heater_to_solid1
{
type zeroGradient;
}
heater_to_solid3
{
type zeroGradient;
}
heater_to_domain3
{
type zeroGradient;
}
}
}
}
// ************************************************************************* //

View File

@ -1,123 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
pcorr PCG
{
preconditioner GAMG
{
tolerance 1e-3;
relTol 0;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
nBottomSweeps 2;
cacheAgglomeration false;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
};
tolerance 1e-4;
relTol 0;
maxIter 100;
};
pd GAMG
{
tolerance 1e-8;
relTol 0.05;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
cacheAgglomeration false;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
};
pdFinal PCG
{
preconditioner GAMG
{
tolerance 1e-8;
relTol 0;
nVcycles 2;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
cacheAgglomeration false;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
};
tolerance 1e-8;
relTol 0;
maxIter 20;
};
U smoothSolver
{
smoother GaussSeidel;
tolerance 1e-6;
relTol 0;
nSweeps 1;
};
k PBiCG
{
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
B PBiCG
{
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
nuTilda PBiCG
{
preconditioner DILU;
tolerance 1e-08;
relTol 0;
};
}
PISO
{
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nGammaCorr 1;
nGammaSubCycles 3;
cGamma 1;
pdRefCell 0;
pdRefValue 0;
}
// ************************************************************************* //

View File

@ -39,7 +39,7 @@ dictionaryReplacement
heater_to_bottomAir
{
type solidWallHeatFluxTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName bottomAir;
neighbourPatchName bottomAir_to_heater;
neighbourFieldName T;
@ -49,7 +49,7 @@ dictionaryReplacement
}
heater_to_leftSolid
{
type solidWallHeatFluxTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName leftSolid;
neighbourPatchName leftSolid_to_heater;
neighbourFieldName T;
@ -58,7 +58,7 @@ dictionaryReplacement
}
heater_to_rightSolid
{
type solidWallHeatFluxTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName rightSolid;
neighbourPatchName rightSolid_to_heater;
neighbourFieldName T;
@ -67,7 +67,7 @@ dictionaryReplacement
}
heater_to_topAir
{
type solidWallHeatFluxTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName topAir;
neighbourPatchName topAir_to_heater;
neighbourFieldName T;

View File

@ -36,7 +36,7 @@ dictionaryReplacement
}
leftSolid_to_bottomAir
{
type solidWallHeatFluxTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName bottomAir;
neighbourPatchName bottomAir_to_leftSolid;
neighbourFieldName T;
@ -46,7 +46,7 @@ dictionaryReplacement
}
leftSolid_to_heater
{
type solidWallTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName heater;
neighbourPatchName heater_to_leftSolid;
neighbourFieldName T;
@ -55,7 +55,7 @@ dictionaryReplacement
}
leftSolid_to_topAir
{
type solidWallHeatFluxTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName topAir;
neighbourPatchName topAir_to_leftSolid;
neighbourFieldName T;

View File

@ -36,7 +36,7 @@ dictionaryReplacement
}
rightSolid_to_heater
{
type solidWallTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName heater;
neighbourPatchName heater_to_rightSolid;
neighbourFieldName T;
@ -45,7 +45,7 @@ dictionaryReplacement
}
rightSolid_to_bottomAir
{
type solidWallHeatFluxTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName bottomAir;
neighbourPatchName bottomAir_to_rightSolid;
neighbourFieldName T;
@ -54,7 +54,7 @@ dictionaryReplacement
}
rightSolid_to_topAir
{
type solidWallHeatFluxTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName topAir;
neighbourPatchName topAir_to_rightSolid;
neighbourFieldName T;

View File

@ -62,7 +62,7 @@ dictionaryReplacement
}
topAir_to_leftSolid
{
type solidWallTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName leftSolid;
neighbourPatchName leftSolid_to_topAir;
neighbourFieldName T;
@ -72,7 +72,7 @@ dictionaryReplacement
}
topAir_to_heater
{
type solidWallTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName heater;
neighbourPatchName heater_to_topAir;
neighbourFieldName T;
@ -81,7 +81,7 @@ dictionaryReplacement
}
topAir_to_rightSolid
{
type solidWallTemperatureCoupled;
type solidWallMixedTemperatureCoupled;
neighbourRegionName rightSolid;
neighbourPatchName rightSolid_to_topAir;
neighbourFieldName T;
@ -263,50 +263,50 @@ dictionaryReplacement
p
{
internalField uniform 1000000;
internalField uniform 100000;
boundaryField
{
minX
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
maxX
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
maxY
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
minZ
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
maxZ
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
topAir_to_leftSolid
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
topAir_to_heater
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
topAir_to_rightSolid
{
type calculated;
value uniform 1000000;
value uniform 100000;
}
}
}

View File

@ -16,7 +16,9 @@ FoamFile
LESModel laminar;
delta smooth;
turbulence off;
delta cubeRootVol;
laminarCoeffs
{

View File

@ -1,15 +1,16 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
| \\ / O peration | Version: dev-09ca1eb6b56f |
| \\ / A nd | |
| \\/ M anipulation | www.OpenFOAM.org |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -0,0 +1,22 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
//simulationType laminar;
//simulationType RASModel;
simulationType LESModel;
// ************************************************************************* //

View File

@ -120,7 +120,7 @@ PISO
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;
cGamma 1;
cAlpha 1;
}
// ************************************************************************* //

View File

@ -16,7 +16,9 @@ FoamFile
LESModel laminar;
delta smooth;
turbulence off;
delta cubeRootVol;
laminarCoeffs
{

View File

@ -1,15 +1,16 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
| \\ / O peration | Version: dev-09ca1eb6b56f |
| \\ / A nd | |
| \\/ M anipulation | www.OpenFOAM.org |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -0,0 +1,22 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
//simulationType laminar;
//simulationType RASModel;
simulationType LESModel;
// ************************************************************************* //

View File

@ -120,7 +120,7 @@ PISO
nNonOrthogonalCorrectors 0;
nAlphaCorr 1;
nAlphaSubCycles 1;
cGamma 1;
cAlpha 1;
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
cp 0/gamma.org 0/gamma
runApplication setFields

View File

@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
cp 0/gamma.org 0/gamma
runApplication setFields

View File

@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
cp 0/gamma.org 0/gamma
runApplication setFields

View File

@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
cp 0/gamma.org 0/gamma
runApplication setFields

View File

@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
cp 0/gamma.org 0/gamma
runApplication setFields

View File

@ -3,8 +3,9 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory
application="mdEquilibrationFoam"
application="mhdFoam"
(cd hartmann && runApplication blockMesh)
(cd hartmann && runApplication $application)
(cd hartmann && runApplication foamCalc components U)
(cd hartmann && runApplication sample)

View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev-8cbffd16687e |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -18,9 +18,9 @@ interpolationScheme cellPoint;
setFormat raw;
sets
sets
(
line_centreProfile
line_centreProfile
{
type uniform;
@ -34,9 +34,9 @@ sets
surfaces
();
fields
fields
(
U.component(0)
Ux
);
// ************************************************************************* //

View File

@ -0,0 +1,10 @@
#!/bin/sh
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory
application="rhoSonicFoam"
runApplication blockMesh
runApplication setFields
runApplication $application

View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev-8cbffd16687e |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,39 +10,37 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
inlet
{
type patch;
nFaces 30;
startFace 11770;
}
outlet
{
type patch;
nFaces 30;
startFace 11800;
}
walls
{
type wall;
nFaces 400;
startFace 11830;
}
frontAndBackPlanes
{
type empty;
nFaces 12000;
startFace 12230;
}
inlet
{
type patch;
nFaces 30;
startFace 11770;
}
outlet
{
type patch;
nFaces 30;
startFace 11800;
}
walls
{
type wall;
nFaces 400;
startFace 11830;
}
frontAndBackPlanes
{
type empty;
nFaces 12000;
startFace 12230;
}
)
// ************************************************************************* //

View File

@ -60,6 +60,8 @@ functions
// Where to load it from (if not already in solver)
functionObjectLibs ("libfieldAverage.so");
outputControl outputTime;
// Fields to be averaged - runTime modifiable
fields
(