diff --git a/tutorials/basic/laplacianFoam/flange/0/T b/tutorials/basic/laplacianFoam/flange/0/T index e3c50a023..fda50237c 100644 --- a/tutorials/basic/laplacianFoam/flange/0/T +++ b/tutorials/basic/laplacianFoam/flange/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun index 6e3250d8c..d6a968af4 100755 --- a/tutorials/basic/laplacianFoam/flange/Allrun +++ b/tutorials/basic/laplacianFoam/flange/Allrun @@ -2,12 +2,13 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application directory -application="laplacianFoam" +# Get application name +application=`getApplication` -runIdeasToFoam () +runAnsysToFoam() { - if [ -f log.ideasToFoam ] ; then + if [ -f log.ansysToFoam ] + then echo "ansysToFoam already run on $PWD: remove log file to run" else echo "ansysToFoam: converting mesh $1" @@ -15,7 +16,7 @@ runIdeasToFoam () fi } -runIdeasToFoam flange.ans 0.001 +runAnsysToFoam flange.ans 0.001 runApplication $application runApplication foamToFieldview9 runApplication foamToEnsight diff --git a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary index c2b732e0e..8d742e28e 100644 --- a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary +++ b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org index 5b765b4ac..77d8d3c4b 100644 --- a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org +++ b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/laplacianFoam/flange/constant/transportProperties b/tutorials/basic/laplacianFoam/flange/constant/transportProperties index e202aa0bc..20112d4be 100644 --- a/tutorials/basic/laplacianFoam/flange/constant/transportProperties +++ b/tutorials/basic/laplacianFoam/flange/constant/transportProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -DT DT [0 2 -1 0 0 0 0] 4e-05; +DT DT [ 0 2 -1 0 0 0 0 ] 4e-05; + // ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict index 24386fe5f..cca070181 100644 --- a/tutorials/basic/laplacianFoam/flange/system/controlDict +++ b/tutorials/basic/laplacianFoam/flange/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application laplacianFoam; +application laplacianFoam; startFrom latestTime; @@ -44,4 +45,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSchemes b/tutorials/basic/laplacianFoam/flange/system/fvSchemes index ecfee2c2c..d6c1f5134 100644 --- a/tutorials/basic/laplacianFoam/flange/system/fvSchemes +++ b/tutorials/basic/laplacianFoam/flange/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -33,7 +34,7 @@ divSchemes laplacianSchemes { default none; - laplacian(DT,T) Gauss linear corrected; + laplacian(DT,T) Gauss linear corrected; } interpolationSchemes @@ -49,7 +50,8 @@ snGradSchemes fluxRequired { default no; - T; + T ; } + // ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSolution b/tutorials/basic/laplacianFoam/flange/system/fvSolution index 367eb1e0e..a4bc2d34a 100644 --- a/tutorials/basic/laplacianFoam/flange/system/fvSolution +++ b/tutorials/basic/laplacianFoam/flange/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - T PCG + T { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } } SIMPLE @@ -29,4 +31,5 @@ SIMPLE nNonOrthogonalCorrectors 2; } + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/cylinder/0.org/U b/tutorials/basic/potentialFoam/cylinder/0.org/U index 58e7a4dfb..c2b2150d9 100644 --- a/tutorials/basic/potentialFoam/cylinder/0.org/U +++ b/tutorials/basic/potentialFoam/cylinder/0.org/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/cylinder/0.org/p b/tutorials/basic/potentialFoam/cylinder/0.org/p index 70ac09d65..3d61ee194 100644 --- a/tutorials/basic/potentialFoam/cylinder/0.org/p +++ b/tutorials/basic/potentialFoam/cylinder/0.org/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/cylinder/0/U b/tutorials/basic/potentialFoam/cylinder/0/U index 58e7a4dfb..c2b2150d9 100644 --- a/tutorials/basic/potentialFoam/cylinder/0/U +++ b/tutorials/basic/potentialFoam/cylinder/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/cylinder/0/p b/tutorials/basic/potentialFoam/cylinder/0/p index 70ac09d65..3d61ee194 100644 --- a/tutorials/basic/potentialFoam/cylinder/0/p +++ b/tutorials/basic/potentialFoam/cylinder/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun index b4a0869ee..36e2229aa 100755 --- a/tutorials/basic/potentialFoam/cylinder/Allrun +++ b/tutorials/basic/potentialFoam/cylinder/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="potentialFoam" +application=`getApplication` runApplication blockMesh runApplication $application diff --git a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C index 070364e51..800e29762 100644 --- a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C +++ b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) Info<< "end" << endl; - return(0); + return 0; } // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict index bd449662f..98f2805ef 100644 --- a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict +++ b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary index b336b81de..dce655917 100644 --- a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary +++ b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict index 266d1cb20..0caf916ec 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/controlDict +++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application potentialFoam; +application potentialFoam; startFrom startTime; @@ -44,4 +45,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes index ab3c77e43..0ae37118b 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes +++ b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default steadyState; + default steadyState; } gradSchemes @@ -48,7 +49,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSolution b/tutorials/basic/potentialFoam/cylinder/system/fvSolution index 6dc71af95..b02a11dca 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/fvSolution +++ b/tutorials/basic/potentialFoam/cylinder/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } } SIMPLE @@ -29,4 +31,5 @@ SIMPLE nNonOrthogonalCorrectors 3; } + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.org/U b/tutorials/basic/potentialFoam/pitzDaily/0.org/U index 4168d8530..ec085adb4 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/0.org/U +++ b/tutorials/basic/potentialFoam/pitzDaily/0.org/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.org/p b/tutorials/basic/potentialFoam/pitzDaily/0.org/p index 02e0276ed..db9c0a3a7 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/0.org/p +++ b/tutorials/basic/potentialFoam/pitzDaily/0.org/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/pitzDaily/0/U b/tutorials/basic/potentialFoam/pitzDaily/0/U index 4168d8530..ec085adb4 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/0/U +++ b/tutorials/basic/potentialFoam/pitzDaily/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/pitzDaily/0/p b/tutorials/basic/potentialFoam/pitzDaily/0/p index 02e0276ed..db9c0a3a7 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/0/p +++ b/tutorials/basic/potentialFoam/pitzDaily/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun index 601903288..cadfe86d2 100755 --- a/tutorials/basic/potentialFoam/pitzDaily/Allrun +++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="potentialFoam" +application=`getApplication` runApplication blockMesh runApplication $application diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict index 103098358..89852b13a 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict +++ b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary index 8eb7d9893..eb4a4e461 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary +++ b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,43 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 5 ( -inlet -{ - type patch; - nFaces 30; - startFace 24170; -} - -outlet -{ - type patch; - nFaces 57; - startFace 24200; -} - -upperWall -{ - type wall; - nFaces 223; - startFace 24257; -} - -lowerWall -{ - type wall; - nFaces 250; - startFace 24480; -} - -frontAndBack -{ - type empty; - nFaces 24450; - startFace 24730; -} + inlet + { + type patch; + nFaces 30; + startFace 24170; + } + outlet + { + type patch; + nFaces 57; + startFace 24200; + } + upperWall + { + type wall; + nFaces 223; + startFace 24257; + } + lowerWall + { + type wall; + nFaces 250; + startFace 24480; + } + frontAndBack + { + type empty; + nFaces 24450; + startFace 24730; + } ) // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict index 266d1cb20..0caf916ec 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict +++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application potentialFoam; +application potentialFoam; startFrom startTime; @@ -44,4 +45,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes index ab3c77e43..0ae37118b 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes +++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default steadyState; + default steadyState; } gradSchemes @@ -48,7 +49,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution index 4d5a8fcf1..4d21f0ce8 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution +++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } } SIMPLE @@ -29,4 +31,5 @@ SIMPLE nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T index 3781d2a4d..ed4cbba8d 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U index ea6a804ec..c8dd4f1a7 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict index 103098358..89852b13a 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary index 8eb7d9893..eb4a4e461 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,43 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 5 ( -inlet -{ - type patch; - nFaces 30; - startFace 24170; -} - -outlet -{ - type patch; - nFaces 57; - startFace 24200; -} - -upperWall -{ - type wall; - nFaces 223; - startFace 24257; -} - -lowerWall -{ - type wall; - nFaces 250; - startFace 24480; -} - -frontAndBack -{ - type empty; - nFaces 24450; - startFace 24730; -} + inlet + { + type patch; + nFaces 30; + startFace 24170; + } + outlet + { + type patch; + nFaces 57; + startFace 24200; + } + upperWall + { + type wall; + nFaces 223; + startFace 24257; + } + lowerWall + { + type wall; + nFaces 250; + startFace 24480; + } + frontAndBack + { + type empty; + nFaces 24450; + startFace 24730; + } ) // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties index 062179636..ecda0c87f 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -DT DT [0 2 -1 0 0 0 0] 0.01; +DT DT [ 0 2 -1 0 0 0 0 ] 0.01; + // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict index 216d98465..b406e85ce 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application scalarTransportFoam; +application scalarTransportFoam; startFrom startTime; @@ -44,4 +45,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes index 6c290f72d..2082387a2 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -49,7 +50,8 @@ snGradSchemes fluxRequired { default no; - T; + T ; } + // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution index 77cd8dbab..0b73d8ceb 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - T PBiCG + T { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } } SIMPLE @@ -29,4 +31,5 @@ SIMPLE nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su new file mode 100644 index 000000000..650d0b954 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Su; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform 0.135; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 0.135; + } + + outlet + { + type inletOutlet; + inletValue uniform 0.135; + value uniform 0.135; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/T b/tutorials/combustion/XiFoam/les/pitzDaily/0/T new file mode 100644 index 000000000..0d7442b7b --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/T @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 293; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 293; + } + + outlet + { + type inletOutlet; + inletValue uniform 293; + value uniform 293; + } + + upperWall + { + type fixedValue; + value uniform 293; + } + + lowerWall + { + type fixedValue; + value uniform 570; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu new file mode 100644 index 000000000..2ecafa1cd --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Tu; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 293; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 293; + } + + outlet + { + type inletOutlet; + inletValue uniform 293; + value uniform 293; + } + + upperWall + { + type fixedValue; + value uniform 293; + } + + lowerWall + { + type fixedValue; + value uniform 570; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/U b/tutorials/combustion/XiFoam/les/pitzDaily/0/U new file mode 100644 index 000000000..c625528d1 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/U @@ -0,0 +1,55 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + inlet + { + type turbulentInlet; + referenceField uniform (13.3 0 0); + fluctuationScale (0.04 0.02 0.02); + } + + outlet + { + type inletOutlet; + inletValue uniform (0 0 0); + value uniform (0 0 0); + } + + upperWall + { + type fixedValue; + value uniform (0 0 0); + } + + lowerWall + { + type fixedValue; + value uniform (0 0 0); + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi new file mode 100644 index 000000000..3ab3f03da --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Xi; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 1; + } + + outlet + { + type inletOutlet; + inletValue uniform 1; + value uniform 1; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs new file mode 100644 index 000000000..145d82f01 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object alphaSgs; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type zeroGradient; + } + + upperWall + { + type alphaSgsJayatillekeWallFunction; + value uniform 0; + } + + lowerWall + { + type alphaSgsJayatillekeWallFunction; + value uniform 0; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/b b/tutorials/combustion/XiFoam/les/pitzDaily/0/b new file mode 100644 index 000000000..231a96a26 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/b @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object b; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 1; + } + + outlet + { + type inletOutlet; + inletValue uniform 1; + value uniform 1; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/k b/tutorials/combustion/XiFoam/les/pitzDaily/0/k new file mode 100644 index 000000000..8c3df7e4b --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/k @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 2e-05; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 2e-05; + } + + outlet + { + type inletOutlet; + inletValue uniform 2e-05; + value uniform 2e-05; + } + + upperWall + { + type zeroGradient; + value uniform 2e-05; + } + + lowerWall + { + type zeroGradient; + value uniform 2e-05; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs new file mode 100644 index 000000000..f19d39329 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object muSgs; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type zeroGradient; + } + + upperWall + { + type muSgsWallFunction; + value uniform 0; + } + + lowerWall + { + type muSgsWallFunction; + value uniform 0; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/p b/tutorials/combustion/XiFoam/les/pitzDaily/0/p new file mode 100644 index 000000000..4893a741d --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/p @@ -0,0 +1,57 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 1e5; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type waveTransmissive; + field p; + phi phi; + rho rho; + psi psi; + gamma 1.3; + fieldInf 1e5; + lInf 0.3; + value uniform 1e5; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties new file mode 100644 index 000000000..2ca8ce382 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties @@ -0,0 +1,88 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object LESProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +LESModel oneEqEddy; + +delta cubeRootVol; + +turbulence on; + +printCoeffs on; + +cubeRootVolCoeffs +{ + deltaCoeff 1; +} + +PrandtlCoeffs +{ + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + smoothCoeffs + { + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + maxDeltaRatio 1.1; + } + + Cdelta 0.158; +} + +vanDriestCoeffs +{ + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + smoothCoeffs + { + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + maxDeltaRatio 1.1; + } + + Aplus 26; + Cdelta 0.158; +} + +smoothCoeffs +{ + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + maxDeltaRatio 1.1; +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties new file mode 100644 index 000000000..c08521806 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties @@ -0,0 +1,93 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object combustionProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +laminarFlameSpeedCorrelation constant; + +fuel Propane; + +Su Su [0 1 -1 0 0 0 0] 0.135; + +SuModel transport; + +equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6; + +sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338; + +XiModel transport; + +XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; + +XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; + +uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; + +GuldersCoeffs +{ + Methane + { + W 0.422; + eta 0.15; + xi 5.18; + alpha 2; + beta -0.5; + f 2.3; + } + + Propane + { + W 0.446; + eta 0.12; + xi 4.95; + alpha 1.77; + beta -0.2; + f 2.3; + } + + IsoOctane + { + W 0.4658; + eta -0.326; + xi 4.48; + alpha 1.56; + beta -0.22; + f 2.3; + } +} + +ignite yes; + +ignitionSites +( + { + location (0.005 -0.02 0); + diameter 0.003; + start 0; + duration 0.05; + strength 20; + } +); + +ignitionSphereFraction 0; + +ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0.001; + +ignitionCircleFraction 1; + +ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g new file mode 100644 index 000000000..04a581397 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 0 0); + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict new file mode 100644 index 000000000..5935b5b9b --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict @@ -0,0 +1,153 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 0.001; + +vertices +( + (-20.6 0 0) + (-20.6 3 0) + (-20.6 12.7 0) + (-20.6 25.4 0) + (0 -25.4 0) + (0 -5 0) + (0 0 0) + (0 3 0) + (0 12.7 0) + (0 25.4 0) + (206 -25.4 0) + (206 -8.5 0) + (206 0 0) + (206 6.5 0) + (206 17 0) + (206 25.4 0) + (290 -16.6 0) + (290 -6.3 0) + (290 0 0) + (290 4.5 0) + (290 11 0) + (290 16.6 0) + (-20.6 0 38.1) + (-20.6 3 38.1) + (-20.6 12.7 38.1) + (-20.6 25.4 38.1) + (0 -25.4 38.1) + (0 -5 38.1) + (0 0 38.1) + (0 3 38.1) + (0 12.7 38.1) + (0 25.4 38.1) + (206 -25.4 38.1) + (206 -8.5 38.1) + (206 0 38.1) + (206 6.5 38.1) + (206 17 38.1) + (206 25.4 38.1) + (290 -16.6 38.1) + (290 -6.3 38.1) + (290 0 38.1) + (290 4.5 38.1) + (290 11 38.1) + (290 16.6 38.1) +); + +blocks +( + hex (0 6 7 1 22 28 29 23) (18 7 1) simpleGrading (0.5 1.8 1) + hex (1 7 8 2 23 29 30 24) (18 10 1) simpleGrading (0.5 4 1) + hex (2 8 9 3 24 30 31 25) (18 13 1) simpleGrading (0.5 0.25 1) + hex (4 10 11 5 26 32 33 27) (180 18 1) simpleGrading (4 1 1) + hex (5 11 12 6 27 33 34 28) (180 9 1) edgeGrading (4 4 4 4 0.5 1 1 0.5 1 1 1 1) + hex (6 12 13 7 28 34 35 29) (180 7 1) edgeGrading (4 4 4 4 1.8 1 1 1.8 1 1 1 1) + hex (7 13 14 8 29 35 36 30) (180 10 1) edgeGrading (4 4 4 4 4 1 1 4 1 1 1 1) + hex (8 14 15 9 30 36 37 31) (180 13 1) simpleGrading (4 0.25 1) + hex (10 16 17 11 32 38 39 33) (25 18 1) simpleGrading (2.5 1 1) + hex (11 17 18 12 33 39 40 34) (25 9 1) simpleGrading (2.5 1 1) + hex (12 18 19 13 34 40 41 35) (25 7 1) simpleGrading (2.5 1 1) + hex (13 19 20 14 35 41 42 36) (25 10 1) simpleGrading (2.5 1 1) + hex (14 20 21 15 36 42 43 37) (25 13 1) simpleGrading (2.5 0.25 1) +); + +edges +( +); + +patches +( + patch inlet + ( + (0 22 23 1) + (1 23 24 2) + (2 24 25 3) + ) + patch outlet + ( + (16 17 39 38) + (17 18 40 39) + (18 19 41 40) + (19 20 42 41) + (20 21 43 42) + ) + wall upperWall + ( + (3 25 31 9) + (9 31 37 15) + (15 37 43 21) + ) + wall lowerWall + ( + (0 6 28 22) + (6 5 27 28) + (5 4 26 27) + (4 10 32 26) + (10 16 38 32) + ) + empty frontAndBack + ( + (22 28 29 23) + (23 29 30 24) + (24 30 31 25) + (26 32 33 27) + (27 33 34 28) + (28 34 35 29) + (29 35 36 30) + (30 36 37 31) + (32 38 39 33) + (33 39 40 34) + (34 40 41 35) + (35 41 42 36) + (36 42 43 37) + (0 1 7 6) + (1 2 8 7) + (2 3 9 8) + (4 5 11 10) + (5 6 12 11) + (6 7 13 12) + (7 8 14 13) + (8 9 15 14) + (10 11 17 16) + (11 12 18 17) + (12 13 19 18) + (13 14 20 19) + (14 15 21 20) + ) +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary new file mode 100644 index 000000000..9bc9b451f --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6.x | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +5 +( + inlet + { + type patch; + nFaces 30; + startFace 24170; + } + outlet + { + type patch; + nFaces 57; + startFace 24200; + } + upperWall + { + type wall; + nFaces 223; + startFace 24257; + } + lowerWall + { + type wall; + nFaces 250; + startFace 24480; + } + frontAndBack + { + type empty; + nFaces 24450; + startFace 24730; + } +) + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties new file mode 100644 index 000000000..ea9bb3b20 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType + hhuMixtureThermo>>>>; + +stoichiometricAirFuelMassRatio + stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675; + +// phi = 0.57 +// ft = 0.0352993 +// Tad = 1650.1 + +fuel fuel 1 44.0962 + 100 5000 1000 + 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 + 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 + 1.67212e-06 170.672; + +oxidant oxidant 1 28.8504 + 100 6000 1000 + 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 + 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 + 1.67212e-06 170.672; + +reactants reactants 1 29.2068 + 100 5000 1000 + 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 + 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 + 1.67212e-06 170.672; + +burntProducts burntProducts 1 28.3233 + 100 6000 1000 + 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 + 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 + 1.67212e-06 170.672; + +products products 1 28.5396 + 100 5000 1000 + 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 + 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 + 1.67212e-06 170.672; + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties new file mode 100644 index 000000000..f2fbf353e --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType LESModel; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict new file mode 100644 index 000000000..79e443d10 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict @@ -0,0 +1,80 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application XiFoam; + +startFrom latestTime; + +startTime 0; + +stopAt endTime; + +endTime 0.5; + +deltaT 5e-06; + +writeControl adjustableRunTime; + +writeInterval 0.01; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +adjustTimeStep yes; + +maxCo 0.5; + +functions +{ + fieldAverage1 + { + type fieldAverage; + functionObjectLibs ( "libfieldFunctionObjects.so" ); + enabled true; + outputControl outputTime; + fields + ( + U + { + mean on; + prime2Mean on; + base time; + } + + p + { + mean on; + prime2Mean on; + base time; + } + ); + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes new file mode 100644 index 000000000..c20ec8687 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes @@ -0,0 +1,80 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default backward; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; + div(phi,U) Gauss linear; + div(phiU,p) Gauss linear; + div(phi,k) Gauss limitedLinear 0.1; + div(phiXi,Xi) Gauss limitedLinear01 0.1; + div(phiXi,Su) Gauss limitedLinear01 0.1; + div(phiSt,b) Gauss limitedLinear01 0.1; + div(phi,ft_b_h_hu) Gauss multivariateSelection + { + ft limitedLinear01 0.1; + b limitedLinear01 0.1; + h limitedLinear 0.1; + hu limitedLinear 0.1; + }; + div(U) Gauss linear; + div((Su*grad(b))) Gauss linear; + div((U+((Su*Xi)*grad(b)))) Gauss linear; + div((muEff*dev2(grad(U).T()))) Gauss linear; +} + +laplacianSchemes +{ + default none; + laplacian(muEff,U) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(DBEff,B) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian(alphaEff,b) Gauss linear corrected; + laplacian(alphaEff,ft) Gauss linear corrected; + laplacian(alphaEff,h) Gauss linear corrected; + laplacian(alphaEff,hu) Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p ; +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution new file mode 100644 index 000000000..621343769 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution @@ -0,0 +1,133 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + ft + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + fu + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + b + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Xi + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Su + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + h + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + hu + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } +} + +PISO +{ + nOuterCorrectors 2; + nCorrectors 1; + nNonOrthogonalCorrectors 0; +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict new file mode 100644 index 000000000..27840f7e4 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict @@ -0,0 +1,38 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object setFieldsDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +defaultFieldValues +( + volScalarFieldValue b 1 + volScalarFieldValue T 293 +); + +regions +( + boxToCell + { + box (-1 -1 -1) (1 0 1); + fieldValues + ( + volScalarFieldValue b 0 + volScalarFieldValue T 1650 + ); + } +); + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su new file mode 100644 index 000000000..c04ce1d7e --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Su; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform 0.135; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 0.135; + } + + outlet + { + type inletOutlet; + inletValue uniform 0.135; + value uniform 0.135; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T new file mode 100644 index 000000000..bb7a3a2d7 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 293; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 293; + } + + outlet + { + type inletOutlet; + inletValue uniform 293; + value uniform 293; + } + + upperWall + { + type fixedValue; + value uniform 293; + } + + lowerWall + { + type fixedValue; + value uniform 570; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu new file mode 100644 index 000000000..82ea63012 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Tu; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 293; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 293; + } + + outlet + { + type inletOutlet; + inletValue uniform 293; + value uniform 293; + } + + upperWall + { + type fixedValue; + value uniform 293; + } + + lowerWall + { + type fixedValue; + value uniform 570; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U new file mode 100644 index 000000000..c3f3a97c2 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + inlet + { + type turbulentInlet; + referenceField uniform (13.3 0 0); + fluctuationScale (0.04 0.02 0.02); + alpha 0.1; + } + + outlet + { + type inletOutlet; + inletValue uniform (0 0 0); + value uniform (0 0 0); + } + + upperWall + { + type fixedValue; + value uniform (0 0 0); + } + + lowerWall + { + type fixedValue; + value uniform (0 0 0); + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi new file mode 100644 index 000000000..6ddd7b27f --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Xi; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 1; + } + + outlet + { + type inletOutlet; + inletValue uniform 1; + value uniform 1; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs new file mode 100644 index 000000000..b536298af --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object alphaSgs; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type zeroGradient; + } + + upperWall + { + type alphaSgsJayatillekeWallFunction; + value uniform 0; + } + + lowerWall + { + type alphaSgsJayatillekeWallFunction; + value uniform 0; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b new file mode 100644 index 000000000..593c5cbfb --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object b; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 1; + } + + outlet + { + type inletOutlet; + inletValue uniform 1; + value uniform 1; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k new file mode 100644 index 000000000..4732ee3c3 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 2e-05; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 2e-05; + } + + outlet + { + type inletOutlet; + inletValue uniform 2e-05; + value uniform 2e-05; + } + + upperWall + { + type zeroGradient; + value uniform 2e-05; + } + + lowerWall + { + type zeroGradient; + value uniform 2e-05; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs new file mode 100644 index 000000000..78b195754 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object muSgs; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type zeroGradient; + } + + upperWall + { + type muSgsWallFunction; + value uniform 0; + } + + lowerWall + { + type muSgsWallFunction; + value uniform 0; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p new file mode 100644 index 000000000..375a81d78 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p @@ -0,0 +1,57 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 1e5; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type waveTransmissive; + field p; + phi phi; + rho rho; + psi psi; + gamma 1.3; + fieldInf 1e5; + lInf 0.3; + value uniform 1e5; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties new file mode 100644 index 000000000..df108c2a8 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties @@ -0,0 +1,88 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object LESProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +LESModel oneEqEddy; + +delta vanDriest; + +turbulence on; + +printCoeffs on; + +cubeRootVolCoeffs +{ + deltaCoeff 1; +} + +PrandtlCoeffs +{ + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + smoothCoeffs + { + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + maxDeltaRatio 1.1; + } + + Cdelta 0.158; +} + +vanDriestCoeffs +{ + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + smoothCoeffs + { + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + maxDeltaRatio 1.1; + } + + Aplus 26; + Cdelta 0.158; +} + +smoothCoeffs +{ + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + maxDeltaRatio 1.1; +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties new file mode 100644 index 000000000..0996f8ec2 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties @@ -0,0 +1,93 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object combustionProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +laminarFlameSpeedCorrelation Gulders; + +fuel Propane; + +Su Su [0 1 -1 0 0 0 0] 0.135; + +SuModel transport; + +equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6; + +sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338; + +XiModel transport; + +XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; + +XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; + +uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; + +GuldersCoeffs +{ + Methane + { + W 0.422; + eta 0.15; + xi 5.18; + alpha 2; + beta -0.5; + f 2.3; + } + + Propane + { + W 0.446; + eta 0.12; + xi 4.95; + alpha 1.77; + beta -0.2; + f 2.3; + } + + IsoOctane + { + W 0.4658; + eta -0.326; + xi 4.48; + alpha 1.56; + beta -0.22; + f 2.3; + } +} + +ignite yes; + +ignitionSites +( + { + location (0.005 -0.02 0.01905); + diameter 0.003; + start 0; + duration 0.1; + strength 200; + } +); + +ignitionSphereFraction 1; + +ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0; + +ignitionCircleFraction 0; + +ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g new file mode 100644 index 000000000..04a581397 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 0 0); + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict new file mode 100644 index 000000000..2caf83dfc --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict @@ -0,0 +1,153 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 0.001; + +vertices +( + (-20.6 0 0) + (-20.6 2 0) + (-20.6 12.7 0) + (-20.6 25.4 0) + (0 -25.4 0) + (0 -4 0) + (0 0 0) + (0 2 0) + (0 12.7 0) + (0 25.4 0) + (206 -25.4 0) + (206 -8.5 0) + (206 0 0) + (206 8.5 0) + (206 17 0) + (206 25.4 0) + (290 -16.6 0) + (290 -8.3 0) + (290 0 0) + (290 5.5 0) + (290 11 0) + (290 16.6 0) + (-20.6 0 38.1) + (-20.6 2 38.1) + (-20.6 12.7 38.1) + (-20.6 25.4 38.1) + (0 -25.4 38.1) + (0 -4 38.1) + (0 0 38.1) + (0 2 38.1) + (0 12.7 38.1) + (0 25.4 38.1) + (206 -25.4 38.1) + (206 -8.5 38.1) + (206 0 38.1) + (206 8.5 38.1) + (206 17 38.1) + (206 25.4 38.1) + (290 -16.6 38.1) + (290 -8.3 38.1) + (290 0 38.1) + (290 5.5 38.1) + (290 11 38.1) + (290 16.6 38.1) +); + +blocks +( + hex (0 6 7 1 22 28 29 23) (18 7 20) simpleGrading (1 1 1) + hex (1 7 8 2 23 29 30 24) (18 10 20) simpleGrading (1 4 1) + hex (2 8 9 3 24 30 31 25) (18 13 20) simpleGrading (1 0.25 1) + hex (4 10 11 5 26 32 33 27) (180 18 20) simpleGrading (2 1 1) + hex (5 11 12 6 27 33 34 28) (180 9 20) simpleGrading (2 1 1) + hex (6 12 13 7 28 34 35 29) (180 7 20) simpleGrading (2 1 1) + hex (7 13 14 8 29 35 36 30) (180 10 20) simpleGrading (2 4 1) + hex (8 14 15 9 30 36 37 31) (180 13 20) simpleGrading (2 0.25 1) + hex (10 16 17 11 32 38 39 33) (25 18 20) simpleGrading (1 1 1) + hex (11 17 18 12 33 39 40 34) (25 9 20) simpleGrading (1 1 1) + hex (12 18 19 13 34 40 41 35) (25 7 20) simpleGrading (1 1 1) + hex (13 19 20 14 35 41 42 36) (25 10 20) simpleGrading (1 4 1) + hex (14 20 21 15 36 42 43 37) (25 13 20) simpleGrading (1 0.25 1) +); + +edges +( +); + +patches +( + patch inlet + ( + (0 22 23 1) + (1 23 24 2) + (2 24 25 3) + ) + patch outlet + ( + (16 17 39 38) + (17 18 40 39) + (18 19 41 40) + (19 20 42 41) + (20 21 43 42) + ) + wall upperWall + ( + (3 25 31 9) + (9 31 37 15) + (15 37 43 21) + ) + wall lowerWall + ( + (0 6 28 22) + (6 5 27 28) + (5 4 26 27) + (4 10 32 26) + (10 16 38 32) + ) + cyclic frontAndBack + ( + (22 28 29 23) + (23 29 30 24) + (24 30 31 25) + (26 32 33 27) + (27 33 34 28) + (28 34 35 29) + (29 35 36 30) + (30 36 37 31) + (32 38 39 33) + (33 39 40 34) + (34 40 41 35) + (35 41 42 36) + (36 42 43 37) + (0 1 7 6) + (1 2 8 7) + (2 3 9 8) + (4 5 11 10) + (5 6 12 11) + (6 7 13 12) + (7 8 14 13) + (8 9 15 14) + (10 11 17 16) + (11 12 18 17) + (12 13 19 18) + (13 14 20 19) + (14 15 21 20) + ) +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary new file mode 100644 index 000000000..f999d3392 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6.x | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +5 +( + inlet + { + type patch; + nFaces 600; + startFace 715675; + } + outlet + { + type patch; + nFaces 1140; + startFace 716275; + } + upperWall + { + type wall; + nFaces 4460; + startFace 717415; + } + lowerWall + { + type wall; + nFaces 5000; + startFace 721875; + } + frontAndBack + { + type cyclic; + nFaces 24450; + startFace 726875; + featureCos 0.9; + } +) + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties new file mode 100644 index 000000000..ea9bb3b20 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType + hhuMixtureThermo>>>>; + +stoichiometricAirFuelMassRatio + stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675; + +// phi = 0.57 +// ft = 0.0352993 +// Tad = 1650.1 + +fuel fuel 1 44.0962 + 100 5000 1000 + 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 + 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 + 1.67212e-06 170.672; + +oxidant oxidant 1 28.8504 + 100 6000 1000 + 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 + 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 + 1.67212e-06 170.672; + +reactants reactants 1 29.2068 + 100 5000 1000 + 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 + 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 + 1.67212e-06 170.672; + +burntProducts burntProducts 1 28.3233 + 100 6000 1000 + 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 + 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 + 1.67212e-06 170.672; + +products products 1 28.5396 + 100 5000 1000 + 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 + 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 + 1.67212e-06 170.672; + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties new file mode 100644 index 000000000..f2fbf353e --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType LESModel; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict new file mode 100644 index 000000000..6ab5661f2 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict @@ -0,0 +1,80 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application XiFoam; + +startFrom latestTime; + +startTime 0; + +stopAt endTime; + +endTime 0.5; + +deltaT 5e-06; + +writeControl adjustableRunTime; + +writeInterval 0.0005; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression compressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +adjustTimeStep yes; + +maxCo 0.5; + +functions +{ + fieldAverage1 + { + type fieldAverage; + functionObjectLibs ( "libfieldFunctionObjects.so" ); + enabled true; + outputControl outputTime; + fields + ( + U + { + mean on; + prime2Mean on; + base time; + } + + p + { + mean on; + prime2Mean on; + base time; + } + ); + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes new file mode 100644 index 000000000..c20ec8687 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes @@ -0,0 +1,80 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default backward; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; + div(phi,U) Gauss linear; + div(phiU,p) Gauss linear; + div(phi,k) Gauss limitedLinear 0.1; + div(phiXi,Xi) Gauss limitedLinear01 0.1; + div(phiXi,Su) Gauss limitedLinear01 0.1; + div(phiSt,b) Gauss limitedLinear01 0.1; + div(phi,ft_b_h_hu) Gauss multivariateSelection + { + ft limitedLinear01 0.1; + b limitedLinear01 0.1; + h limitedLinear 0.1; + hu limitedLinear 0.1; + }; + div(U) Gauss linear; + div((Su*grad(b))) Gauss linear; + div((U+((Su*Xi)*grad(b)))) Gauss linear; + div((muEff*dev2(grad(U).T()))) Gauss linear; +} + +laplacianSchemes +{ + default none; + laplacian(muEff,U) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(DBEff,B) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian(alphaEff,b) Gauss linear corrected; + laplacian(alphaEff,ft) Gauss linear corrected; + laplacian(alphaEff,h) Gauss linear corrected; + laplacian(alphaEff,hu) Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p ; +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution new file mode 100644 index 000000000..c2e87ee6b --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution @@ -0,0 +1,138 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + ft + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + fu + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + b + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Xi + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Su + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + h + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + hu + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } +} + +PISO +{ + nOuterCorrectors 2; + nCorrectors 1; + nNonOrthogonalCorrectors 0; +} + +relaxationFactors +{ + Xi 1; + Su 1; +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/Allclean b/tutorials/combustion/XiFoam/ras/Allclean new file mode 100755 index 000000000..04676f773 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/Allclean @@ -0,0 +1,17 @@ +#!/bin/sh + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +keepCases="moriyoshiHomogeneous" +loseCases="moriyoshiHomogeneousPart2" + +for case in $keepCases +do + (cd $case && foamCleanTutorials) +done + +for case in $loseCases +do + removeCase $case +done diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun new file mode 100755 index 000000000..0c311946f --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/Allrun @@ -0,0 +1,29 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Set application name +application="XiFoam" + +setControlDict () { + controlDict="system/controlDict" + sed \ + -e s/"\(deltaT[ \t]*\) 5e-06;"/"\1 1e-05;"/g \ + -e s/"\(endTime[ \t]*\) 0.005;"/"\1 0.015;"/g \ + -e s/"\(writeInterval[ \t]*\) 10;"/"\1 50;"/g \ + $controlDict > temp.$$ + mv temp.$$ $controlDict +} + +# Do moriyoshiHomogeneous +(cd moriyoshiHomogeneous && foamRunTutorials) + +# Clone case +cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2 + +# Modify and execute +cd moriyoshiHomogeneousPart2 + cp -r ../moriyoshiHomogeneous/0.005 . + setControlDict + runApplication $application +cd .. diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su new file mode 100644 index 000000000..d2e580c0f --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Su; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform 0.434; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T new file mode 100644 index 000000000..756840b37 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 300; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu new file mode 100644 index 000000000..ec98da12f --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Tu; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 300; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U new file mode 100644 index 000000000..8451816bf --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi new file mode 100644 index 000000000..e21fdfd19 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object Xi; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat new file mode 100644 index 000000000..d1685619f --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat @@ -0,0 +1,47 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + left + { + type symmetryPlane; + } + right + { + type symmetryPlane; + } + top + { + type symmetryPlane; + } + bottom + { + type symmetryPlane; + } + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b new file mode 100644 index 000000000..11f03d6cd --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object b; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon new file mode 100644 index 000000000..a0c68fe59 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object epsilon; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -3 0 0 0 0 ]; + +internalField uniform 375; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft new file mode 100644 index 000000000..ac78cadd8 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object ft; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0.06; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu new file mode 100644 index 000000000..7d5810b17 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object fu; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k new file mode 100644 index 000000000..7222d23d4 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -2 0 0 0 0 ]; + +internalField uniform 1.5; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut new file mode 100644 index 000000000..79a07a054 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/mut @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 1 -1 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p new file mode 100644 index 000000000..0a690886a --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 118000; + +boundaryField +{ + left + { + type symmetryPlane; + } + + right + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + bottom + { + type symmetryPlane; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties new file mode 100644 index 000000000..90ebab09e --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties @@ -0,0 +1,25 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object RASProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +RASModel LaunderSharmaKE; + +turbulence on; + +printCoeffs on; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties new file mode 100644 index 000000000..d69c3a25d --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties @@ -0,0 +1,84 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object combustionProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +laminarFlameSpeedCorrelation Gulders; + +fuel Propane; + +Su Su [ 0 1 -1 0 0 0 0 ] 0.434; + +SuModel unstrained; + +equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1; + +sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 100000; + +XiModel transport; + +XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62; + +XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1; + +uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1; + +GuldersCoeffs +{ + Methane + { + W 0.422; + eta 0.15; + xi 5.18; + alpha 2; + beta -0.5; + f 2.3; + } + + Propane + { + W 0.446; + eta 0.12; + xi 4.95; + alpha 1.77; + beta -0.2; + f 2.3; + } + + IsoOctane + { + W 0.4658; + eta -0.326; + xi 4.48; + alpha 1.56; + beta -0.22; + f 2.3; + } +} + +ignite yes; + +ignitionSites ( { location ( 0 0 0.0005 ) ; diameter 0.003 ; start 0 ; duration 0.001 ; strength 1 ; } ); + +ignitionSphereFraction 1; + +ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0.001; + +ignitionCircleFraction 0.5; + +ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0.001; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g new file mode 100644 index 000000000..51944e7ab --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value ( 0 0 0 ); + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict new file mode 100644 index 000000000..ac1831570 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict @@ -0,0 +1,69 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 0.001; + +vertices +( + (0 0 0) + (0 35 0) + (70 0 0) + (70 35 0) + (0 0 1) + (0 35 1) + (70 0 1) + (70 35 1) +); + +blocks +( + hex (0 2 3 1 4 6 7 5) (70 35 1) simpleGrading (1 1 1) +); + +edges +( +); + +patches +( + symmetryPlane left + ( + (0 4 5 1) + ) + symmetryPlane right + ( + (2 3 7 6) + ) + symmetryPlane top + ( + (1 5 7 3) + ) + symmetryPlane bottom + ( + (0 2 6 4) + ) + empty frontAndBack + ( + (4 5 7 6) + (0 1 3 2) + ) +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary new file mode 100644 index 000000000..23eb8107f --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +5 +( + left + { + type symmetryPlane; + nFaces 35; + startFace 4795; + } + right + { + type symmetryPlane; + nFaces 35; + startFace 4830; + } + top + { + type symmetryPlane; + nFaces 70; + startFace 4865; + } + bottom + { + type symmetryPlane; + nFaces 70; + startFace 4935; + } + frontAndBack + { + type empty; + nFaces 4900; + startFace 5005; + } +) + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties new file mode 100644 index 000000000..b80403cef --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties @@ -0,0 +1,33 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType hhuMixtureThermo>>>>; + +stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675; + +fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672; + +oxidant oxidant 1 28.8504 200 6000 1000 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 1.67212e-06 170.672; + +reactants reactants 24.8095 29.4649 200 5000 1000 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 1.67212e-06 170.672; + +products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; + +burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties new file mode 100644 index 000000000..f6753662e --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict new file mode 100644 index 000000000..443097f40 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict @@ -0,0 +1,55 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application XiFoam; + +startFrom latestTime; + +startTime 0; + +stopAt endTime; + +endTime 0.005; + +deltaT 5e-06; + +writeControl timeStep; + +writeInterval 20; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +adjustTimeStep no; + +maxCo 0.2; + +maxDeltaT 1; + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes new file mode 100644 index 000000000..bd68d6b8c --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes @@ -0,0 +1,87 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; + grad(p) Gauss linear; +} + +divSchemes +{ + default none; + div(phi,U) Gauss limitedLinearV 1; + div(phid,p) Gauss limitedLinear 1; + div(phiU,p) Gauss linear; + div(phi,k) Gauss limitedLinear 1; + div(phi,epsilon) Gauss limitedLinear 1; + div(phi,R) Gauss limitedLinear 1; + div(R) Gauss linear; + div(phiXi,Xi) Gauss limitedLinear 1; + div(phiXi,Su) Gauss limitedLinear 1; + div(phiSt,b) Gauss limitedLinear01 1; + div(phi,ft_b_h_hu) Gauss multivariateSelection + { + fu limitedLinear01 1; + ft limitedLinear01 1; + b limitedLinear01 1; + h limitedLinear 1; + hu limitedLinear 1; + }; + div(U) Gauss linear; + div((Su*grad(b))) Gauss linear; + div((U+((Su*Xi)*grad(b)))) Gauss linear; + div((muEff*dev2(grad(U).T()))) Gauss linear; +} + +laplacianSchemes +{ + default none; + laplacian(muEff,U) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; + laplacian(DREff,R) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian(alphaEff,b) Gauss linear corrected; + laplacian(alphaEff,ft) Gauss linear corrected; + laplacian(alphaEff,h) Gauss linear corrected; + laplacian(alphaEff,hu) Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p ; +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution new file mode 100644 index 000000000..d7814dd90 --- /dev/null +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution @@ -0,0 +1,133 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + ft + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + fu + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + b + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Xi + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Su + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + h + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + hu + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } +} + +PISO +{ + nCorrectors 2; + nNonOrthogonalCorrectors 0; + momentumPredictor yes; +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/N2 b/tutorials/combustion/dieselFoam/aachenBomb/0/N2 index 76c6fe4f3..3c377c503 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/N2 +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/N2 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/O2 b/tutorials/combustion/dieselFoam/aachenBomb/0/O2 index c3011c6ae..d966d53a9 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/O2 +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/O2 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/T b/tutorials/combustion/dieselFoam/aachenBomb/0/T index 26310f88c..accaf72fb 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/T +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/U b/tutorials/combustion/dieselFoam/aachenBomb/0/U index 3375cfeb8..06ed818a6 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/U +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault b/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault index 92e7b5f47..ed460af0e 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat new file mode 100644 index 000000000..5eceb3da7 --- /dev/null +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat @@ -0,0 +1,32 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + walls + { + type alphatWallFunction; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon index de3d91a3e..9d37c958c 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon @@ -1,40 +1,32 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object epsilon; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [ 0 2 -3 0 0 0 0 ]; +dimensions [0 2 -3 0 0 0 0]; -internalField uniform 90.0; +internalField uniform 90; boundaryField { walls { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 90; } - - front - { - type wedge; - } - - back - { - type wedge; - } - } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/ft b/tutorials/combustion/dieselFoam/aachenBomb/0/ft index 49e17e8d5..f9dbf9d44 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/ft +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/ft @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -20,7 +20,7 @@ internalField uniform 0; boundaryField { - walls + fixedWalls { type zeroGradient; } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/fu b/tutorials/combustion/dieselFoam/aachenBomb/0/fu index 32e0cbcf9..5a3a35f68 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/fu +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/fu @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -20,7 +20,7 @@ internalField uniform 0; boundaryField { - walls + fixedWalls { type zeroGradient; } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/k b/tutorials/combustion/dieselFoam/aachenBomb/0/k index 1ca9a40d6..6438b1470 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/k +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/k @@ -1,40 +1,32 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object k; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [ 0 2 -2 0 0 0 0 ]; +dimensions [0 2 -2 0 0 0 0]; -internalField uniform 1.0; +internalField uniform 1; boundaryField { walls { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } - - front - { - type wedge; - } - - back - { - type wedge; - } - } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/mut b/tutorials/combustion/dieselFoam/aachenBomb/0/mut new file mode 100644 index 000000000..a26a484df --- /dev/null +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/mut @@ -0,0 +1,32 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + walls + { + type mutWallFunction; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/p b/tutorials/combustion/dieselFoam/aachenBomb/0/p index bc33200d5..7cc844fdc 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/p +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -22,19 +22,19 @@ boundaryField { walls { - type zeroGradient; + type buoyantPressure; + value uniform 5e+06; } - + front { - type wedge; + type wedge; } back { - type wedge; + type wedge; } - } // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties index c652dd95b..48cf724e2 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties @@ -1,99 +1,25 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; - muLimiter on; - Lsgs 0.0002; - -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - Cs 0.25; - Ceps 0.15; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties index a607222ee..a75586a1a 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties @@ -1,43 +1,45 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -chemistry off; +psiChemistryModel ODEChemistryModel; -chemistrySolver ODE; -//chemistrySolver EulerImplicit; -//chemistrySolver sequential; +chemistry off; -initialChemicalTimeStep 1.0e-7; +chemistrySolver ode; + +initialChemicalTimeStep 1e-07; sequentialCoeffs { - cTauChem 1.0e-3; + cTauChem 0.001; } EulerImplicitCoeffs { - cTauChem 5.0e-2; - equilibriumRateLimiter off; + cTauChem 0.05; + equilibriumRateLimiter off; } -ODECoeffs +odeCoeffs { ODESolver SIBS; - eps 5.0e-2; - scale 1.0; + eps 0.05; + scale 1; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties index a038d1e7f..3962ab92d 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties @@ -1,27 +1,29 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0 ; +Cmix Cmix [ 0 0 0 0 0 0 0 ] 1; ignitionProperties1 { - ignite off; - ignitionPoint ignitionPoint [ 0 1 0 0 0 0 0 ] ( 0.2 0 0.02 ) ; - timing timing [ 0 0 1 0 0 0 0 ] 0.0e-1 ; - duration duration [ 0 0 1 0 0 0 0 ] 1.0e-0 ; + ignite off; + ignitionPoint ignitionPoint [ 0 1 0 0 0 0 0 ] ( 0.2 0 0.02 ); + timing timing [ 0 0 1 0 0 0 0 ] 0; + duration duration [ 0 0 1 0 0 0 0 ] 1; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/g b/tutorials/combustion/dieselFoam/aachenBomb/constant/g new file mode 100644 index 000000000..a050d13c5 --- /dev/null +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value ( 0 -9.81 0 ); + + +// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties index 81b8b07bc..1dd31857d 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object injectorProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -32,7 +33,7 @@ FoamFile 1.0 ); - massFlowRateProfile + massFlowRateProfile ( (0 0.1272) (4.16667e-05 6.1634) @@ -91,7 +92,7 @@ FoamFile 1.0 ); - massFlowRateProfile + massFlowRateProfile ( (0 0.1272) (4.16667e-05 6.1634) @@ -132,7 +133,7 @@ FoamFile (0.00125 1.0) ); } - } + } ) // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict index d362c1828..070a7befc 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary index 776ce2125..9df376bfd 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format binary; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties index 39271a397..42a5e96de 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties @@ -1,15 +1,16 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object sprayProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,20 +25,13 @@ interpolationSchemes subCycles 2; -atomizationModel off; -//atomizationModel LISA; +atomizationModel off; + +includeOscillation yes; -includeOscillation yes; -//breakupModel TAB; -//breakupModel ETAB; -//breakupModel ReitzDiwakar; breakupModel ReitzKHRT; -//injectorModel constInjector; -//injectorModel ChomiakInjector; -//injectorModel definedInjector; -//injectorModel pressureSwirlInjector; -injectorModel hollowConeInjector; +injectorModel hollowConeInjector; collisionModel off; @@ -51,42 +45,29 @@ dragModel standardDragModel; wallModel reflect; -sprayIteration -{ - sprayIterate 1; - sprayRelaxFactor 1; - minimumParcelMass 1e-14; -} - specConstAtomizationCoeffs { - dropletNozzleDiameterRatio - ( - 0.4 - ); - sprayAngle - ( - 10 - ); + dropletNozzleDiameterRatio ( 0.4 ); + sprayAngle ( 10 ); } TABCoeffs { - y0 0.0; - yDot0 0.0; - Cmu 10.0; - Comega 8.0; + y0 0; + yDot0 0; + Cmu 10; + Comega 8; WeCrit 12; } ETABCoeffs { - Cmu 10.0; - Comega 8.0; - WeCrit 12; - k1 0.2; - k2 0.2; - WeTransition 100.0; + Cmu 10; + Comega 8; + WeCrit 12; + k1 0.2; + k2 0.2; + WeTransition 100; } ReitzDiwakarCoeffs @@ -141,45 +122,25 @@ hollowConeInjectorCoeffs { dropletPDF { - //pdfType exponential; pdfType RosinRammler; - RosinRammlerPDF { - minValue 1.00e-6; - maxValue 1.50e-4; - - d - ( - 1.5e-4 - ); - - n - ( - 3 - ); + minValue 1e-06; + maxValue 0.00015; + d ( 0.00015 ); + n ( 3 ); } + exponentialPDF { - minValue 1.0e-4; - maxValue 1.0e-3; - - lambda - ( - 1.0e+4 - ); + minValue 0.0001; + maxValue 0.001; + lambda ( 10000 ); } } - innerConeAngle - ( - 0.0 - ); - - outerConeAngle - ( - 20.0 - ); + innerConeAngle ( 0 ); + outerConeAngle ( 20 ); } reflectCoeffs @@ -187,4 +148,5 @@ reflectCoeffs elasticity 0.9; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties index e23158128..e5fbb0bd7 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties @@ -1,35 +1,34 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; - object thermodynamicProperties; + location "constant"; + object thermophysicalProperties; } -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hMixtureThermo; +thermoType hsPsiMixtureThermo>; -CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; -// We use the central thermo data: -CHEMKINThermoFile "~OpenFOAM/thermoData/therm.dat"; +CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; + +CHEMKINThermoFile "~OpenFOAM/thermoData/therm.dat"; inertSpecie N2; -liquidComponents -( - C7H16 -); +liquidComponents ( C7H16 ); liquidProperties { - C7H16 C7H16 defaultCoeffs; + C7H16 C7H16 defaultCoeffs; } -/*********************************************************************/ + +// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties new file mode 100644 index 000000000..f1f4b717d --- /dev/null +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + + +// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict index fec5f8c06..43fa1de20 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict @@ -1,51 +1,53 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application dieselFoam; +application dieselFoam; -startFrom startTime; +startFrom startTime; -startTime 0; +startTime 0; -stopAt endTime; +stopAt endTime; -endTime 0.01; +endTime 0.01; -deltaT 2.5e-06; +deltaT 2.5e-06; -writeControl adjustableRunTime; +writeControl adjustableRunTime; -writeInterval 5.0e-5; +writeInterval 5e-05; -purgeWrite 0; +purgeWrite 0; -writeFormat binary; +writeFormat binary; -writePrecision 6; +writePrecision 6; -writeCompression uncompressed; +writeCompression uncompressed; -timeFormat general; +timeFormat general; -timePrecision 6; +timePrecision 6; -adjustTimeStep yes; +adjustTimeStep yes; -maxCo 0.1; +maxCo 0.1; + +runTimeModifiable yes; -runTimeModifiable yes; // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes index e3033a80a..1ac217a85 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes @@ -1,22 +1,23 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -27,31 +28,31 @@ gradSchemes divSchemes { - default none; - div(phi,rho) Gauss limitedLinear 1; - div(phi,U) Gauss limitedLinearV 1; - div(phiU,p) Gauss linear; - div(phi,k) Gauss limitedLinear 1; + default none; + div(phi,rho) Gauss limitedLinear 1; + div(phi,U) Gauss limitedLinearV 1; + div(phiU,p) Gauss linear; + div(phi,k) Gauss limitedLinear 1; div(phi,epsilon) Gauss limitedLinear 1; - div(phi,Yi_h) Gauss upwind; - div(phi,fu_ft_h) Gauss multivariateSelection + div(phi,Yi_h) Gauss upwind; + div(phi,fu_ft_h) Gauss multivariateSelection { - fu limitedLinear 1; - ft limitedLinear 1; - h limitedLinear 1; + fu limitedLinear 1; + ft limitedLinear 1; + hs limitedLinear 1; }; div((muEff*dev2(grad(U).T()))) Gauss linear; } laplacianSchemes { - default Gauss linear corrected; - laplacian(muEff,U) Gauss linear corrected; - laplacian(muEff,ft) Gauss linear corrected; - laplacian(muEff,fu) Gauss linear corrected; - laplacian(((alphah*mut)+alpha),h) Gauss linear corrected; + default Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; + laplacian(muEff,ft) Gauss linear corrected; + laplacian(muEff,fu) Gauss linear corrected; + laplacian(((alphah*mut)+alpha),hs) Gauss linear corrected; laplacian((rho|A(U)),p) Gauss linear corrected; - laplacian(rhoD,k) Gauss linear corrected; + laplacian(rhoD,k) Gauss linear corrected; laplacian(rhoD,epsilon) Gauss linear corrected; } @@ -68,7 +69,9 @@ snGradSchemes fluxRequired { + default no; p; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution index 4f4a45349..90bf7e8da 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,54 +10,34 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-09; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - p PCG + $p; + tolerance 1e-06; + } + + "(U|Yi|hs|k|epsilon)" { - preconditioner DIC; - tolerance 1e-09; - relTol 0; - }; - Yi PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - h PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - k PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - epsilon PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } } PISO @@ -66,4 +46,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/alphat b/tutorials/combustion/engineFoam/kivaTest/-180/alphat new file mode 100644 index 000000000..7d6c338d7 --- /dev/null +++ b/tutorials/combustion/engineFoam/kivaTest/-180/alphat @@ -0,0 +1,45 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "-180"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + piston + { + type alphatWallFunction; + Prt 0.85; + value uniform 0; + } + liner + { + type alphatWallFunction; + Prt 0.85; + value uniform 0; + } + cylinderHead + { + type alphatWallFunction; + Prt 0.85; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon new file mode 100644 index 000000000..17f52610c --- /dev/null +++ b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "-180"; + object epsilon; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -3 0 0 0 0]; + +internalField uniform 450; + +boundaryField +{ + piston + { + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 450; + } + liner + { + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 450; + } + cylinderHead + { + type compressible::epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 450; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/k b/tutorials/combustion/engineFoam/kivaTest/-180/k new file mode 100644 index 000000000..43f229d7c --- /dev/null +++ b/tutorials/combustion/engineFoam/kivaTest/-180/k @@ -0,0 +1,42 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "-180"; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 4; + +boundaryField +{ + piston + { + type compressible::kqRWallFunction; + value uniform 4; + } + liner + { + type compressible::kqRWallFunction; + value uniform 4; + } + cylinderHead + { + type compressible::kqRWallFunction; + value uniform 4; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/mut b/tutorials/combustion/engineFoam/kivaTest/-180/mut new file mode 100644 index 000000000..4aa8e4942 --- /dev/null +++ b/tutorials/combustion/engineFoam/kivaTest/-180/mut @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "-180"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + piston + { + type mutWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0; + } + liner + { + type mutWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0; + } + cylinderHead + { + type mutWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun index 0912af15e..e8de44422 100755 --- a/tutorials/combustion/engineFoam/kivaTest/Allrun +++ b/tutorials/combustion/engineFoam/kivaTest/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="engineFoam" +# Get application name +application=`getApplication` runKivaToFoam () { diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties b/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties index 6236e3649..81b1ec911 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,89 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0; - alphah 1.111; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties index 1b0c9a791..4fa07e320 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders; fuel IsoOctane; -Su Su [0 1 -1 0 0 0 0] 0; +Su Su [ 0 1 -1 0 0 0 0 ] 0; SuModel unstrained; -equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 1; +equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1; -sigmaExt sigmaExt [0 0 -1 0 0 0 0] 100000; +sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 100000; XiModel transport; -XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; +XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62; -XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; +XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1; -uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; +uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1; GuldersCoeffs { @@ -45,6 +46,7 @@ GuldersCoeffs beta -0.5; f 2.3; } + Propane { W 0.446; @@ -54,6 +56,7 @@ GuldersCoeffs beta -0.2; f 2.3; } + IsoOctane { W 0.4658; @@ -69,7 +72,6 @@ ignite yes; ignitionSites ( - { location (0.03 0 0.091); diameter 0.002; @@ -79,11 +81,13 @@ ignitionSites } ); -ignitionSphereFraction 1.0; +ignitionSphereFraction 1; -ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0; -ignitionCircleFraction 1; +ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0; + +ignitionCircleFraction 1; + +ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0; -ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry index 4b8dc3685..8f65414e0 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry +++ b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,22 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object engineGeometry; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // engineMesh layered; -conRodLength conRodLength [0 1 0 0 0 0 0] 0.147; +conRodLength conRodLength [ 0 1 0 0 0 0 0 ] 0.147; -bore bore [0 1 0 0 0 0 0] 0.092; +bore bore [ 0 1 0 0 0 0 0 ] 0.092; -stroke stroke [0 1 0 0 0 0 0] 0.08423; +stroke stroke [ 0 1 0 0 0 0 0 ] 0.08423; -clearance clearance [0 1 0 0 0 0 0] 0.00115; +clearance clearance [ 0 1 0 0 0 0 0 ] 0.00115; + +rpm rpm [ 0 0 -1 0 0 0 0 ] 1500; -rpm rpm [0 0 -1 0 0 0 0] 1500; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/g b/tutorials/combustion/engineFoam/kivaTest/constant/g new file mode 100644 index 000000000..51944e7ab --- /dev/null +++ b/tutorials/combustion/engineFoam/kivaTest/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value ( 0 0 0 ); + + +// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary index 7a3a7294e..63855cf08 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary +++ b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,32 +10,31 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 3 ( -piston -{ - type wall; - nFaces 1326; - startFace 79522; -} - -liner -{ - type wall; - nFaces 2710; - startFace 80848; -} - -cylinderHead -{ - type wall; - nFaces 2184; - startFace 83558; -} + piston + { + type wall; + nFaces 1326; + startFace 79522; + } + liner + { + type wall; + nFaces 2710; + startFace 80848; + } + cylinderHead + { + type wall; + nFaces 2184; + startFace 83558; + } ) // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org index 141492d66..dfe1035aa 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org +++ b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties index a45a851b1..58d2d8277 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hhuMixtureThermo>>>>; -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.0336; +stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336; fuel fuel 1 114.23 298.15 5000 1000 19.3963 0.0488137 -1.55798e-05 2.17831e-09 -1.08391e-13 -37133.9 -78.8531 0.429357 0.0765769 8.41306e-06 -5.86603e-08 2.79414e-11 -30446.4 25.6735 1.67212e-06 170.672; @@ -28,4 +29,5 @@ products products 1 28.8478 298.15 5000 1000 3.10156 0.00124723 -4.2071e- burntProducts burntProducts 1 28.6068 200 6000 1000 3.12468 0.00178578 -5.94695e-07 9.09801e-11 -5.1246e-15 -11005.8 5.03593 3.47612 0.000758205 -3.68739e-07 1.3449e-09 -8.08868e-13 -11071.5 3.3058 1.67212e-06 170.672; + // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties new file mode 100644 index 000000000..f6753662e --- /dev/null +++ b/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + + +// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict index d3c9a9985..8da8d6cb3 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; - object controlDict; + location "system"; + object controlDict.1st; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -applicationClass engineFoam; +application engineFoam; startFrom startTime; @@ -44,10 +45,11 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1.0; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st index d3c9a9985..8da8d6cb3 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; - object controlDict; + location "system"; + object controlDict.1st; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -applicationClass engineFoam; +application engineFoam; startFrom startTime; @@ -44,10 +45,11 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1.0; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd index ea956c009..f42bfbc11 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; - object controlDict; + location "system"; + object controlDict.2nd; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -applicationClass engineFoam; +application engineFoam; startFrom startTime; @@ -44,10 +45,11 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1.0; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes index 9d7fa7421..c838ab319 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -38,14 +39,7 @@ divSchemes div(phiXi,Xi) Gauss upwind; div(phiXi,Su) Gauss upwind; div(phiSt,b) Gauss limitedLinear01 1; - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - fu limitedLinear01 1; - ft limitedLinear01 1; - b limitedLinear01 1; - h limitedLinear 1; - hu limitedLinear 1; - }; + div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; }; div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; @@ -64,6 +58,7 @@ laplacianSchemes laplacian(muEff,ft) Gauss linear limited 0.5; laplacian(alphaEff,h) Gauss linear limited 0.5; laplacian(alphaEff,hu) Gauss linear limited 0.5; + laplacian(alphaEff,ft) Gauss linear limited 0.5; } interpolationSchemes @@ -79,7 +74,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution index 42e0957d1..1891fe83b 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,90 +10,116 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - p PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - ft PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + ft { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - fu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + fu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - b PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + b { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Xi PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Xi { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Su PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Su { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - h PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + h { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - hu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + hu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -104,4 +130,5 @@ PISO fluxGradp no; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/Allclean b/tutorials/compressible/rhoCentralFoam/Allclean index c783ce638..4ac5daed0 100755 --- a/tutorials/compressible/rhoCentralFoam/Allclean +++ b/tutorials/compressible/rhoCentralFoam/Allclean @@ -20,7 +20,7 @@ do cp -r $case/0.org $case/0 fi - (cd $case && foamCleanTutorials) + (cd $case && foamCleanTutorials && cleanSamples) if [ "$case" = "biconic25-55Run35" ] then diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun index e41004597..d20d46fdd 100755 --- a/tutorials/compressible/rhoCentralFoam/Allrun +++ b/tutorials/compressible/rhoCentralFoam/Allrun @@ -1,10 +1,9 @@ #!/bin/sh - # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application=`basename $PWD` +# Get application name +application="rhoCentralFoam" cases=" \ shockTube \ @@ -15,12 +14,13 @@ LadenburgJet60psi \ biconic25-55Run35 \ " -moveTimeMeshToConstant () { -DT=`foamInfoExec -times | tail -1` -if [ $DT != 0 ] ; then - mv ${DT}/polyMesh/* constant/polyMesh - rm -rf ${DT} -fi +moveTimeMeshToConstant () +{ + DT=`foamInfoExec -times | tail -1` + if [ "$DT" != 0 ] ; then + mv ${DT}/polyMesh/* constant/polyMesh + rm -rf ${DT} + fi } for case in $cases @@ -51,4 +51,4 @@ do fi # (cd $case && runApplication $application) -done \ No newline at end of file +done diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T index 32a1ea773..94a83152f 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U index eee08b7e5..7ae764cdc 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p index e274c61d4..a16582984 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -30,15 +30,12 @@ boundaryField { type waveTransmissive; field p; - U U; phi phi; rho rho; psi psi; fieldInf 101325; gamma 1.4; lInf 0.025; - inletOutlet off; - correctSupercritical off; value uniform 101325; } diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T index d5ca69a40..13f3623db 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U index 6782bcdf9..0d3da1ba7 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p index a3697e9ec..92841d280 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -1233,15 +1233,12 @@ boundaryField { type waveTransmissive; field p; - U U; phi phi; rho rho; psi psi; gamma 1.4; fieldInf 101325; lInf 0.025; - inletOutlet off; - correctSupercritical off; value nonuniform List 20 ( diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict index 88fc38878..86b0c61b1 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary index 42aaf838f..8a20e31a9 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties index 1eb45d2f8..55925db29 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; +thermoType ePsiThermo>>>>; mixture air 1 28.96 1004.5 0 1.458e-06 110.4; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict index 70f03d159..041eb98fa 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +application rhoCentralFoam; + startFrom latestTime; startTime 0; @@ -42,10 +45,9 @@ timePrecision 6; adjustTimeStep yes; -//maxCo 3.0; -//maxCo 0.5; maxCo 0.5; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict index 136e30e84..51e15a816 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,38 +10,31 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // numberOfSubdomains 8; -//numberOfSubdomains 16; method simple; simpleCoeffs { - n (8 1 1); -// n (16 1 1); + n ( 8 1 1 ); delta 0.001; } hierarchicalCoeffs { - n (1 1 1); + n ( 1 1 1 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -51,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes index 56ca99dbd..857c5e091 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluxScheme Kurganov; +fluxScheme Kurganov; ddtSchemes { @@ -29,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -39,10 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; - reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; + default linear; + reconstruct(rho) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -50,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution index 2724db019..09395b92a 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10; - relTol 0; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10; + relTol 0; + } + + e + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10 relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict index c7529e911..a1f8bd7db 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,16 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object mapFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -patchMap -( -); +patchMap ( ); + +cuttingPatches ( ); -cuttingPatches -( -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict index ac12dd2d4..25fc992cb 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,40 +19,35 @@ interpolationScheme cellPointFace; writeFormat raw; -sampleSets +sampleSets ( - face - { - name cone25; - axis x; - start ( 0.0 0.0 0.0); - end ( 92.08087e-03 42.939e-03 0.0); - nPoints 92; - } - face { - name cone55; - axis x; - start ( 92.08087e-03 42.939e-03 0.0); - end ( 153.6830e-03 130.92e-03 0.0); - nPoints 61; + name cone25; + axis x; + start ( 0 0 0 ); + end ( 0.09208087 0.042939 0 ); + nPoints 92; } - face { - name base; - axis x; - start ( 153.6830e-03 130.92e-03 0.0); - end ( 193.6750e-03 130.92e-03 0.0); - nPoints 40; + name cone55; + axis x; + start ( 0.09208087 0.042939 0 ); + end ( 0.153683 0.13092 0 ); + nPoints 61; + } + face + { + name base; + axis x; + start ( 0.153683 0.13092 0 ); + end ( 0.193675 0.13092 0 ); + nPoints 40; } ); -fields -( - p - wallHeatTransRate -); +fields ( p wallHeatTransRate ); + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T index ca16891f5..5194ec98d 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U index 6f50c6983..dd6f7a173 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p index ce6774faa..3e679952b 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp index 5b9e11a58..6da3027bf 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp @@ -890,7 +890,7 @@ (0.092027148309198 0.043035802795154 -7.5111607367588e-05) (0.09263207221129 0.043855929103565 -7.65429970772772e-05) (0.093192171617555 0.044640776830937 -7.79128140787704e-05) -(0.093752202168401 0.045432032540685 -7.92938151136726e-05) +(0.093752202168401 0.045432032540685 -7.92938151136725e-05) (0.094312245417969 0.046226095413819 -8.067971557046e-05) (0.09487228896823 0.047021673078023 -8.20682598350704e-05) (0.095432330811069 0.047818192791575 -8.34584482851299e-05) @@ -33658,7 +33658,7 @@ (0.092027148309198 0.043035802795154 7.5111607367588e-05) (0.09263207221129 0.043855929103565 7.65429970772772e-05) (0.093192171617555 0.044640776830937 7.79128140787704e-05) -(0.093752202168401 0.045432032540685 7.92938151136726e-05) +(0.093752202168401 0.045432032540685 7.92938151136725e-05) (0.094312245417969 0.046226095413819 8.067971557046e-05) (0.09487228896823 0.047021673078023 8.20682598350704e-05) (0.095432330811069 0.047818192791575 8.34584482851299e-05) diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader index 84f182476..083e7714f 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict index 8452ccb03..f2082350d 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties index 9aba58cb0..b156eb822 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,37 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Pr Pr [0 0 0 0 0 0 0] 0.72; +Pr Pr [ 0 0 0 0 0 0 0 ] 0.72; -thermoType hThermo>>>>; -//thermoType hThermo>>>>; +thermoType ePsiThermo>>>>; -// Replacates constThermo (Cp = const) -/* -mixture N2 - 1 28.01348 - 0 10000 1000 - 3.5 0 0 0 0 0 0 - 3.5 0 0 0 0 0 0 -// 3.5 0 0 0 0 -1043.52 0 -// 3.5 0 0 0 0 -1043.52 0 -// 0.0268142 0.3177838 -11.3155513; // Blottner - 1.458e-06 110; // Sutherland -*/ -// janafThermo +mixture N2 1 28.01348 100 10000 1000 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 1.458e-06 110; -mixture N2 - 1 28.01348 - 100 10000 1000 - 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 - -923.93753 5.8718221 - 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 - -1046.9637 2.9674391 -// 0.0268142 0.3177838 -11.3155513; // Blottner - 1.458e-06 110; // Sutherland // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict index c8548cf17..11ef1e4f4 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +application rhoCentralFoam; + startFrom latestTime; startTime 0.005; @@ -46,4 +49,5 @@ maxCo 0.5; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes index feda8725d..857c5e091 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//fluxScheme Tadmor; // KT -fluxScheme Kurganov; // KNP +fluxScheme Kurganov; ddtSchemes { @@ -30,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -40,13 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; + default linear; reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; -// reconstruct(rho) upwind; -// reconstruct(U) upwind; -// reconstruct(T) upwind; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -54,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution index c2802217a..1b0e6d8a3 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09 - relTol 0.1; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + e + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09 relTol 0.1; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict index f8a45e93a..bfa1dffb9 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,50 +10,48 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPointFace; -setFormat raw; -surfaceFormat vtk; + +setFormat raw; + +surfaceFormat vtk; sets ( cone25 { - type face; - axis x; - start ( 0.0 0.0 0.0); - end ( 92.08087e-03 42.939e-03 0.0); - nPoints 92; + type face; + axis x; + start ( 0 0 0 ); + end ( 0.09208087 0.042939 0 ); + nPoints 92; } - cone55 { - type face; - axis x; - start ( 92.08087e-03 42.939e-03 0.0); - end ( 153.6830e-03 130.92e-03 0.0); - nPoints 61; + type face; + axis x; + start ( 0.09208087 0.042939 0 ); + end ( 0.153683 0.13092 0 ); + nPoints 61; } - base { - type face; - axis x; - start ( 153.6830e-03 130.92e-03 0.0); - end ( 193.6750e-03 130.92e-03 0.0); - nPoints 40; + type face; + axis x; + start ( 0.153683 0.13092 0 ); + end ( 0.193675 0.13092 0 ); + nPoints 40; } ); -surfaces (); +surfaces ( ); + +fields ( p wallHeatTransRate ); -fields -( - p - wallHeatTransRate -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma b/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma index 615abf90e..81a1384e4 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T index aacaf4b9c..007785e3b 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U index 453082b74..932d7ae8e 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p index 8b107b6fb..583933f34 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict index 96a0279be..b85cc7385 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary index 492c762fd..953d93eb9 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties index 86b760a58..89911f12d 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,17 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; +thermoType ePsiThermo>>>>; + +// 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 +// and gamma = 7/5 +mixture normalisedGas 1 11640.3 2.5 0 0 1; -mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0; // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict index 6f0806d91..eb4fe5419 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +application rhoCentralFoam; + startFrom startTime; startTime 0; @@ -42,10 +45,11 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep yes; +adjustTimeStep yes; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1; // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes index eb9e787ae..857c5e091 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//fluxScheme Tadmor; // KT -fluxScheme Kurganov; // KNP +fluxScheme Kurganov; ddtSchemes { @@ -30,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -40,13 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; - reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; -// reconstruct(rho) upwind; -// reconstruct(U) upwind; -// reconstruct(T) upwind; + default linear; + reconstruct(rho) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -54,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution index 19baedc7b..48811594f 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10 relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T index aa1d3670d..98ec2dbd2 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U index a03609f81..99db71dfd 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p index 174bc8a2a..9c672841a 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict index 4a22ae98a..cbcfc6c55 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary index e04508a4d..02bf23d1c 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties index 86b760a58..e2ad38ed5 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; +thermoType ePsiThermo>>>>; + +mixture normalisedGas 1 11640.3 2.5 0 0 1; -mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0; // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict index 468da70d9..e4dca7f65 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application centralFoam; +application rhoCentralFoam; startFrom startTime; @@ -52,4 +53,5 @@ maxCo 0.2; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes index eb9e787ae..857c5e091 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//fluxScheme Tadmor; // KT -fluxScheme Kurganov; // KNP +fluxScheme Kurganov; ddtSchemes { @@ -30,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -40,13 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; - reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; -// reconstruct(rho) upwind; -// reconstruct(U) upwind; -// reconstruct(T) upwind; + default linear; + reconstruct(rho) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -54,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution index 19baedc7b..6af5b3181 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,46 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10; + relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T index 6ad695f31..26cd813bf 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T +++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U index abe534b5f..501712894 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U +++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p index 85c9743d3..7a9a0ce1a 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p +++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/T b/tutorials/compressible/rhoCentralFoam/shockTube/0/T index 6ad695f31..26cd813bf 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0/T +++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/U b/tutorials/compressible/rhoCentralFoam/shockTube/0/U index abe534b5f..501712894 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0/U +++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/p b/tutorials/compressible/rhoCentralFoam/shockTube/0/p index 85c9743d3..7a9a0ce1a 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0/p +++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict index bb2b80e06..5de374c37 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary index 606cf5f91..ac9c08a82 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary @@ -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: 1.6.x | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties index 32f2bf50c..3d0e0fb08 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; +thermoType ePsiThermo>>>>; + +mixture air 1 28.9 717.5 0 0 0.7; -mixture air 1 28.96 1004.5 2.544e+06 0.0 1.0; // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict index 1e1f1a16a..4446eb55c 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,44 +10,46 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -applicationClass rhopSonicFoam; +application rhoCentralFoam; -startFrom startTime; +startFrom startTime; -startTime 0; +startTime 0; -stopAt endTime; +stopAt endTime; -endTime 0.007; +endTime 0.007; -deltaT 1e-06; +deltaT 1e-06; -writeControl adjustableRunTime; +writeControl adjustableRunTime; -writeInterval 0.001; +writeInterval 0.001; -cycleWrite 0; +cycleWrite 0; -writeFormat ascii; +writeFormat ascii; -writePrecision 6; +writePrecision 6; writeCompression uncompressed; -timeFormat general; +timeFormat general; -timePrecision 6; +timePrecision 6; runTimeModifiable yes; -adjustTimeStep yes; +adjustTimeStep yes; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1; // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes index 8bf05386b..857c5e091 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluxScheme Kurganov; +fluxScheme Kurganov; ddtSchemes { @@ -29,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -39,10 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; + default linear; reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -50,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution index 19baedc7b..48811594f 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10 relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict index 460a73553..99cbdad85 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,32 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPoint; -setFormat raw; -surfaceFormat vtk; + +setFormat raw; + +surfaceFormat vtk; sets ( line { - type face; - axis x; - start (-5 0 0); - end ( 5 0 0); - nPoints 100; + type face; + axis x; + start ( -5 0 0 ); + end ( 5 0 0 ); + nPoints 100; } ); -surfaces (); +surfaces (); + +fields ( p U.component(0) T rho ); -fields -( - p U.component(0) T rho -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict index 83d5d1949..d03403bf1 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volVectorFieldValue U (0 0 0) - volScalarFieldValue T 348.43206 - volScalarFieldValue p 1.0e+5 -); +defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); -regions -( - boxToCell - { - box (0 -1 -1) (5 1 1); +regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); - fieldValues - ( - volScalarFieldValue T 278.74564 - volScalarFieldValue p 1.0e+4 - ); - } -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T index fa10420da..74c9fa43c 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U index 1662e8922..c903efcbb 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p index 8b107b6fb..583933f34 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict index 8438e9d74..c9d3dd16e 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary index 4dcb5b5d7..aa6a870c5 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties index 86b760a58..e2ad38ed5 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; +thermoType ePsiThermo>>>>; + +mixture normalisedGas 1 11640.3 2.5 0 0 1; -mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0; // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict index e4bc93f3d..8dc253af7 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -applicationClass rhopSonicFoam; +application rhoCentralFoam; startFrom startTime; @@ -24,7 +25,7 @@ stopAt endTime; endTime 0.2; -deltaT 1e-04; +deltaT 0.0001; writeControl runTime; @@ -46,8 +47,9 @@ runTimeModifiable yes; adjustTimeStep no; -maxCo 1.0; +maxCo 1; maxDeltaT 1e-06; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes index 56ca99dbd..857c5e091 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluxScheme Kurganov; +fluxScheme Kurganov; ddtSchemes { @@ -29,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -39,10 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; - reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; + default linear; + reconstruct(rho) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -50,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution index 19baedc7b..48811594f 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10 relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/T b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/T index 5af80a608..e1df94398 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/T +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/U index 54bfd05ea..fa9053408 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/U +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat new file mode 100644 index 000000000..28bd4effe --- /dev/null +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat @@ -0,0 +1,57 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + front + { + type alphatWallFunction; + value uniform 0; + } + back + { + type alphatWallFunction; + value uniform 0; + } + wall + { + type alphatWallFunction; + value uniform 0; + } + porosityWall + { + type alphatWallFunction; + value uniform 0; + } + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon index ca6ec2ff0..295245b59 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,50 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + dimensions [0 2 -3 0 0 0 0]; internalField uniform 200; boundaryField { - front { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 200; } back { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 200; } wall { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 200; } porosityWall { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 200; } - inlet { - type turbulentMixingLengthDissipationRateInlet; + type compressible::turbulentMixingLengthDissipationRateInlet; mixingLength 0.005; - value $internalField; + value uniform 200; } - outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 200; + value uniform 200; } - } + + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k index c1cf0e833..1b336a3d3 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,50 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + dimensions [0 2 -2 0 0 0 0]; internalField uniform 1; boundaryField { - front { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } back { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } wall { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } porosityWall { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } - inlet { type turbulentIntensityKineticEnergyInlet; intensity 0.05; - value $internalField; + value uniform 1; } - outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 1; + value uniform 1; } - } + + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut new file mode 100644 index 000000000..3caf2a763 --- /dev/null +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut @@ -0,0 +1,57 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + front + { + type mutWallFunction; + value uniform 0; + } + back + { + type mutWallFunction; + value uniform 0; + } + wall + { + type mutWallFunction; + value uniform 0; + } + porosityWall + { + type mutWallFunction; + value uniform 0; + } + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/p b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/p index 473d75feb..9dc24513e 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/p +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties index 1af73fab2..81b1ec911 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,89 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict index 545db4127..0438819b2 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 index eb610e520..6d6d06693 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 @@ -1,14 +1,14 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + `format' ascii; class dictionary; object blockMeshDict; } diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary index 540223e58..8527f9106 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary @@ -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: 1.6.x | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -front -{ - type wall; - nFaces 700; - startFace 63400; -} - -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 400; - startFace 67800; -} - -outlet -{ - type patch; - nFaces 400; - startFace 68200; -} + front + { + type wall; + nFaces 700; + startFace 63400; + } + 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 400; + startFace 67800; + } + outlet + { + type patch; + nFaces 400; + startFace 68200; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones index 0570df394..634799837 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object porousZones; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties index c38497fac..a2c84a89d 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,19 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; -mixture - air 1 28.9 // specieThermo - 1007 0 // hConstThermo -// 1.84766e-05 0.7 // constTransport - 300K -// 2.68477e-05 0.7 // constTransport - 500K -// 3.93094e-05 0.7 // constTransport - 900K - 1.4792e-06 116 // sutherlandTransport (Star-CD) -// 1.4584e-06 110.33 // sutherlandTransport (European Space Agency) -; +thermoType hPsiThermo>>>>; + +mixture air 1 28.9 1007 0 1.4792e-06 116; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/turbulenceProperties new file mode 100644 index 000000000..f6753662e --- /dev/null +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict index 47dad418f..4e53754bf 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application rhoTurbFoam; +application rhoPimpleFoam; startFrom startTime; @@ -50,4 +51,5 @@ maxCo 10; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes index 3eb78297f..53fb7839f 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,7 +29,6 @@ gradSchemes divSchemes { default none; - div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phiU,p) Gauss linear; @@ -37,7 +37,6 @@ divSchemes div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; div(phi,omega) Gauss upwind; - div((rho*R)) Gauss linear; div(R) Gauss linear; div(U) Gauss linear; @@ -47,7 +46,6 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear corrected; laplacian(mut,U) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; @@ -71,8 +69,8 @@ snGradSchemes fluxRequired { default no; - - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution index bdf27a66c..583c3637a 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,98 +10,120 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; - UFinal PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0.1; + } + + UFinal { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - p PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0.01; - }; - pFinal PCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.01; + } + + pFinal { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - h PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + h { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; - hFinal PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0.1; + } + + hFinal { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - omega PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + omega { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PIMPLE { - nOuterCorrectors 50; - nCorrectors 1; + nOuterCorrectors 50; + nCorrectors 1; nNonOrthogonalCorrectors 0; momentumPredictor yes; - - pMin pMin [1 -1 -2 0 0 0 0] 1000; + pMin pMin [ 1 -1 -2 0 0 0 0 ] 1000; } relaxationFactors { - U 0.7; - p 0.3; - rho 0.05; - h 0.7; - k 0.7; - omega 0.7; + U 0.7; + p 0.3; + rho 0.05; + h 0.7; + k 0.7; + omega 0.7; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 new file mode 120000 index 000000000..f1c4a884b --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 @@ -0,0 +1 @@ +../angledDuctImplicit/0 \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant new file mode 120000 index 000000000..28205c782 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant @@ -0,0 +1 @@ +../angledDuctImplicit/constant \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict index 92b222d86..10de02b0d 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,4 +47,5 @@ graphFormat raw; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes index 049181279..31f99e4e2 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,80 +10,60 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default steadyState; + default steadyState; } gradSchemes { - default Gauss linear; - // UEqn - grad(U) Gauss linear; - grad(p) Gauss linear; + default Gauss linear; + grad(U) Gauss linear; + grad(p) Gauss linear; } divSchemes { - //- default Gauss upwind; - // UEqn - div(phi,U) Gauss upwind; - div((muEff*dev2(grad(U).T()))) Gauss linear; - // hEqn - div(phi,h) Gauss upwind; - // epsilonEqn - div(phi,epsilon) Gauss upwind; - // kEqn - div(phi,k) Gauss upwind; - - // experimental - div(phid,p) Gauss linear; + div(phi,U) Gauss upwind; + div((muEff*dev2(grad(U).T()))) Gauss linear; + div(phi,h) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(phi,k) Gauss upwind; + div(phid,p) Gauss linear; } laplacianSchemes { - //- default Gauss linear corrected; - // UEqn - laplacian(muEff,U) Gauss linear corrected; - - // hEqn - laplacian(alphaEff,h) Gauss linear corrected; - - // pCorrect + laplacian(muEff,U) Gauss linear corrected; + laplacian(alphaEff,h) Gauss linear corrected; laplacian((rho|A(U)),p) Gauss linear corrected; - - laplacian((rho*rAU),p) Gauss linear corrected; - - // epsilonEqn - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - - // kEqn - laplacian(DkEff,k) Gauss linear corrected; - - // potential - laplacian(1,p) Gauss linear corrected; + laplacian((rho*rAU),p) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(1,p) Gauss linear corrected; } interpolationSchemes { - default linear; - // default upwind phi; - div(U,p) upwind phi; + default linear; + div(U,p) upwind phi; } snGradSchemes { - default corrected; + default corrected; } fluxRequired { - default no; - p; + default no; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution index 83ed3bd9a..844c55c57 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,73 +10,76 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p GAMG + p { - tolerance 1e-8; - relTol 0.05; - - smoother GaussSeidel; - + solver GAMG; + tolerance 1e-08; + relTol 0.05; + smoother GaussSeidel; cacheAgglomeration off; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - U smoothSolver + U { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-6; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-06; + relTol 0.1; + } - h PBiCG + h { - preconditioner DILU; - tolerance 1e-6; - relTol 0.1; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0.1; + } - k smoothSolver + k { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-7; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } - epsilon smoothSolver + epsilon { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-7; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } } SIMPLE { - // nUCorrectors 0; - nNonOrthogonalCorrectors 0; - pMin pMin [1 -1 -2 0 0 0 0] 100; + nNonOrthogonalCorrectors 0; + pMin pMin [ 1 -1 -2 0 0 0 0 ] 100; } relaxationFactors { - p 0.3; - rho 0.05; - U 0.7; - k 0.7; - epsilon 0.7; - h 0.5; + p 0.3; + rho 0.05; + U 0.7; + k 0.7; + epsilon 0.7; + h 0.5; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T index 5af80a608..e1df94398 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U index afea1eb58..88f509425 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat new file mode 100644 index 000000000..28bd4effe --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat @@ -0,0 +1,57 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + front + { + type alphatWallFunction; + value uniform 0; + } + back + { + type alphatWallFunction; + value uniform 0; + } + wall + { + type alphatWallFunction; + value uniform 0; + } + porosityWall + { + type alphatWallFunction; + value uniform 0; + } + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon index ca6ec2ff0..85b4039b8 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon @@ -1,55 +1,64 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; + +dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 200; boundaryField { - front { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 200; } + back { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 200; } + wall { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 200; } + porosityWall { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 200; } inlet { - type turbulentMixingLengthDissipationRateInlet; + type compressible::turbulentMixingLengthDissipationRateInlet; mixingLength 0.005; - value $internalField; + value uniform 200; } outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 200; + value uniform 200; } - } + + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k index c1cf0e833..fc7987820 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k @@ -1,55 +1,64 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; + +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 1; boundaryField { - front { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } + back { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } + wall { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } + porosityWall { - type zeroGradient; + type compressible::kqRWallFunction; + value uniform 1; } inlet { type turbulentIntensityKineticEnergyInlet; intensity 0.05; - value $internalField; + value uniform 1; } outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 1; + value uniform 1; } - } + + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut new file mode 100644 index 000000000..a557d6233 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut @@ -0,0 +1,62 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 1 -1 -1 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + front + { + type mutWallFunction; + value uniform 0; + } + + back + { + type mutWallFunction; + value uniform 0; + } + + wall + { + type mutWallFunction; + value uniform 0; + } + + porosityWall + { + type mutWallFunction; + value uniform 0; + } + + inlet + { + type calculated; + value uniform 0; + } + + outlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p index 473d75feb..9dc24513e 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties index 1af73fab2..48cf724e2 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties @@ -1,98 +1,25 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict index 545db4127..0438819b2 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 index eb610e520..6d6d06693 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 @@ -1,14 +1,14 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + `format' ascii; class dictionary; object blockMeshDict; } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary new file mode 100644 index 000000000..5adb07e26 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +6 +( + front + { + type wall; + nFaces 700; + startFace 63400; + } + 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 400; + startFace 67800; + } + outlet + { + type patch; + nFaces 400; + startFace 68200; + } +) + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones index 0570df394..634799837 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object porousZones; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties index c38497fac..578750523 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties @@ -1,28 +1,23 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hThermo>>>>; -mixture - air 1 28.9 // specieThermo - 1007 0 // hConstThermo -// 1.84766e-05 0.7 // constTransport - 300K -// 2.68477e-05 0.7 // constTransport - 500K -// 3.93094e-05 0.7 // constTransport - 900K - 1.4792e-06 116 // sutherlandTransport (Star-CD) -// 1.4584e-06 110.33 // sutherlandTransport (European Space Agency) -; +thermoType hPsiThermo>>>>; + +mixture air 1 28.9 1007 0 1.4792e-06 116; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict index 047374fa6..88d62b98c 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict @@ -1,15 +1,16 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,4 +47,5 @@ graphFormat raw; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes index 1ba8b4472..9969e32dd 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes @@ -1,87 +1,68 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default steadyState; + default steadyState; } gradSchemes { - default Gauss linear; - // UEqn - grad(U) Gauss linear; - grad(p) Gauss linear; + default Gauss linear; + grad(U) Gauss linear; + grad(p) Gauss linear; } divSchemes { - //- default Gauss upwind; - // UEqn - div(phi,U) Gauss upwind; - div((muEff*dev2(grad(U).T()))) Gauss linear; - // hEqn - div(phi,h) Gauss upwind; - // epsilonEqn - div(phi,epsilon) Gauss upwind; - // kEqn - div(phi,k) Gauss upwind; - - // experimental - div(phid,p) Gauss linear; + div(phi,U) Gauss upwind; + div((muEff*dev2(grad(U).T()))) Gauss linear; + div(phi,h) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(phi,k) Gauss upwind; + div(phid,p) Gauss linear; } laplacianSchemes { - //- default Gauss linear corrected; - // UEqn - laplacian(muEff,U) Gauss linear corrected; - - // hEqn - laplacian(alphaEff,h) Gauss linear corrected; - - // pCorrect + laplacian(muEff,U) Gauss linear corrected; + laplacian(alphaEff,h) Gauss linear corrected; laplacian((rho*rAU),p) Gauss linear corrected; - - // epsilonEqn - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - - // kEqn - laplacian(DkEff,k) Gauss linear corrected; - - // potential - laplacian(1,p) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(1,p) Gauss linear corrected; } interpolationSchemes { - default linear; - // default upwind phi; - div(U,p) upwind phi; + default linear; + div(U,p) upwind phi; } snGradSchemes { - default corrected; + default corrected; } fluxRequired { - default no; - p; + default no; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution index 4a4597675..334b1287b 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -1,74 +1,77 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p GAMG + p { - tolerance 1e-8; - relTol 0.05; - - smoother GaussSeidel; - + solver GAMG; + tolerance 1e-08; + relTol 0.05; + smoother GaussSeidel; cacheAgglomeration off; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - h PBiCG + h { - preconditioner DILU; - tolerance 1e-6; - relTol 0.1; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0.1; + } - k smoothSolver + k { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-7; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } - epsilon smoothSolver + epsilon { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-7; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } } SIMPLE { - nUCorrectors 2; - nNonOrthogonalCorrectors 0; - pMin pMin [1 -1 -2 0 0 0 0] 100; + nUCorrectors 2; + nNonOrthogonalCorrectors 0; + pMin pMin [ 1 -1 -2 0 0 0 0 ] 100; } relaxationFactors { - p 0.3; - rho 1; - U 0.7; - k 0.9; - epsilon 0.9; - h 0.9; + p 0.3; + rho 1; + U 0.7; + k 0.9; + epsilon 0.9; + h 0.9; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/T b/tutorials/compressible/rhoSonicFoam/forwardStep/0/T index fa10420da..74c9fa43c 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/0/T +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/U b/tutorials/compressible/rhoSonicFoam/forwardStep/0/U index 9e9868472..488db5a67 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/0/U +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/0/p b/tutorials/compressible/rhoSonicFoam/forwardStep/0/p index 8b107b6fb..583933f34 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/0/p +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict index 6f7910831..43f728fbe 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary index 9b4762986..9deada52f 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -inlet -{ - type patch; - nFaces 50; - startFace 10325; -} - -outlet -{ - type patch; - nFaces 40; - startFace 10375; -} - -bottom -{ - type symmetryPlane; - nFaces 25; - startFace 10415; -} - -top -{ - type symmetryPlane; - nFaces 125; - startFace 10440; -} - -obstacle -{ - type patch; - nFaces 110; - startFace 10565; -} - -defaultFaces -{ - type empty; - nFaces 10500; - startFace 10675; -} + inlet + { + type patch; + nFaces 50; + startFace 10325; + } + outlet + { + type patch; + nFaces 40; + startFace 10375; + } + bottom + { + type symmetryPlane; + nFaces 25; + startFace 10415; + } + top + { + type symmetryPlane; + nFaces 125; + startFace 10440; + } + obstacle + { + type patch; + nFaces 110; + startFace 10565; + } + defaultFaces + { + type empty; + nFaces 10500; + startFace 10675; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties index 06d85de3f..d014c6739 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 1.78571; +// 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 +// and gamma = 7/5 +Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571; +R R [ 0 2 -2 -1 0 0 0 ] 0.714286; -R R [0 2 -2 -1 0 0 0] 0.714286; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict index 323ae66cd..467752f0e 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application rhoSonicFoam; +application rhoSonicFoam; startFrom latestTime; @@ -44,4 +45,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes index 2f67c16f8..99533cc6a 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -53,7 +54,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution index 8275db3d4..9a29517e8 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,36 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PBiCG + p { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rho PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoU PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoU { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoE PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoE { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO @@ -48,4 +56,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T index 6ad695f31..26cd813bf 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U index abe534b5f..501712894 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU index c59311edc..0fd4b44e6 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p index 85c9743d3..7a9a0ce1a 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/T b/tutorials/compressible/rhoSonicFoam/shockTube/0/T index 6ad695f31..fa69ad914 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0/T +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/T @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,1030 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 0 0 1 0 0 0]; -internalField uniform 1; +internalField nonuniform List +1000 +( +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +) +; boundaryField { - sides + sides { type zeroGradient; } - - empty + empty { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/U b/tutorials/compressible/rhoSonicFoam/shockTube/0/U index abe534b5f..4f2fb4117 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0/U +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/U @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; + location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,15 +21,15 @@ internalField uniform (0 0 0); boundaryField { - sides + sides { type zeroGradient; } - - empty + empty { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/magU b/tutorials/compressible/rhoSonicFoam/shockTube/0/magU index c59311edc..0fd4b44e6 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0/magU +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/magU @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/p b/tutorials/compressible/rhoSonicFoam/shockTube/0/p index 85c9743d3..98a7f4a6a 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0/p +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/p @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,1030 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 0; +internalField nonuniform List +1000 +( +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +) +; boundaryField { - sides + sides { type zeroGradient; } - - empty + empty { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun index 6ce183dba..4f0a80edd 100755 --- a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun +++ b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun @@ -1,9 +1,10 @@ #!/bin/sh + # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application="rhoSonicFoam" +# Get application name +application=`getApplication` runApplication blockMesh runApplication setFields diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties b/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties index f3770d397..00d4d0784 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties +++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,24 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object initProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -x0 0 ; +x0 0; -pL 1.0e+5 ; -TL 348.43206 ; -UL ( 0 0 0 ) ; +pL 100000; + +TL 348.432; + +UL ( 0 0 0 ); + +pR 10000; + +TR 278.746; + +UR ( 0 0 0 ); -pR 1.0e+4 ; -TR 278.74564 ; -UR ( 0 0 0 ) ; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict index b724fbaa1..c9bce43fb 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary index 0f1a86e2c..95086be56 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,25 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 2 ( -sides -{ - type patch; - nFaces 2; - startFace 999; -} - -empty -{ - type empty; - nFaces 4000; - startFace 1001; -} + sides + { + type patch; + nFaces 2; + startFace 999; + } + empty + { + type empty; + nFaces 4000; + startFace 1001; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties b/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties index 059e9ca5d..9225eccc0 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties +++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 717.5; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5; + +R R [ 0 2 -2 -1 0 0 0 ] 287; -R R [0 2 -2 -1 0 0 0] 287; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict index c7b171b29..229b6c704 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application rhoSonicFoam; +application rhoSonicFoam; startFrom startTime; @@ -44,4 +45,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes index 2f67c16f8..99533cc6a 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -53,7 +54,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution index 8275db3d4..9a29517e8 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,36 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PBiCG + p { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rho PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoU PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoU { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoE PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoE { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO @@ -48,4 +56,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict index 6e6e27cd9..3d179ac9c 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,35 +10,30 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPoint; -setFormat raw; +setFormat raw; -sets +sets ( data { - type uniform; - - axis x; - start (-4.995 0 0); - end (4.995 0 0); - nPoints 1000; + type uniform; + axis x; + start ( -4.995 0 0 ); + end ( 4.995 0 0 ); + nPoints 1000; } ); -surfaces -(); +surfaces (); + +fields ( T magU p ); -fields -( - T - magU - p -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict index 83d5d1949..d03403bf1 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volVectorFieldValue U (0 0 0) - volScalarFieldValue T 348.43206 - volScalarFieldValue p 1.0e+5 -); +defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); -regions -( - boxToCell - { - box (0 -1 -1) (5 1 1); +regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); - fieldValues - ( - volScalarFieldValue T 278.74564 - volScalarFieldValue p 1.0e+4 - ); - } -); // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T index 6ad695f31..26cd813bf 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T +++ b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U index abe534b5f..501712894 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U +++ b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p index 85c9743d3..7a9a0ce1a 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p +++ b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/T b/tutorials/compressible/rhopSonicFoam/shockTube/0/T index 6ad695f31..26cd813bf 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/0/T +++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/U b/tutorials/compressible/rhopSonicFoam/shockTube/0/U index abe534b5f..501712894 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/0/U +++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/p b/tutorials/compressible/rhopSonicFoam/shockTube/0/p index 85c9743d3..7a9a0ce1a 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/0/p +++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun index 641510924..eede9049d 100755 --- a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun +++ b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun @@ -2,7 +2,7 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="rhopSonicFoam" +application=`getApplication` runApplication blockMesh runApplication setFields diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict index bb2b80e06..5de374c37 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary index 2e49b61dd..5d62e0b99 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary +++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,25 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 2 ( -sides -{ - type patch; - nFaces 2; - startFace 99; -} - -empty -{ - type empty; - nFaces 400; - startFace 101; -} + sides + { + type patch; + nFaces 2; + startFace 99; + } + empty + { + type empty; + nFaces 400; + startFace 101; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties b/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties index 059e9ca5d..9225eccc0 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties +++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 717.5; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5; + +R R [ 0 2 -2 -1 0 0 0 ] 287; -R R [0 2 -2 -1 0 0 0] 287; // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict index e17a0a5bc..4609dc364 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,44 +10,46 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -applicationClass rhopSonicFoam; +application rhopSonicFoam; -startFrom startTime; +startFrom startTime; -startTime 0; +startTime 0; -stopAt endTime; +stopAt endTime; -endTime 0.007; +endTime 0.007; -deltaT 2e-05; +deltaT 2e-05; -writeControl runTime; +writeControl runTime; -writeInterval 0.001; +writeInterval 0.001; -purgeWrite 0; +purgeWrite 0; -writeFormat ascii; +writeFormat ascii; -writePrecision 6; +writePrecision 6; writeCompression uncompressed; -timeFormat general; +timeFormat general; -timePrecision 6; +timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.05; +maxCo 0.05; + +maxDeltaT 1; -maxDeltaT 1; // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes index d21dcd7c0..918b2bcd7 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -48,7 +49,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution index 945f35d9e..202961f80 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,49 +10,60 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-15; - relTol 0; - }; - rho PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoU PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoU { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoE PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoE { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoH PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoH { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO { nOuterCorrectors 3; - nCorrectors 1; - HbyAblend 0.0; + nCorrectors 1; + HbyAblend 0; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict index 83d5d1949..d03403bf1 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volVectorFieldValue U (0 0 0) - volScalarFieldValue T 348.43206 - volScalarFieldValue p 1.0e+5 -); +defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); -regions -( - boxToCell - { - box (0 -1 -1) (5 1 1); +regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); - fieldValues - ( - volScalarFieldValue T 278.74564 - volScalarFieldValue p 1.0e+4 - ); - } -); // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T index fa10420da..74c9fa43c 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U index a331aa9cb..ad82f1f25 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p index 3daba9e43..9ec17cbfc 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict index 8438e9d74..c9d3dd16e 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary index a3ca808b3..aa6a870c5 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -inlet -{ - type patch; - nFaces 40; - startFace 9440; -} - -outlet -{ - type patch; - nFaces 40; - startFace 9480; -} - -bottom -{ - type symmetryPlane; - nFaces 40; - startFace 9520; -} - -top -{ - type symmetryPlane; - nFaces 120; - startFace 9560; -} - -obstacle -{ - type patch; - nFaces 80; - startFace 9680; -} - -defaultFaces -{ - type empty; - nFaces 9600; - startFace 9760; -} + inlet + { + type patch; + nFaces 40; + startFace 9440; + } + outlet + { + type patch; + nFaces 40; + startFace 9480; + } + bottom + { + type symmetryPlane; + nFaces 40; + startFace 9520; + } + top + { + type symmetryPlane; + nFaces 120; + startFace 9560; + } + obstacle + { + type patch; + nFaces 80; + startFace 9680; + } + defaultFaces + { + type empty; + nFaces 9600; + startFace 9760; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties index 06d85de3f..1d7d089e3 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 1.78571; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571; + +R R [ 0 2 -2 -1 0 0 0 ] 0.714286; -R R [0 2 -2 -1 0 0 0] 0.714286; // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict index e4bc93f3d..711c87717 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -applicationClass rhopSonicFoam; +application rhopSonicFoam; startFrom startTime; @@ -24,7 +25,7 @@ stopAt endTime; endTime 0.2; -deltaT 1e-04; +deltaT 0.0001; writeControl runTime; @@ -46,8 +47,9 @@ runTimeModifiable yes; adjustTimeStep no; -maxCo 1.0; +maxCo 1; maxDeltaT 1e-06; + // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes index ad2e2bb1e..11e3f0b14 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,14 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; -} + default Euler; +} gradSchemes { @@ -32,7 +33,7 @@ divSchemes laplacianSchemes { - default Gauss linear corrected; + default Gauss linear corrected; } interpolationSchemes @@ -48,7 +49,8 @@ snGradSchemes fluxRequired { default yes; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution index c0d4b7c2e..296ffb331 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,49 +10,60 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-15; - relTol 0; - }; - rho PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoU PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoU { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoE PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoE { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoH PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoH { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO { nOuterCorrectors 2; - nCorrectors 2; - HbyAblend 0.95; + nCorrectors 2; + HbyAblend 0.95; } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T new file mode 100644 index 000000000..74c9fa43c --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T @@ -0,0 +1,55 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 1; + } + + outlet + { + type zeroGradient; + } + + bottom + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + obstacle + { + type zeroGradient; + } + + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U new file mode 100644 index 000000000..488db5a67 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + inlet + { + type fixedValue; + value uniform (3 0 0); + } + + outlet + { + type zeroGradient; + } + + bottom + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + obstacle + { + type fixedValue; + value uniform (0 0 0); + } + + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p new file mode 100644 index 000000000..5e993bac2 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p @@ -0,0 +1,63 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 1; + } + + outlet + { + type waveTransmissive; + field p; + phi phi; + rho rho; + psi psi; + gamma 1.4; + fieldInf 1; + lInf 3; + value uniform 1; + } + + bottom + { + type symmetryPlane; + } + + top + { + type symmetryPlane; + } + + obstacle + { + type zeroGradient; + } + + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict new file mode 100644 index 000000000..43f728fbe --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict @@ -0,0 +1,81 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 1; + +vertices +( + (0 0 -0.05) + (0.6 0 -0.05) + (0 0.2 -0.05) + (0.6 0.2 -0.05) + (3 0.2 -0.05) + (0 1 -0.05) + (0.6 1 -0.05) + (3 1 -0.05) + (0 0 0.05) + (0.6 0 0.05) + (0 0.2 0.05) + (0.6 0.2 0.05) + (3 0.2 0.05) + (0 1 0.05) + (0.6 1 0.05) + (3 1 0.05) +); + +blocks +( + hex (0 1 3 2 8 9 11 10) (25 10 1) simpleGrading (1 1 1) + hex (2 3 6 5 10 11 14 13) (25 40 1) simpleGrading (1 1 1) + hex (3 4 7 6 11 12 15 14) (100 40 1) simpleGrading (1 1 1) +); + +edges +( +); + +patches +( + patch inlet + ( + (0 8 10 2) + (2 10 13 5) + ) + patch outlet + ( + (4 7 15 12) + ) + symmetryPlane bottom + ( + (0 1 9 8) + ) + symmetryPlane top + ( + (5 13 14 6) + (6 14 15 7) + ) + patch obstacle + ( + (1 3 11 9) + (3 4 12 11) + ) +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary new file mode 100644 index 000000000..9deada52f --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +6 +( + inlet + { + type patch; + nFaces 50; + startFace 10325; + } + outlet + { + type patch; + nFaces 40; + startFace 10375; + } + bottom + { + type symmetryPlane; + nFaces 25; + startFace 10415; + } + top + { + type symmetryPlane; + nFaces 125; + startFace 10440; + } + obstacle + { + type patch; + nFaces 110; + startFace 10565; + } + defaultFaces + { + type empty; + nFaces 10500; + startFace 10675; + } +) + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties new file mode 100644 index 000000000..6558fda69 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType ePsiThermo>>>>; + +// 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 +// and gamma = 7/5 +mixture normalisedGas 1 11640.31 2.5 0 0 1; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties new file mode 100644 index 000000000..9cfc50a3d --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict new file mode 100644 index 000000000..224396912 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application sonicFoam; + +startFrom startTime; + +startTime 0; + +stopAt endTime; + +endTime 10; + +deltaT 0.002; + +writeControl runTime; + +writeInterval 0.5; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes new file mode 100644 index 000000000..238a8cfb1 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes @@ -0,0 +1,65 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; + grad(p) Gauss linear; + grad(U) Gauss linear; +} + +divSchemes +{ + default none; + div(phi,U) Gauss upwind; + div(phid,p) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; + div(phiU,p) Gauss limitedLinear 1; + div((muEff*dev2(grad(U).T()))) Gauss linear 1; +} + +laplacianSchemes +{ + default none; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; + laplacian(alphaEff,e) Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p ; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution new file mode 100644 index 000000000..93b01a828 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution @@ -0,0 +1,60 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + p + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + e + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } +} + +PISO +{ + nCorrectors 2; + nNonOrthogonalCorrectors 0; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T new file mode 100644 index 000000000..26cd813bf --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + sides + { + type zeroGradient; + } + + empty + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U new file mode 100644 index 000000000..501712894 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + sides + { + type zeroGradient; + } + + empty + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU new file mode 100644 index 000000000..0fd4b44e6 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object magU; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + sides + { + type calculated; + value uniform 0; + } + empty + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p new file mode 100644 index 000000000..7a9a0ce1a --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + sides + { + type zeroGradient; + } + + empty + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T new file mode 100644 index 000000000..26cd813bf --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + sides + { + type zeroGradient; + } + + empty + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U new file mode 100644 index 000000000..501712894 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + sides + { + type zeroGradient; + } + + empty + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU new file mode 100644 index 000000000..0fd4b44e6 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object magU; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + sides + { + type calculated; + value uniform 0; + } + empty + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p new file mode 100644 index 000000000..7a9a0ce1a --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + sides + { + type zeroGradient; + } + + empty + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean new file mode 100755 index 000000000..c8dbbe4c9 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean @@ -0,0 +1,9 @@ +#!/bin/sh + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +cleanCase +rm -rf 0 +cp -r 0.org 0 +cleanSamples diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun new file mode 100755 index 000000000..bb2d19c9e --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun @@ -0,0 +1,11 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +application=`getApplication` + +runApplication blockMesh +runApplication setFields +runApplication $application +runApplication foamCalc mag U +runApplication sample diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict new file mode 100644 index 000000000..c9bce43fb --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict @@ -0,0 +1,60 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 1; + +vertices +( + (-5 -1 -1) + (5 -1 -1) + (5 1 -1) + (-5 1 -1) + (-5 -1 1) + (5 -1 1) + (5 1 1) + (-5 1 1) +); + +blocks +( + hex (0 1 2 3 4 5 6 7) (1000 1 1) simpleGrading (1 1 1) +); + +edges +( +); + +patches +( + patch sides + ( + (1 2 6 5) + (0 4 7 3) + ) + empty empty + ( + (0 1 5 4) + (5 6 7 4) + (3 7 6 2) + (0 3 2 1) + ) +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary new file mode 100644 index 000000000..95086be56 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +2 +( + sides + { + type patch; + nFaces 2; + startFace 999; + } + empty + { + type empty; + nFaces 4000; + startFace 1001; + } +) + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties new file mode 100644 index 000000000..3d0e0fb08 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties @@ -0,0 +1,23 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType ePsiThermo>>>>; + +mixture air 1 28.9 717.5 0 0 0.7; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties new file mode 100644 index 000000000..9cfc50a3d --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict new file mode 100644 index 000000000..113b70334 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application sonicFoam; + +startFrom startTime; + +startTime 0; + +stopAt endTime; + +endTime 0.007; + +deltaT 1e-05; + +writeControl runTime; + +writeInterval 0.001; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes new file mode 100644 index 000000000..238a8cfb1 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes @@ -0,0 +1,65 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; + grad(p) Gauss linear; + grad(U) Gauss linear; +} + +divSchemes +{ + default none; + div(phi,U) Gauss upwind; + div(phid,p) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; + div(phiU,p) Gauss limitedLinear 1; + div((muEff*dev2(grad(U).T()))) Gauss linear 1; +} + +laplacianSchemes +{ + default none; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; + laplacian(alphaEff,e) Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p ; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution new file mode 100644 index 000000000..58c5fb520 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution @@ -0,0 +1,60 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + p + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-15; + relTol 0; + } + + e + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } +} + +PISO +{ + nCorrectors 2; + nNonOrthogonalCorrectors 0; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict new file mode 100644 index 000000000..3d179ac9c --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict @@ -0,0 +1,39 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object sampleDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +interpolationScheme cellPoint; + +setFormat raw; + +sets +( + data + { + type uniform; + axis x; + start ( -4.995 0 0 ); + end ( 4.995 0 0 ); + nPoints 1000; + } +); + +surfaces (); + +fields ( T magU p ); + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict new file mode 100644 index 000000000..d03403bf1 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict @@ -0,0 +1,23 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object setFieldsDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); + +regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T new file mode 100644 index 000000000..41259fbd7 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 300; + +boundaryField +{ + INLE1 + { + type inletOutlet; + inletValue uniform 300; + value uniform 300; + } + + OUTL2 + { + type inletOutlet; + inletValue uniform 300; + value uniform 300; + } + + SYMP3 + { + type empty; + } + + WALL10 + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U new file mode 100644 index 000000000..c1e2d42a8 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (600 148.16 0); + +boundaryField +{ + INLE1 + { + type supersonicFreestream; + pInf 100000; + TInf 300; + UInf (600 148.16 0); + gamma 1.4; + value uniform (600 148.16 0); + } + + OUTL2 + { + type inletOutlet; + inletValue uniform (600 148.16 0); + value uniform (600 148.16 0); + } + + SYMP3 + { + type empty; + } + + WALL10 + { + type fixedValue; + value uniform (0 0 0); + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon new file mode 100644 index 000000000..8f09366b8 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object epsilon; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -3 0 0 0 0]; + +internalField uniform 25000; + +boundaryField +{ + INLE1 + { + type inletOutlet; + inletValue uniform 25000; + value uniform 25000; + } + + OUTL2 + { + type inletOutlet; + inletValue uniform 25000; + value uniform 25000; + } + + SYMP3 + { + type empty; + } + + WALL10 + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k new file mode 100644 index 000000000..93c09e904 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 1000; + +boundaryField +{ + INLE1 + { + type inletOutlet; + inletValue uniform 1000; + value uniform 1000; + } + + OUTL2 + { + type inletOutlet; + inletValue uniform 1000; + value uniform 1000; + } + + SYMP3 + { + type empty; + } + + WALL10 + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p new file mode 100644 index 000000000..ff9713364 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 100000; + +boundaryField +{ + INLE1 + { + type zeroGradient; + } + + OUTL2 + { + type waveTransmissive; + field p; + phi phi; + rho rho; + psi psi; + gamma 1.3; + fieldInf 100000; + lInf 1; + value uniform 100000; + } + + SYMP3 + { + type empty; + } + + WALL10 + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun new file mode 100755 index 000000000..29cc29abd --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun @@ -0,0 +1,23 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Get application name +application=`getApplication` + +runStarToFoam () +{ + if [ -f log.starToFoam ] ; then + echo "starToFoam already run on $PWD: remove log file to run" + else + echo "starToFoam: converting mesh $1" + starToFoam $1 > log.starToFoam 2>&1 + fi +} + +runStarToFoam prostar/nacaAirfoil +mv constant/polyMesh/boundary temp +sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \ + temp > constant/polyMesh/boundary +rm temp +runApplication $application diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes new file mode 100644 index 000000000..5bfc37a86 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes @@ -0,0 +1,8 @@ +nacaAirfoil +~~~~~~~~~~~ +* large domain with airfoil section near centre +* extremely non-orthogonal, highly skew mesh refined around the airfoil +* running at Mach 1.78 +* limited 0.5 on all laplacianSchemes because the mesh is so poor +* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running +* deltaT can be increased later in the run to 2e-07 diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties new file mode 100644 index 000000000..90ebab09e --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties @@ -0,0 +1,25 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object RASProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +RASModel LaunderSharmaKE; + +turbulence on; + +printCoeffs on; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary new file mode 100644 index 000000000..b15d0272a --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary @@ -0,0 +1,46 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +4 +( + INLE1 + { + type patch; + nFaces 400; + startFace 79570; + } + OUTL2 + { + type patch; + nFaces 200; + startFace 79970; + } + SYMP3 + { + type empty; + nFaces 80000; + startFace 80170; + } + WALL10 + { + type wall; + nFaces 260; + startFace 160170; + } +) + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org new file mode 100644 index 000000000..d033035f9 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +( + INLE1 + { + type patch; + physicalType supersonicFreestream; + startFace 79570; + nFaces 400; + } + + OUTL2 + { + type patch; + physicalType pressureTransmissiveOutlet; + startFace 79970; + nFaces 200; + } + + SYMP3 + { + type empty; + physicalType empty; + startFace 80170; + nFaces 80000; + } + + WALL10 + { + type wall; + physicalType adiabaticWallFunctions; + startFace 160170; + nFaces 260; + } +) + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties new file mode 100644 index 000000000..2b5ffc268 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties @@ -0,0 +1,23 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType ePsiThermo>>>>; + +mixture air 1 28.9 717.5 0 1.8e-05 0.7; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties new file mode 100644 index 000000000..f6753662e --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.bnd.gz b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.bnd.gz new file mode 100644 index 000000000..4cf284226 Binary files /dev/null and b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.bnd.gz differ diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.cel.gz b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.cel.gz new file mode 100644 index 000000000..2cd17bbd7 Binary files /dev/null and b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.cel.gz differ diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.vrt.gz b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.vrt.gz new file mode 100644 index 000000000..3d99075fa Binary files /dev/null and b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.vrt.gz differ diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict new file mode 100644 index 000000000..d53cf7983 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict @@ -0,0 +1,75 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application sonicFoam; + +startFrom latestTime; + +startTime 0; + +stopAt endTime; + +endTime 0.01; + +deltaT 4e-08; + +writeControl runTime; + +writeInterval 2e-04; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression compressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +functions +{ + forces + { + type forceCoeffs; + functionObjectLibs ( "libforces.so" ); + outputControl timeStep; + outputInterval 1; + patches + ( + WALL10 + ); + pName p; + UName U; + log true; + rhoInf 1; + CofR ( 0 0 0 ); + liftDir ( -0.239733 0.970839 0 ); + dragDir ( 0.970839 0.239733 0 ); + pitchAxis ( 0 0 1 ); + magUInf 618.022; + lRef 1; + Aref 1; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes new file mode 100644 index 000000000..ae2773bf8 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes @@ -0,0 +1,70 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; + div(phi,U) Gauss limitedLinearV 1; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(phi,R) Gauss upwind; + div(R) Gauss linear; + div(phid,p) Gauss limitedLinear 1; + div(phiU,p) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; + div((muEff*dev2(grad(U).T()))) Gauss linear; +} + +laplacianSchemes +{ + default none; + laplacian(muEff,U) Gauss linear limited 0.5; + laplacian(DkEff,k) Gauss linear limited 0.5; + laplacian(DREff,R) Gauss linear limited 0.5; + laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5; + laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5; + laplacian(alphaEff,e) Gauss linear limited 0.5; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution new file mode 100644 index 000000000..b7e967eeb --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution @@ -0,0 +1,84 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + p + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-12; + relTol 0; + } + + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-08; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + e + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + k + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + epsilon + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + R + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } +} + +PISO +{ + nCorrectors 2; + nNonOrthogonalCorrectors 2; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/T b/tutorials/compressible/sonicFoam/ras/prism/0/T new file mode 100644 index 000000000..97bca6a5f --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/T @@ -0,0 +1,61 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 300; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 300; + } + + outlet + { + type inletOutlet; + inletValue uniform 300; + value uniform 300; + } + + bottomWall + { + type inletOutlet; + inletValue uniform 300; + value uniform 300; + } + + topWall + { + type inletOutlet; + inletValue uniform 300; + value uniform 300; + } + + prismWall + { + type zeroGradient; + } + + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/U b/tutorials/compressible/sonicFoam/ras/prism/0/U new file mode 100644 index 000000000..1f0102c34 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/U @@ -0,0 +1,68 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (650 0 0); + +boundaryField +{ + inlet + { + type fixedValue; + value uniform (650 0 0); + } + + outlet + { + type inletOutlet; + inletValue uniform (0 0 0); + value uniform (0 0 0); + } + + bottomWall + { + type supersonicFreestream; + pInf 100000; + TInf 300; + UInf (650 0 0); + gamma 1.28418; + value uniform (650 0 0); + } + + topWall + { + type supersonicFreestream; + pInf 100000; + TInf 300; + UInf (650 0 0); + gamma 1.28418; + value uniform (650 0 0); + } + + prismWall + { + type fixedValue; + value uniform (0 0 0); + } + + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/alphat b/tutorials/compressible/sonicFoam/ras/prism/0/alphat new file mode 100644 index 000000000..cdb024c97 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/alphat @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } + bottomWall + { + type calculated; + value uniform 0; + } + topWall + { + type calculated; + value uniform 0; + } + prismWall + { + type alphatWallFunction; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon new file mode 100644 index 000000000..86128b543 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon @@ -0,0 +1,59 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object epsilon; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -3 0 0 0 0]; + +internalField uniform 266000; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 266000; + } + outlet + { + type inletOutlet; + inletValue uniform 266000; + value uniform 266000; + } + bottomWall + { + type inletOutlet; + inletValue uniform 266000; + value uniform 266000; + } + topWall + { + type inletOutlet; + inletValue uniform 266000; + value uniform 266000; + } + prismWall + { + type compressible::epsilonWallFunction; + value uniform 266000; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/k b/tutorials/compressible/sonicFoam/ras/prism/0/k new file mode 100644 index 000000000..2849678bb --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/k @@ -0,0 +1,59 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 1000; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 1000; + } + outlet + { + type inletOutlet; + inletValue uniform 1000; + value uniform 1000; + } + bottomWall + { + type inletOutlet; + inletValue uniform 1000; + value uniform 1000; + } + topWall + { + type inletOutlet; + inletValue uniform 1000; + value uniform 1000; + } + prismWall + { + type compressible::kqRWallFunction; + value uniform 1000; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/mut b/tutorials/compressible/sonicFoam/ras/prism/0/mut new file mode 100644 index 000000000..2278015c7 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/mut @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } + bottomWall + { + type calculated; + value uniform 0; + } + topWall + { + type calculated; + value uniform 0; + } + prismWall + { + type mutWallFunction; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/p b/tutorials/compressible/sonicFoam/ras/prism/0/p new file mode 100644 index 000000000..be0a9f333 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/p @@ -0,0 +1,63 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 100000; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 100000; + } + + outlet + { + type waveTransmissive; + field p; + phi phi; + rho rho; + psi psi; + gamma 1.3; + fieldInf 100000; + lInf 1; + value uniform 100000; + } + + bottomWall + { + type zeroGradient; + } + + topWall + { + type zeroGradient; + } + + prismWall + { + type zeroGradient; + } + + defaultFaces + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties new file mode 100644 index 000000000..81b1ec911 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties @@ -0,0 +1,25 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object RASProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +RASModel kEpsilon; + +turbulence on; + +printCoeffs on; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict new file mode 100644 index 000000000..5422cfc5a --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict @@ -0,0 +1,129 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 0.01; + +vertices +( + (0 0 0) + (24 0 0) + (31 0 0) + (100 0 0) + (0 0.8 0) + (24 0.8 0) + (31 0.8 0) + (100 0.8 0) + (0 6 0) + (27 6 0) + (31 4 0) + (100 4 0) + (31 8 0) + (100 8 0) + (0 11.2 0) + (24 11.2 0) + (31 11.2 0) + (100 11.2 0) + (0 12 0) + (24 12 0) + (31 12 0) + (100 12 0) + (0 0 8) + (24 0 8) + (31 0 8) + (100 0 8) + (0 0.8 8) + (24 0.8 8) + (31 0.8 8) + (100 0.8 8) + (0 6 8) + (27 6 8) + (31 4 8) + (100 4 8) + (31 8 8) + (100 8 8) + (0 11.2 8) + (24 11.2 8) + (31 11.2 8) + (100 11.2 8) + (0 12 8) + (24 12 8) + (31 12 8) + (100 12 8) +); + +blocks +( + hex (0 1 5 4 22 23 27 26) (16 8 1) simpleGrading (0.0526 5.3637 1) + hex (4 5 9 8 26 27 31 30) (16 16 1) simpleGrading (0.0526 1 1) + hex (5 6 10 9 27 28 32 31) (16 16 1) simpleGrading (1 1 1) + hex (1 2 6 5 23 24 28 27) (16 8 1) simpleGrading (1 5.3637 1) + hex (2 3 7 6 24 25 29 28) (75 8 1) simpleGrading (7 5.3637 1) + hex (6 7 11 10 28 29 33 32) (75 16 1) simpleGrading (7 1 1) + hex (10 11 13 12 32 33 35 34) (75 20 1) simpleGrading (7 1 1) + hex (12 13 17 16 34 35 39 38) (75 16 1) simpleGrading (7 1 1) + hex (16 17 21 20 38 39 43 42) (75 8 1) simpleGrading (7 0.1864 1) + hex (15 16 20 19 37 38 42 41) (16 8 1) simpleGrading (1 0.1864 1) + hex (9 12 16 15 31 34 38 37) (16 16 1) simpleGrading (1 1 1) + hex (8 9 15 14 30 31 37 36) (16 16 1) simpleGrading (0.0526 1 1) + hex (14 15 19 18 36 37 41 40) (16 8 1) simpleGrading (0.0526 0.1864 1) +); + +edges +( +); + +patches +( + patch inlet + ( + (0 22 26 4) + (4 26 30 8) + (8 30 36 14) + (14 36 40 18) + ) + patch outlet + ( + (3 7 29 25) + (7 11 33 29) + (11 13 35 33) + (13 17 39 35) + (17 21 43 39) + ) + patch bottomWall + ( + (0 1 23 22) + (1 2 24 23) + (2 3 25 24) + ) + patch topWall + ( + (18 40 41 19) + (19 41 42 20) + (20 42 43 21) + ) + wall prismWall + ( + (12 10 32 34) + (12 34 31 9) + (9 31 32 10) + ) +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary new file mode 100644 index 000000000..4cc628265 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +6 +( + inlet + { + type patch; + nFaces 48; + startFace 13081; + } + outlet + { + type patch; + nFaces 68; + startFace 13129; + } + bottomWall + { + type patch; + nFaces 107; + startFace 13197; + } + topWall + { + type patch; + nFaces 107; + startFace 13304; + } + prismWall + { + type wall; + nFaces 52; + startFace 13411; + } + defaultFaces + { + type empty; + nFaces 13272; + startFace 13463; + } +) + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties new file mode 100644 index 000000000..2b5ffc268 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties @@ -0,0 +1,23 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType ePsiThermo>>>>; + +mixture air 1 28.9 717.5 0 1.8e-05 0.7; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties new file mode 100644 index 000000000..f6753662e --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict new file mode 100644 index 000000000..a9f43fbb9 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application sonicFoam; + +startFrom latestTime; + +startTime 0; + +stopAt endTime; + +endTime 0.0004; + +deltaT 5e-07; + +writeControl runTime; + +writeInterval 0.0001; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes new file mode 100644 index 000000000..de95ffd4b --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes @@ -0,0 +1,70 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; + div(phi,U) Gauss limitedLinearV 1; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(phi,R) Gauss upwind; + div(R) Gauss linear; + div(phid,p) Gauss limitedLinear 1; + div(phiU,p) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; + div((muEff*dev2(grad(U).T()))) Gauss linear; +} + +laplacianSchemes +{ + default none; + laplacian(muEff,U) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(DREff,R) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian(alphaEff,e) Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution new file mode 100644 index 000000000..20afd845a --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution @@ -0,0 +1,84 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + p + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + e + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + epsilon + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + R + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } +} + +PISO +{ + nCorrectors 2; + nNonOrthogonalCorrectors 2; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun index 4afc525e8..6d1d356b3 100755 --- a/tutorials/compressible/sonicLiquidFoam/Allrun +++ b/tutorials/compressible/sonicLiquidFoam/Allrun @@ -2,8 +2,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name from directory -application=`basename $PWD` +# Set application name +application="sonicLiquidFoam" setDecompressionTankFine () { diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U index 5967d55dd..9610e2068 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p index 3b2cb8848..0084d6dc3 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict index 7bab231d0..1dd311e1c 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary index d2479db21..48e374688 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties index 95d1ebb14..c5a819dd7 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,14 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rho0 rho0 [1 -3 0 0 0 0 0] 1000; +rho0 rho0 [ 1 -3 0 0 0 0 0 ] 1000; -p0 p0 [1 -1 -2 0 0 0 0] 100000; +p0 p0 [ 1 -1 -2 0 0 0 0 ] 100000; + +psi psi [ 0 -2 2 0 0 0 0 ] 4.54e-07; -psi psi [0 -2 2 0 0 0 0] 4.54e-07; // ************************************************************************* // diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties index 56a02ffaf..60c3fa665 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -mu mu [1 -1 -1 0 0 0 0] 0.001; +mu mu [ 1 -1 -1 0 0 0 0 ] 0.001; + // ************************************************************************* // diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict index b11905a6b..2f43908bc 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application sonicLiquidFoam; +application sonicLiquidFoam; startFrom startTime; @@ -44,4 +45,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes index 6c385d2d3..b61e23508 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -52,7 +53,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution index 6a88316a1..0b8bc2b1c 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,36 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PBiCG + p { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - U PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - rho PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } } PISO @@ -42,4 +48,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/financial/financialFoam/europeanCall/0/V b/tutorials/financial/financialFoam/europeanCall/0/V index fe2b594de..43902e350 100644 --- a/tutorials/financial/financialFoam/europeanCall/0/V +++ b/tutorials/financial/financialFoam/europeanCall/0/V @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/financial/financialFoam/europeanCall/constant/financialProperties b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties index c6ee52d4f..7078ebefb 100644 --- a/tutorials/financial/financialFoam/europeanCall/constant/financialProperties +++ b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,22 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object financialProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -strike strike [0 1 0 0 0 0 0] 40; +strike strike [ 0 1 0 0 0 0 0 ] 40; -r r [0 0 -1 0 0 0 0] 0.1; +r r [ 0 0 -1 0 0 0 0 ] 0.1; -sigma sigma [0 0 -0.5 0 0 0 0] 0.2; +sigma sigma [ 0 0 -0.5 0 0 0 0 ] 0.2; -s s [0 0 -1 0 0 0 0] 0; +s s [ 0 0 -1 0 0 0 0 ] 0; -xi xi [0 0 -0.5 0 0 0 0] 0.1; +xi xi [ 0 0 -0.5 0 0 0 0 ] 0.1; + +eta eta [ 0 0 0 0 0 0 0 ] 0; -eta eta [0 0 0 0 0 0 0] 0; // ************************************************************************* // diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict index 09ac482bd..4a90e6240 100644 --- a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict +++ b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary index edc3f6e6e..97d792bce 100644 --- a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary +++ b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary @@ -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: 1.6 | +| \\ / 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; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/financial/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict index a63d17596..5f82f054d 100644 --- a/tutorials/financial/financialFoam/europeanCall/system/controlDict +++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application financialFoam; +application financialFoam; startFrom startTime; @@ -46,4 +47,5 @@ runTimeModifiable yes; graphFormat raw; + // ************************************************************************* // diff --git a/tutorials/financial/financialFoam/europeanCall/system/fvSchemes b/tutorials/financial/financialFoam/europeanCall/system/fvSchemes index b0868a0ec..1772ad79d 100644 --- a/tutorials/financial/financialFoam/europeanCall/system/fvSchemes +++ b/tutorials/financial/financialFoam/europeanCall/system/fvSchemes @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -47,4 +48,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/financial/financialFoam/europeanCall/system/fvSolution b/tutorials/financial/financialFoam/europeanCall/system/fvSolution index 49b0058c6..2d00a34dd 100644 --- a/tutorials/financial/financialFoam/europeanCall/system/fvSolution +++ b/tutorials/financial/financialFoam/europeanCall/system/fvSolution @@ -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: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,21 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - V PBiCG + V { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/icoLagrangianFoam/Allclean b/tutorials/lagrangian/icoLagrangianFoam/Allclean similarity index 100% rename from tutorials/icoLagrangianFoam/Allclean rename to tutorials/lagrangian/icoLagrangianFoam/Allclean diff --git a/tutorials/icoLagrangianFoam/Allrun b/tutorials/lagrangian/icoLagrangianFoam/Allrun similarity index 100% rename from tutorials/icoLagrangianFoam/Allrun rename to tutorials/lagrangian/icoLagrangianFoam/Allrun diff --git a/tutorials/icoLagrangianFoam/channelParticles/0/U b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/U similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/0/U rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/U diff --git a/tutorials/icoLagrangianFoam/channelParticles/0/p b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/p similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/0/p rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/0/p diff --git a/tutorials/icoLagrangianFoam/channelParticles/constant/cloudProperties b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/cloudProperties similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/constant/cloudProperties rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/cloudProperties diff --git a/tutorials/icoLagrangianFoam/channelParticles/constant/injectorProperties b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/injectorProperties similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/constant/injectorProperties rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/injectorProperties diff --git a/tutorials/icoLagrangianFoam/channelParticles/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/constant/polyMesh/blockMeshDict rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/blockMeshDict diff --git a/tutorials/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary diff --git a/tutorials/icoLagrangianFoam/channelParticles/constant/transportProperties b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/transportProperties similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/constant/transportProperties rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/transportProperties diff --git a/tutorials/icoLagrangianFoam/channelParticles/system/controlDict b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/controlDict similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/system/controlDict rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/controlDict diff --git a/tutorials/icoLagrangianFoam/channelParticles/system/fvSchemes b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSchemes similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/system/fvSchemes rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSchemes diff --git a/tutorials/icoLagrangianFoam/channelParticles/system/fvSolution b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSolution similarity index 100% rename from tutorials/icoLagrangianFoam/channelParticles/system/fvSolution rename to tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSolution