diff --git a/applications/solvers/DNS/dnsFoam/FoamX/defaults/constant/turbulenceProperties b/applications/solvers/DNS/dnsFoam/FoamX/defaults/constant/turbulenceProperties deleted file mode 100644 index 76c4609b7c..0000000000 --- a/applications/solvers/DNS/dnsFoam/FoamX/defaults/constant/turbulenceProperties +++ /dev/null @@ -1,34 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -UOsigma 0.090295049; - -UOalpha 0.81532036; - -UOKupper 10; - -UOKlower 7; - - -// ************************************************************************* // diff --git a/applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 69fda62063..0000000000 --- a/applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,68 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss cubic; -} - -laplacianSchemes -{ - default none; - laplacian(nu,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(U) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSolution b/applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 707a1fca28..0000000000 --- a/applications/solvers/DNS/dnsFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,38 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-06 0; - U BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/DNS/dnsFoam/FoamX/dnsFoam.cfg b/applications/solvers/DNS/dnsFoam/FoamX/dnsFoam.cfg deleted file mode 100644 index d7757a2897..0000000000 --- a/applications/solvers/DNS/dnsFoam/FoamX/dnsFoam.cfg +++ /dev/null @@ -1,69 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Direct numerical simulation (DNS) code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/transportProperties/NewtonianSinglePhaseTransportProperties.cfg"; - turbulenceProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pKinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - nuSgs - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuSgs.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuSgs.cfg"; - } - - B - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/B.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/B.cfg"; - } - - nuTilda - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuTilda.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuTilda.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/DNS/dnsFoam/FoamX/fvSchemes.cfg b/applications/solvers/DNS/dnsFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 841f655b46..0000000000 --- a/applications/solvers/DNS/dnsFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 1.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes.cfg; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "../../../incompressible/turbFoam/FoamX/fvSchemes/gradSchemes.cfg"; - include "../../../incompressible/icoFoam/FoamX/fvSchemes/divSchemes.cfg"; - include "../../../incompressible/icoFoam/FoamX/fvSchemes/laplacianSchemes.cfg"; - include "../../../incompressible/turbFoam/FoamX/fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/DNS/dnsFoam/FoamX/fvSolution.cfg b/applications/solvers/DNS/dnsFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 31785b609b..0000000000 --- a/applications/solvers/DNS/dnsFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,31 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/DNS/dnsFoam/FoamX/turbulenceProperties.cfg b/applications/solvers/DNS/dnsFoam/FoamX/turbulenceProperties.cfg deleted file mode 100644 index 4b2171c7a5..0000000000 --- a/applications/solvers/DNS/dnsFoam/FoamX/turbulenceProperties.cfg +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "Turbulence properties"; -dictionaryPath "constant"; - -entries -{ - UOsigma - { - type scalar; - } - - UOalpha - { - type scalar; - } - - UOKupper - { - type label; - description "Upper wave number"; - } - - UOKlower - { - type label; - description "Lower wave number"; - } -} - -default -{ - include "defaults/constant/turbulenceProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/laplacianFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/basic/laplacianFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 33d8e6de5f..0000000000 --- a/applications/solvers/basic/laplacianFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,64 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(T) Gauss linear; -} - -divSchemes -{ - default none; -} - -laplacianSchemes -{ - default none; - laplacian(DT,T) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - T; -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/laplacianFoam/FoamX/defaults/system/fvSolution b/applications/solvers/basic/laplacianFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 4648358b2d..0000000000 --- a/applications/solvers/basic/laplacianFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - T ICCG 1e-06 0; -} - -SIMPLE -{ - nNonOrthogonalCorrectors 2; -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes.cfg b/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index aa9fb6c13a..0000000000 --- a/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "fvSchemes/gradSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/noneOnly.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/T.cfg" -; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index d97901d0f0..0000000000 --- a/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/T.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index cdc3fc25fd..0000000000 --- a/applications/solvers/basic/laplacianFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DTT.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/laplacianFoam/FoamX/fvSolution.cfg b/applications/solvers/basic/laplacianFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 1e8421f5dd..0000000000 --- a/applications/solvers/basic/laplacianFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,30 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Tsymm.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/SIMPLE.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/laplacianFoam/FoamX/laplacianFoam.cfg b/applications/solvers/basic/laplacianFoam/FoamX/laplacianFoam.cfg deleted file mode 100644 index 88ec528771..0000000000 --- a/applications/solvers/basic/laplacianFoam/FoamX/laplacianFoam.cfg +++ /dev/null @@ -1,52 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Solves a simple Laplace equation, e.g. for thermal diffusion in a solid."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictSteady.cfg"; - fvSchemes; - fvSolution; - transportProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; -} - -patchPhysicalTypes -{ - fixedTemp - { - description "Fixed T boundary condition"; - } - - fixedFlux - { - description "Fixed heat flux boundary bondition"; - } - - adiabatic - { - description "Adiabatic boundary condition"; - } -} - -patchFieldsPhysicalTypes -{ - T - { - fixedTemp fixedValue; - fixedFlux fixedGradient; - adiabatic zeroGradient; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/laplacianFoam/FoamX/transportProperties.cfg b/applications/solvers/basic/laplacianFoam/FoamX/transportProperties.cfg deleted file mode 100644 index d9eeb9a5ed..0000000000 --- a/applications/solvers/basic/laplacianFoam/FoamX/transportProperties.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/DT.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/potentialFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/basic/potentialFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index a408d7981e..0000000000 --- a/applications/solvers/basic/potentialFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,63 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default steadyState; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; -} - -laplacianSchemes -{ - default none; - laplacian(1,p) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/potentialFoam/FoamX/defaults/system/fvSolution b/applications/solvers/basic/potentialFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 70ab823aa3..0000000000 --- a/applications/solvers/basic/potentialFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-06 0; -} - -SIMPLE -{ - nNonOrthogonalCorrectors 3; -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/potentialFoam/FoamX/fvSchemes.cfg b/applications/solvers/basic/potentialFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index e5b24ffb40..0000000000 --- a/applications/solvers/basic/potentialFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/steady.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/noneOnly.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/potentialFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/basic/potentialFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 7dd4493a66..0000000000 --- a/applications/solvers/basic/potentialFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/1p.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/potentialFoam/FoamX/fvSolution.cfg b/applications/solvers/basic/potentialFoam/FoamX/fvSolution.cfg deleted file mode 100644 index f8ebe9c53f..0000000000 --- a/applications/solvers/basic/potentialFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,30 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/SIMPLE.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/potentialFoam/FoamX/potentialFoam.cfg b/applications/solvers/basic/potentialFoam/FoamX/potentialFoam.cfg deleted file mode 100644 index 5e664cbb7a..0000000000 --- a/applications/solvers/basic/potentialFoam/FoamX/potentialFoam.cfg +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Simple potential flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictSteady.cfg"; - fvSchemes; - fvSolution; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pKinematic.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/scalarTransportFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/basic/scalarTransportFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index ec7910107c..0000000000 --- a/applications/solvers/basic/scalarTransportFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,64 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - div(phi,T) Gauss <>; -} - -laplacianSchemes -{ - default none; - laplacian(DT,T) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - T; -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/scalarTransportFoam/FoamX/defaults/system/fvSolution b/applications/solvers/basic/scalarTransportFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 7abb5d130d..0000000000 --- a/applications/solvers/basic/scalarTransportFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - T BICCG 1e-06 0; -} - -SIMPLE -{ - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/scalarTransportFoam/FoamX/fvSchemes.cfg b/applications/solvers/basic/scalarTransportFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index ee07c20045..0000000000 --- a/applications/solvers/basic/scalarTransportFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "../../laplacianFoam/FoamX/fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/T.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/scalarTransportFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/basic/scalarTransportFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 7d925aff51..0000000000 --- a/applications/solvers/basic/scalarTransportFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiT.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/basic/scalarTransportFoam/FoamX/fvSolution.cfg b/applications/solvers/basic/scalarTransportFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 036c034a30..0000000000 --- a/applications/solvers/basic/scalarTransportFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,30 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/T.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/SIMPLE.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/scalarTransportFoam/FoamX/scalarTransportFoam.cfg b/applications/solvers/basic/scalarTransportFoam/FoamX/scalarTransportFoam.cfg deleted file mode 100644 index 17085c0acd..0000000000 --- a/applications/solvers/basic/scalarTransportFoam/FoamX/scalarTransportFoam.cfg +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Simple scalar transport flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - transportProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/basic/scalarTransportFoam/FoamX/transportProperties.cfg b/applications/solvers/basic/scalarTransportFoam/FoamX/transportProperties.cfg deleted file mode 100644 index d9eeb9a5ed..0000000000 --- a/applications/solvers/basic/scalarTransportFoam/FoamX/transportProperties.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/DT.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/XiFoam.cfg b/applications/solvers/combustion/XiFoam/FoamX/XiFoam.cfg deleted file mode 100644 index c458a12133..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/XiFoam.cfg +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Compressible premixed/partially-premixed turbulent combustion code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictAdjustTimeStep.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsCompressible.cfg"; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalPropertiesCombustion.cfg"; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; - combustionProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Tu.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/ft.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/fu.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/b.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Xi.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Su.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - Tu - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - ft - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - fu - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - b - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - Xi - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - Su - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/combustionProperties.cfg b/applications/solvers/combustion/XiFoam/FoamX/combustionProperties.cfg deleted file mode 100644 index a36fe722c6..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/combustionProperties.cfg +++ /dev/null @@ -1,39 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/combustionProperties/combustionProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/combustionProperties/laminarFlameSpeedCorrelation.cfg"; - include "$FOAMX_CONFIG/dictionaries/combustionProperties/fuel.cfg"; - - include "$FOAMX_CONFIG/entries/dimensionedScalar/Su.cfg"; - include "$FOAMX_CONFIG/dictionaries/combustionProperties/SuModel.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/equivalenceRatio.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/sigmaExt.cfg"; - - include "$FOAMX_CONFIG/dictionaries/combustionProperties/XiModel.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/XiCoef.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/XiShapeCoef.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/uPrimeCoef.cfg"; - - include "$FOAMX_CONFIG/dictionaries/combustionProperties/GuldersCoeffs.cfg"; - - include "$FOAMX_CONFIG/entries/Switch/ignite.cfg"; - include "$FOAMX_CONFIG/dictionaries/combustionProperties/ignitionSites.cfg"; - - include "$FOAMX_CONFIG/dictionaries/combustionProperties/StCorr.cfg"; -} - -default -{ - include "defaults/constant/combustionProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/defaults/constant/combustionProperties b/applications/solvers/combustion/XiFoam/FoamX/defaults/constant/combustionProperties deleted file mode 100644 index 32a3f75469..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/defaults/constant/combustionProperties +++ /dev/null @@ -1,96 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - 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 W [0 0 0 0 0 0 0] 0.422; - eta eta [0 0 0 0 0 0 0] 0.15; - xi xi [0 0 0 0 0 0 0] 5.18; - alpha alpha [0 0 0 0 0 0 0] 2; - beta beta [0 0 0 0 0 0 0] -0.5; - f f [0 0 0 0 0 0 0] 2.3; - } - Propane - { - W W [0 0 0 0 0 0 0] 0.446; - eta eta [0 0 0 0 0 0 0] 0.12; - xi xi [0 0 0 0 0 0 0] 4.95; - alpha alpha [0 0 0 0 0 0 0] 1.77; - beta beta [0 0 0 0 0 0 0] -0.2; - f f [0 0 0 0 0 0 0] 2.3; - } - IsoOctane - { - W W [0 0 0 0 0 0 0] 0.4658; - eta eta [0 0 0 0 0 0 0] -0.326; - xi xi [0 0 0 0 0 0 0] 4.48; - alpha alpha [0 0 0 0 0 0 0] 1.56; - beta beta [0 0 0 0 0 0 0] -0.22; - f f [0 0 0 0 0 0 0] 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; -ignitionCircleFraction 1; - -ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/combustion/XiFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 8f291b11ab..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,94 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phid,p) Gauss <>; - div(phiU,p) Gauss linear; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div(R) Gauss linear; - div(phiXi,Xi) Gauss <>; - div(phiXi,Su) Gauss <>; - div(phiSt,b) Gauss <>; - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - fu <>; - ft <>; - b <>; - h <>; - hu <>; - }; - 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(muEff,b) Gauss linear corrected; - laplacian(muEff,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/applications/solvers/combustion/XiFoam/FoamX/defaults/system/fvSolution b/applications/solvers/combustion/XiFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index e09bd11c6f..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - rho ICCG 1e-05 0; - U BICCG 1e-05 0; - p ICCG 1e-06 0; - ft BICCG 1e-05 0; - fu BICCG 1e-05 0; - b BICCG 1e-05 0; - Xi BICCG 1e-05 0; - Su BICCG 1e-05 0; - h BICCG 1e-05 0; - hu BICCG 1e-05 0; - R BICCG 1e-05 0; - k BICCG 1e-05 0; - epsilon BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; - momentumPredictor yes; -} - - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/fvSchemes.cfg b/applications/solvers/combustion/XiFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 4ef8c370ae..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 6fd8928357..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,33 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phidp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiXiXi.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiXiSu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiStb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phift_b_h_hu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/SuGradb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/USuXiGradb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/muEffGradUT.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index feff7678a8..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/p.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 64fb8d034a..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DepsilonEffEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DREffR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffFt.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/alphaEffh.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/alphaEffhu.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/XiFoam/FoamX/fvSolution.cfg b/applications/solvers/combustion/XiFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 71cb372e60..0000000000 --- a/applications/solvers/combustion/XiFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/ft.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/fu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/b.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Xi.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Su.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/h.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/hu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/Xoodles/FoamX/Xoodles.cfg b/applications/solvers/combustion/Xoodles/FoamX/Xoodles.cfg deleted file mode 100644 index 19a7b18430..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/Xoodles.cfg +++ /dev/null @@ -1,112 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Compressible premixed/partially-premixed LES turbulent combustion code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/LESmodelsCompressible.cfg"; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalPropertiesCombustion.cfg"; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; - combustionProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/muSgs.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Tu.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/ft.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/b.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Xi.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Su.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/patches.cfg"; - turbulentInlet - { - description "Turbulent inlet"; - parentType inlet; - } -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - turbulentInlet turbulentInlet; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - muSgs - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/muSgs.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/muSgs.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - Tu - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - ft - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - fu - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - b - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - Xi - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - Su - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/Xoodles/FoamX/combustionProperties.cfg b/applications/solvers/combustion/Xoodles/FoamX/combustionProperties.cfg deleted file mode 100644 index bbf982bd5c..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/combustionProperties.cfg +++ /dev/null @@ -1,11 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "../../XiFoam/FoamX/combustionProperties.cfg"; - -// ************************************************************************* // diff --git a/applications/solvers/combustion/Xoodles/FoamX/defaults/constant/combustionProperties b/applications/solvers/combustion/Xoodles/FoamX/defaults/constant/combustionProperties deleted file mode 100644 index 7694f5f66b..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/defaults/constant/combustionProperties +++ /dev/null @@ -1,89 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object combustionProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -laminarFlameSpeedCorrelation const; - -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 W [0 0 0 0 0 0 0] 0.422; - eta eta [0 0 0 0 0 0 0] 0.15; - xi xi [0 0 0 0 0 0 0] 5.18; - alpha alpha [0 0 0 0 0 0 0] 2; - beta beta [0 0 0 0 0 0 0] -0.5; - f f [0 0 0 0 0 0 0] 2.3; - } - Propane - { - W W [0 0 0 0 0 0 0] 0.446; - eta eta [0 0 0 0 0 0 0] 0.12; - xi xi [0 0 0 0 0 0 0] 4.95; - alpha alpha [0 0 0 0 0 0 0] 1.77; - beta beta [0 0 0 0 0 0 0] -0.2; - f f [0 0 0 0 0 0 0] 2.3; - } - IsoOctane - { - W W [0 0 0 0 0 0 0] 0.4658; - eta eta [0 0 0 0 0 0 0] -0.326; - xi xi [0 0 0 0 0 0 0] 4.48; - alpha alpha [0 0 0 0 0 0 0] 1.56; - beta beta [0 0 0 0 0 0 0] -0.22; - f f [0 0 0 0 0 0 0] 2.3; - } -} - -ignite no; - -ignitionSites -( -); - -ignitionSphereFraction 1; - -ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0; -ignitionCircleFraction 1; - -ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; - -// ************************************************************************* // diff --git a/applications/solvers/combustion/Xoodles/FoamX/defaults/system/fvSchemes b/applications/solvers/combustion/Xoodles/FoamX/defaults/system/fvSchemes deleted file mode 100644 index a30bf4c7af..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,92 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phid,p) Gauss linear; - div(phiU,p) Gauss linear; - div(phi,k) Gauss <>; - div(phi,B) Gauss <>; - div(B) Gauss linear; - div(phiXi,Xi) Gauss <>; - div(phiXi,Su) Gauss <>; - div(phiSt,b) Gauss <>; - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - fu <>; - ft <>; - b <>; - h <>; - hu <>; - }; - 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(muEff,b) Gauss linear corrected; - laplacian(muEff,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/applications/solvers/combustion/Xoodles/FoamX/defaults/system/fvSolution b/applications/solvers/combustion/Xoodles/FoamX/defaults/system/fvSolution deleted file mode 100644 index 108942f3ec..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - rho ICCG 1e-05 0; - U BICCG 1e-05 0; - p ICCG 1e-06 0; - ft BICCG 1e-05 0; - fu BICCG 1e-05 0; - b BICCG 1e-05 0; - Xi BICCG 1e-05 0; - Su BICCG 1e-05 0; - h BICCG 1e-05 0; - hu BICCG 1e-05 0; - R BICCG 1e-05 0; - k BICCG 1e-05 0; - epsilon BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/combustion/Xoodles/FoamX/fvSchemes.cfg b/applications/solvers/combustion/Xoodles/FoamX/fvSchemes.cfg deleted file mode 100644 index fb1df786b8..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "../../XiFoam/FoamX/fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/Xoodles/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/combustion/Xoodles/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 16f0288443..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,32 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phidp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiBT.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/B.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiXiXi.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiXiSu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiStb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phift_b_h_hu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/SuGradb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/USuXiGradb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/muEffGradUT.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/Xoodles/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/combustion/Xoodles/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index a0515ba9e7..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,26 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DBEffB.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffFt.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/alphaEffh.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/alphaEffhu.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/Xoodles/FoamX/fvSolution.cfg b/applications/solvers/combustion/Xoodles/FoamX/fvSolution.cfg deleted file mode 100644 index 71cb372e60..0000000000 --- a/applications/solvers/combustion/Xoodles/FoamX/fvSolution.cfg +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/ft.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/fu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/b.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Xi.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Su.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/h.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/hu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/combustionProperties.cfg b/applications/solvers/combustion/engineFoam/FoamX/combustionProperties.cfg deleted file mode 100644 index bbf982bd5c..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/combustionProperties.cfg +++ /dev/null @@ -1,11 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "../../XiFoam/FoamX/combustionProperties.cfg"; - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/defaults/constant/combustionProperties b/applications/solvers/combustion/engineFoam/FoamX/defaults/constant/combustionProperties deleted file mode 100644 index 7793d63119..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/defaults/constant/combustionProperties +++ /dev/null @@ -1,95 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object combustionProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -laminarFlameSpeedCorrelation Gulders; - -fuel IsoOctane; - -Su Su [0 1 -1 0 0 0 0] 0; - -SuModel unstrained; - -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 W [0 0 0 0 0 0 0] 0.422; - eta eta [0 0 0 0 0 0 0] 0.15; - xi xi [0 0 0 0 0 0 0] 5.18; - alpha alpha [0 0 0 0 0 0 0] 2; - beta beta [0 0 0 0 0 0 0] -0.5; - f f [0 0 0 0 0 0 0] 2.3; - } - Propane - { - W W [0 0 0 0 0 0 0] 0.446; - eta eta [0 0 0 0 0 0 0] 0.12; - xi xi [0 0 0 0 0 0 0] 4.95; - alpha alpha [0 0 0 0 0 0 0] 1.77; - beta beta [0 0 0 0 0 0 0] -0.2; - f f [0 0 0 0 0 0 0] 2.3; - } - IsoOctane - { - W W [0 0 0 0 0 0 0] 0.4658; - eta eta [0 0 0 0 0 0 0] -0.326; - xi xi [0 0 0 0 0 0 0] 4.48; - alpha alpha [0 0 0 0 0 0 0] 1.56; - beta beta [0 0 0 0 0 0 0] -0.22; - f f [0 0 0 0 0 0 0] 2.3; - } -} - -ignite yes; - -ignitionSites -( - - { - location (0.03 0 0.091); - diameter 0.002; - start -15; - duration 20; - strength 4; - } -); - -ignitionSphereFraction 1; - -ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0; -ignitionCircleFraction 1; - -ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/defaults/constant/engineGeometry b/applications/solvers/combustion/engineFoam/FoamX/defaults/constant/engineGeometry deleted file mode 100644 index 01f66c20dc..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/defaults/constant/engineGeometry +++ /dev/null @@ -1,40 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object engineGeometry; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -engineMesh layered; - -conRodLength conRodLength [0 1 0 0 0 0 0] 0.147; - -bore bore [0 1 0 0 0 0 0] 0.092; - -stroke stroke [0 1 0 0 0 0 0] 0.08423; - -clearance clearance [0 1 0 0 0 0 0] 0.00115; - -rpm rpm [0 0 -1 0 0 0 0] 1500; - -layeredMesh yes; - - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/combustion/engineFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 3302ffea22..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,94 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phid,p) Gauss <>; - div(phiU,p) Gauss linear; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div(phiXi,Xi) Gauss <>; - div(phiXi,Su) Gauss <>; - div(phiSt,b) Gauss <>; - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - fu <>; - ft <>; - b <>; - h <>; - hu <>; - }; - div(R) Gauss linear; - 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 limited 0.5; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5; - laplacian(DREff,R) Gauss linear limited 0.5; - laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5; - laplacian(muEff,b) Gauss linear limited 0.5; - laplacian(muEff,ft) Gauss linear limited 0.5; - laplacian(alphaEff,h) Gauss linear limited 0.5; - laplacian(alphaEff,hu) Gauss linear limited 0.5; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default limited 0.5; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/defaults/system/fvSolution b/applications/solvers/combustion/engineFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 04c543d539..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - rho ICCG 1e-05 0; - U BICCG 1e-05 0; - p ICCG 1e-06 0; - ft BICCG 1e-05 0; - fu BICCG 1e-05 0; - b BICCG 1e-05 0; - Xi BICCG 1e-05 0; - Su BICCG 1e-05 0; - h BICCG 1e-05 0; - hu BICCG 1e-05 0; - R BICCG 1e-05 0; - k BICCG 1e-05 0; - epsilon BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 1; - momentumPredictor yes; -} - - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/engineFoam.cfg b/applications/solvers/combustion/engineFoam/FoamX/engineFoam.cfg deleted file mode 100644 index d1fb2c3db4..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/engineFoam.cfg +++ /dev/null @@ -1,116 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Combusting RANS code using the b-Xi two-equation model"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictAdjustTimeStep.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsCompressible.cfg"; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalPropertiesCombustion.cfg"; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; - combustionProperties; - engineGeometry; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Tu.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/ft.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/fu.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/b.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Xi.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Su.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/meshMotion/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/meshMotion/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/meshMotion/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/meshMotion/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/meshMotion/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/meshMotion/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/meshMotion/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/meshMotion/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - Tu - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - ft - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - fu - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - b - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - Xi - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } - - Su - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/Y.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/engineGeometry.cfg b/applications/solvers/combustion/engineFoam/FoamX/engineGeometry.cfg deleted file mode 100644 index 97d7f1f3cf..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/engineGeometry.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "Engine geometry"; -dictionaryPath "constant"; - -entries -{ - include "$FOAMX_CONFIG/entries/engineMesh/engineMesh.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/conRodLength.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/bore.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/stroke.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/clearance.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/rpm.cfg"; -} - -default -{ - include "defaults/constant/engineGeometry"; -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/fvSchemes.cfg b/applications/solvers/combustion/engineFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index a748dc86d2..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "../../XiFoam/FoamX/fvSchemes/gradSchemes.cfg"; - include "../../XiFoam/FoamX/fvSchemes/divSchemes.cfg"; - include "../../XiFoam/FoamX/fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/engineFoam/FoamX/fvSolution.cfg b/applications/solvers/combustion/engineFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 71cb372e60..0000000000 --- a/applications/solvers/combustion/engineFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/ft.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/fu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/b.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Xi.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Su.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/h.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/hu.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/coodles.cfg b/applications/solvers/compressible/coodles/FoamX/coodles.cfg deleted file mode 100644 index 392023d12c..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/coodles.cfg +++ /dev/null @@ -1,91 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Compressible large eddy simulation (LES) code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalPropertiesMixture.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/LESmodelsCompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/muSgs.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Bkinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/muTilda.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/patches.cfg"; - turbulentInlet - { - description "Turbulent inlet"; - parentType inlet; - } -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/U.cfg"; - turbulentInlet turbulentInlet; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/p.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - muSgs - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/muSgs.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/muSgs.cfg"; - } - - B - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/B.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/B.cfg"; - } - - muTilda - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/muTilda.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/muTilda.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/defaults/system/fvSchemes b/applications/solvers/compressible/coodles/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 148d016d6f..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,80 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default backward; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,h) Gauss <>; - div(phiU,p) Gauss linear; - div(phi,k) Gauss <>; - div(phi,B) Gauss <>; - div(phi,muTilda) Gauss <>; - - div(B) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(alphaEff,h) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DBEff,B) Gauss linear corrected; - laplacian(DmuTildaEff,muTilda) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(HbyA) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/defaults/system/fvSolution b/applications/solvers/compressible/coodles/FoamX/defaults/system/fvSolution deleted file mode 100644 index ce6871c298..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - rho ICCG 1e-6 0; - h BICCG 1e-6 0; - p ICCG 1e-06 0; - U BICCG 1e-05 0; - k BICCG 1e-05 0; - B BICCG 1e-05 0; - nuTilda BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/fvSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes.cfg deleted file mode 100644 index adef3c4e34..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 253474cb72..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phih.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiBT.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/B.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiMuTilda.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/muEffGradUT.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index 191b772a68..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/p.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/U.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/fvSchemes/interpolationSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes/interpolationSchemes.cfg deleted file mode 100644 index 218a143880..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/fvSchemes/interpolationSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -interpolationSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/HbyA.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/compressible/coodles/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 70e2435273..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/alphaEffh.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DBEffB.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DmuTildaEffMuTilda.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/coodles/FoamX/fvSolution.cfg b/applications/solvers/compressible/coodles/FoamX/fvSolution.cfg deleted file mode 100644 index 6087501bd9..0000000000 --- a/applications/solvers/compressible/coodles/FoamX/fvSolution.cfg +++ /dev/null @@ -1,35 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/h.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/B.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoSonicFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/compressible/rhoSonicFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 80f30526c5..0000000000 --- a/applications/solvers/compressible/rhoSonicFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,68 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phiv,rho) Gauss <>; - div(phiv,rhoU) Gauss <>; - div(phiv2,p) Gauss <>; - div(phiv,rhoE) Gauss <>; -} - -laplacianSchemes -{ - default none; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoSonicFoam/FoamX/defaults/system/fvSolution b/applications/solvers/compressible/rhoSonicFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 6816bc22cb..0000000000 --- a/applications/solvers/compressible/rhoSonicFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,40 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p BICCG 1e-15 0; - rho BICCG 1e-15 0; - rhoU BICCG 1e-15 0; - rhoE BICCG 1e-15 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes.cfg b/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index d394c4cf3a..0000000000 --- a/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "../../sonicFoam/FoamX/fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 52ab2f701f..0000000000 --- a/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phivRho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phivRhoU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiv2p.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phivRhoE.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 7e80b5c94a..0000000000 --- a/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSolution.cfg b/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSolution.cfg deleted file mode 100644 index e16851c7e0..0000000000 --- a/applications/solvers/compressible/rhoSonicFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,33 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pAsymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rhoCD.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rhoU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rhoE.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoSonicFoam/FoamX/rhoSonicFoam.cfg b/applications/solvers/compressible/rhoSonicFoam/FoamX/rhoSonicFoam.cfg deleted file mode 100644 index 1707699c1d..0000000000 --- a/applications/solvers/compressible/rhoSonicFoam/FoamX/rhoSonicFoam.cfg +++ /dev/null @@ -1,54 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Compressible trans-sonic/supersonic laminar gas flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/thermodynamicProperties/thermodynamicPropertiesConst.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/p.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoTurbFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/compressible/rhoTurbFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 3187f7dde3..0000000000 --- a/applications/solvers/compressible/rhoTurbFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,95 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -// Time derivative discretisation schemes -ddtSchemes -{ - // Default scheme - default Euler; -} - -// Gradient discretisation schemes -gradSchemes -{ - // Default gradient scheme - default Gauss linear; - grad(p) Gauss linear; -} - -// Convection discretisation schemes -divSchemes -{ - // Default scheme - default none; - div(phi,U) Gauss <>; - div(phid,p) Gauss <>; - div(phiU,p) Gauss linear; - div(phi,h) Gauss <>; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div((rho*R)) Gauss linear; - div(R) Gauss linear; - div(U) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; -} - -// Laplacian discretisation schemes -laplacianSchemes -{ - // Default scheme - default none; - laplacian(muEff,U) Gauss linear corrected; - laplacian(mut,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,h) Gauss linear corrected; -} - -// Interpolation schemes -interpolationSchemes -{ - // Default scheme - default linear; -} - -// Surface normal gradient schemes -snGradSchemes -{ - // Default scheme - default corrected; -} - -// Calculation of flux -fluxRequired -{ - // Create storage for flux for all solved variables? - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoTurbFoam/FoamX/defaults/system/fvSolution b/applications/solvers/compressible/rhoTurbFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 776cc0f598..0000000000 --- a/applications/solvers/compressible/rhoTurbFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,54 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - // Solver for the rho equation - rho ICCG 1e-05 0; - // Solver for the U equation - U BICCG 1e-05 0; - // Solver for the p equation - p ICCG 1e-06 0; - // Solver for the h equation - h BICCG 1e-05 0; - // Solver for the R equation - R BICCG 1e-05 0; - // Solver for the k equation - k BICCG 1e-05 0; - // Solver for the epsilon equation - epsilon BICCG 1e-05 0; -} - -PISO -{ - // Number of PISO correctors - nCorrectors 2; - // Number of non-orthogonal correctors - nNonOrthogonalCorrectors 0; - // momentumPredictor? - momentumPredictor yes; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes.cfg b/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 4ef8c370ae..0000000000 --- a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index f44d49977f..0000000000 --- a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phidp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phih.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/rhoR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/muEffGradUT.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index feff7678a8..0000000000 --- a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/p.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 7504ee32c5..0000000000 --- a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/mutU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DepsilonEffEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DREffR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/alphaEffh.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSolution.cfg b/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSolution.cfg deleted file mode 100644 index c75ef263d3..0000000000 --- a/applications/solvers/compressible/rhoTurbFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/h.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/rhoTurbFoam/FoamX/rhoTurbFoam.cfg b/applications/solvers/compressible/rhoTurbFoam/FoamX/rhoTurbFoam.cfg deleted file mode 100644 index 287c506191..0000000000 --- a/applications/solvers/compressible/rhoTurbFoam/FoamX/rhoTurbFoam.cfg +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Transient solver for compressible turbulent flow"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictAdjustTimeStep.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalPropertiesMixture.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsCompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Rkinematic.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - R - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/R.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/R.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/compressible/sonicFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 5c400ed7e8..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,70 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phid,p) Gauss <>; - div(phi,e) Gauss <>; -} - -laplacianSchemes -{ - default none; - laplacian(mu,U) Gauss linear corrected; - laplacian(mu,e) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/defaults/system/fvSolution b/applications/solvers/compressible/sonicFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 45a64af35c..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,40 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p BICCG 1e-15 0; - U BICCG 1e-15 0; - rho ICCG 1e-15 0; - e BICCG 1e-15 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes.cfg b/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 4ef8c370ae..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index b6727479c2..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,22 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phidp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phie.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index 191b772a68..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/p.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/U.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 801ea9c5b3..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,22 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/mue.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/fvSolution.cfg b/applications/solvers/compressible/sonicFoam/FoamX/fvSolution.cfg deleted file mode 100644 index f2be1c0032..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,33 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pAsymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/e.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/sonicFoam.cfg b/applications/solvers/compressible/sonicFoam/FoamX/sonicFoam.cfg deleted file mode 100644 index fa085c9836..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/sonicFoam.cfg +++ /dev/null @@ -1,55 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Compressible trans-sonic/supersonic laminar gas flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - transportProperties; - include "$FOAMX_CONFIG/dictionaries/thermodynamicProperties/thermodynamicPropertiesConst.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/p.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicFoam/FoamX/transportProperties.cfg b/applications/solvers/compressible/sonicFoam/FoamX/transportProperties.cfg deleted file mode 100644 index 24c3fc8915..0000000000 --- a/applications/solvers/compressible/sonicFoam/FoamX/transportProperties.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/mu.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/compressible/sonicLiquidFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index a5337e9e96..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,67 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phid,p) Gauss <>; -} - -laplacianSchemes -{ - default none; - laplacian(mu,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/defaults/system/fvSolution b/applications/solvers/compressible/sonicLiquidFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index b36d8a0cee..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,39 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p BICCG 1e-06 0; - U BICCG 1e-05 0; - rho ICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes.cfg b/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 4ef8c370ae..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index ecf17c8164..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phidp.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index 446cb1e5e0..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/p.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index f6ea98e29f..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSolution.cfg b/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSolution.cfg deleted file mode 100644 index ab18dde078..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,32 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pAsymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/sonicLiquidFoam.cfg b/applications/solvers/compressible/sonicLiquidFoam/FoamX/sonicLiquidFoam.cfg deleted file mode 100644 index 19fcb49842..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/sonicLiquidFoam.cfg +++ /dev/null @@ -1,54 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Laminar compressible liquid flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - transportProperties; - thermodynamicProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/p.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/thermodynamicProperties.cfg b/applications/solvers/compressible/sonicLiquidFoam/FoamX/thermodynamicProperties.cfg deleted file mode 100644 index 06aacd51ee..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/thermodynamicProperties.cfg +++ /dev/null @@ -1,18 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/thermodynamicProperties/thermodynamicProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/rho0.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/p0.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/psi.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicLiquidFoam/FoamX/transportProperties.cfg b/applications/solvers/compressible/sonicLiquidFoam/FoamX/transportProperties.cfg deleted file mode 100644 index 24c3fc8915..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/FoamX/transportProperties.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/mu.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicTurbFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/compressible/sonicTurbFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 6ef5701686..0000000000 --- a/applications/solvers/compressible/sonicTurbFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div(phid,p) Gauss <>; - div(phiU,p) Gauss <>; - div(phi,h) Gauss <>; - div(R) 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(DREff,R) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(alphaEff,h) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicTurbFoam/FoamX/defaults/system/fvSolution b/applications/solvers/compressible/sonicTurbFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 478ce48d7d..0000000000 --- a/applications/solvers/compressible/sonicTurbFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p BICCG 1e-08 0; - rho ICCG 1e-05 0; - U BICCG 1e-05 0; - h BICCG 1e-05 0; - k BICCG 1e-08 0; - epsilon BICCG 1e-08 0; - R BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 2; -} - - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes.cfg b/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 3c334a8bc3..0000000000 --- a/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 219c9f6613..0000000000 --- a/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phidp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phih.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/muEffGradUT.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 359e0f79fd..0000000000 --- a/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,24 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DREffR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DepsilonEffEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/alphaEffh.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSolution.cfg b/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSolution.cfg deleted file mode 100644 index a37c9e02f6..0000000000 --- a/applications/solvers/compressible/sonicTurbFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pAsymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/h.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicTurbFoam/FoamX/sonicTurbFoam.cfg b/applications/solvers/compressible/sonicTurbFoam/FoamX/sonicTurbFoam.cfg deleted file mode 100644 index b3afd87eb2..0000000000 --- a/applications/solvers/compressible/sonicTurbFoam/FoamX/sonicTurbFoam.cfg +++ /dev/null @@ -1,78 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Compressible trans-sonic/supersonic turbulent gas flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalPropertiesMixture.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsCompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Rkinematic.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/sonic/p.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - R - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/R.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/R.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/compressible/sonicTurbFoam/FoamX/thermophysicalProperties.cfg b/applications/solvers/compressible/sonicTurbFoam/FoamX/thermophysicalProperties.cfg deleted file mode 100644 index a10febdf62..0000000000 --- a/applications/solvers/compressible/sonicTurbFoam/FoamX/thermophysicalProperties.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermoType.cfg"; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/standardMixtureCoefficients.cfg"; -} - -include "defaults/thermophysicalProperties.def"; - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/electromagnetics/electrostaticFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 750bcb36fc..0000000000 --- a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,64 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default leastSquares; -} - -divSchemes -{ - default none; - div(rhoFlux,rho) Gauss <>; -} - -laplacianSchemes -{ - default none; - laplacian(phi) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - phi; -} - - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/defaults/system/fvSolution b/applications/solvers/electromagnetics/electrostaticFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 67ca7d08ea..0000000000 --- a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,32 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - phi ICCG 1e-08 0.2; - rho BICCG 1e-08 0.2; -} - - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/electrostaticFoam.cfg b/applications/solvers/electromagnetics/electrostaticFoam/FoamX/electrostaticFoam.cfg deleted file mode 100644 index db46a97b21..0000000000 --- a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/electrostaticFoam.cfg +++ /dev/null @@ -1,52 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Electrostatics code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - physicalProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/rhoCD.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/phiEP.cfg"; -} - -patchPhysicalTypes -{ - insulator - { - description "Insulator boundary condition"; - } - - fixedCharge - { - description "Fixed charge boundary condition"; - } -} - -patchFieldsPhysicalTypes -{ - phi - { - insulator fixedValue; - fixedCharge fixedValue; - } - rho - { - insulator zeroGradient; - fixedCharge fixedValue; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes.cfg b/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 87ff438d0d..0000000000 --- a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/phi.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 23005bea61..0000000000 --- a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,24 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - - div(rhoFlux,rho) - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/scalar.cfg"; - iconURL "/FoamX/icons/small/maths/divRhoRho.gif"; - } - } -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index cefd38314d..0000000000 --- a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/phi.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSolution.cfg b/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 3d950e35a6..0000000000 --- a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/phiEP.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rhoCD.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/physicalProperties.cfg b/applications/solvers/electromagnetics/electrostaticFoam/FoamX/physicalProperties.cfg deleted file mode 100644 index f8c4d7702f..0000000000 --- a/applications/solvers/electromagnetics/electrostaticFoam/FoamX/physicalProperties.cfg +++ /dev/null @@ -1,17 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/physicalProperties/physicalProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/electromagnetics/epsilon0.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/electromagnetics/k.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/electromagnetics/mhdFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 1bcbf51e9e..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad((DBU*magSqr(B))) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phiB,U) Gauss <>; - div(phi,B) Gauss <>; - div(phiB,((2*DBU)*B)) Gauss <>; -} - -laplacianSchemes -{ - default none; - laplacian(nu,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian(DB,B) Gauss linear corrected; - laplacian((1|A(B)),pB) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(HbyA) linear; - interpolate(B) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; - pB; -} - - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/defaults/system/fvSolution b/applications/solvers/electromagnetics/mhdFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index ff0d37a34f..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,45 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-06 0; - U BICCG 1e-05 0; - B BICCG 1e-05 0; - pB ICCG 1e-05 0; -} - -PISO -{ - nCorrectors 3; - nNonOrthogonalCorrectors 0; -} - -BPISO -{ - nCorrectors 3; -} - - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes.cfg b/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index e4cc46106a..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/pPB.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 449ee98313..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiBU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiB.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiB2DBUB.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index 94386ed68a..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/p.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/DBUmagsqrB.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/interpolationSchemes.cfg b/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/interpolationSchemes.cfg deleted file mode 100644 index f3587d0051..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/interpolationSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -interpolationSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/HbyA.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/B.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 754fc9fb61..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/nuU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/1AUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DBB.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/1ABpB.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSolution.cfg b/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 01a0a2ff95..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/B.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pB.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; - - BPISO - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/label/nCorrectors.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/mhdFoam.cfg b/applications/solvers/electromagnetics/mhdFoam/FoamX/mhdFoam.cfg deleted file mode 100644 index 78649a6265..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/mhdFoam.cfg +++ /dev/null @@ -1,55 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible laminar magneto-hydrodynamics code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - transportProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pKinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/electromagnetics/B.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/electromagnetics/pB.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - B - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/electromagnetics/B.cfg"; - } - - pB - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/electromagnetics/pB.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/electromagnetics/mhdFoam/FoamX/transportProperties.cfg b/applications/solvers/electromagnetics/mhdFoam/FoamX/transportProperties.cfg deleted file mode 100644 index 4e02f55295..0000000000 --- a/applications/solvers/electromagnetics/mhdFoam/FoamX/transportProperties.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/rho.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/nu.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/electromagnetics/mu.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/electromagnetics/sigma.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantFoam/FoamX/buoyantFoam.cfg b/applications/solvers/heatTransfer/buoyantFoam/FoamX/buoyantFoam.cfg deleted file mode 100644 index 6e12f51996..0000000000 --- a/applications/solvers/heatTransfer/buoyantFoam/FoamX/buoyantFoam.cfg +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Solver for transient, buoyant, turbulent flow of compressible fluids for ventilation and heat-transfer"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalPropertiesMixture.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsCompressible.cfg"; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Rkinematic.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - wall fixedFluxBuoyantPressure; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - R - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/R.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/R.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/heatTransfer/buoyantFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 3dd417ae43..0000000000 --- a/applications/solvers/heatTransfer/buoyantFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,h) Gauss <>; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div(R) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),pd) Gauss linear corrected; - laplacian(alphaEff,h) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - pd; -} - - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantFoam/FoamX/defaults/system/fvSolution b/applications/solvers/heatTransfer/buoyantFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index ffaf80589c..0000000000 --- a/applications/solvers/heatTransfer/buoyantFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - rho ICCG 0 0; - pd ICCG 1e-06 0; - U BICCG 1e-05 0; - h BICCG 1e-05 0; - k BICCG 1e-05 0; - epsilon BICCG 1e-05 0; - R BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes.cfg b/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index add633e5c8..0000000000 --- a/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/pd.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 86097735a6..0000000000 --- a/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phih.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/muEffGradUT.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 745e466004..0000000000 --- a/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,24 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUpd.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/alphaEffh.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DepsilonEffEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DREffR.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSolution.cfg b/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSolution.cfg deleted file mode 100644 index b7c303b29a..0000000000 --- a/applications/solvers/heatTransfer/buoyantFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pd.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/h.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/buoyantSimpleFoam.cfg b/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/buoyantSimpleFoam.cfg deleted file mode 100644 index 837bf8793c..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/buoyantSimpleFoam.cfg +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Solver for steady, buoyant, turbulent flow of compressible fluids for ventilation and heat-transfer"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictSteady.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/thermophysicalProperties/thermophysicalPropertiesMixture.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsCompressible.cfg"; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Rkinematic.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - wall fixedFluxBuoyantPressure; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - T - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/thermal/T.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/thermal/T.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - R - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/R.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/R.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 8b8dd1078a..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,75 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default steadyState; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,h) Gauss <>; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div(R) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),pd) Gauss linear corrected; - laplacian(alphaEff,h) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - pd; -} - - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/defaults/system/fvSolution b/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index d4f55fd54f..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,54 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - pd ICCG 1e-08 0; - U BICCG 1e-05 0; - h BICCG 1e-05 0; - k BICCG 1e-05 0; - epsilon BICCG 1e-05 0; - R BICCG 1e-05 0; -} - -SIMPLE -{ - nNonOrthogonalCorrectors 0; - pdRefCell 0; - pdRefValue 0; -} - -relaxationFactors -{ - rho 1.0; - pd 0.3; - U 0.5; - h 0.5; - k 0.5; - epsilon 0.5; - R 0.5; -} - - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/fvSchemes.cfg b/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 1bc8323f8a..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/steady.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "../../buoyantFoam/FoamX/fvSchemes/divSchemes.cfg"; - include "../../buoyantFoam/FoamX/fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/pd.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/fvSolution.cfg b/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 3b944716a6..0000000000 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,58 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pd.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/h.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - } - } - - SIMPLE - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/label/nNonOrthogonalCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/ref/pdRef.cfg"; - } - } - - relaxationFactors - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/scalar01/rho.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/pd.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/U.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/h.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/k.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/R.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/channelOodles/FoamX/channelOodles.cfg b/applications/solvers/incompressible/channelOodles/FoamX/channelOodles.cfg deleted file mode 100644 index 0f0e8a64c2..0000000000 --- a/applications/solvers/incompressible/channelOodles/FoamX/channelOodles.cfg +++ /dev/null @@ -1,73 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible large eddy simulation (LES) code for channel flow"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - transportProperties; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/LESmodelsIncompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pKinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuSgs.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Bkinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuTilda.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - nuSgs - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuSgs.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuSgs.cfg"; - } - - B - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/B.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/B.cfg"; - } - - nuTilda - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuTilda.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuTilda.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSchemes b/applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 5e7d87dd92..0000000000 --- a/applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,76 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default backward; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,k) Gauss <>; - div(phi,B) Gauss <>; - div(B) Gauss linear; - div(phi,nuTilda) Gauss <>; - div((nuEff*dev(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DBEff,B) Gauss linear corrected; - laplacian(DnuTildaEff,nuTilda) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(U) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSolution b/applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSolution deleted file mode 100644 index 451878b290..0000000000 --- a/applications/solvers/incompressible/channelOodles/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-06 0; - pFinal ICCG 1e-06 0; - U BICCG 1e-05 0; - k BICCG 1e-05 0; - B BICCG 1e-05 0; - nuTilda BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; - pRefCell 1001; - pRefValue 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/channelOodles/FoamX/fvSchemes.cfg b/applications/solvers/incompressible/channelOodles/FoamX/fvSchemes.cfg deleted file mode 100644 index 650b94943d..0000000000 --- a/applications/solvers/incompressible/channelOodles/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "../../../incompressible/turbFoam/FoamX/fvSchemes/gradSchemes.cfg"; - include "../../oodles/FoamX/fvSchemes/divSchemes.cfg"; - include "../../oodles/FoamX/fvSchemes/laplacianSchemes.cfg"; - include "../../../incompressible/turbFoam/FoamX/fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/channelOodles/FoamX/fvSolution.cfg b/applications/solvers/incompressible/channelOodles/FoamX/fvSolution.cfg deleted file mode 100644 index 1004ec6f8f..0000000000 --- a/applications/solvers/incompressible/channelOodles/FoamX/fvSolution.cfg +++ /dev/null @@ -1,35 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pFinal.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/B.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/nuTilda.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/channelOodles/FoamX/transportProperties.cfg b/applications/solvers/incompressible/channelOodles/FoamX/transportProperties.cfg deleted file mode 100644 index 0d9e8b91e0..0000000000 --- a/applications/solvers/incompressible/channelOodles/FoamX/transportProperties.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedVector/Ubar.cfg"; - include "$FOAMX_CONFIG/dictionaries/transportProperties/incompressibleTransportModel.cfg"; - include "$FOAMX_CONFIG/dictionaries/transportProperties/NewtonianViscosity.cfg"; - include "$FOAMX_CONFIG/dictionaries/transportProperties/CrossPowerLawCoeffs.cfg"; - include "$FOAMX_CONFIG/dictionaries/transportProperties/BirdCarreauCoeffs.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C index d76d8c9ce4..5b8d15c544 100644 --- a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C +++ b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C @@ -56,18 +56,16 @@ int main(int argc, char *argv[]) { # include "readControls.H" # include "CourantNo.H" + + // Make the fluxes absolute + fvc::makeAbsolute(phi, U); + # include "setDeltaT.H" runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; - // Make the fluxes absolute - if (mesh.changing()) - { - phi = fvc::interpolate(U) & mesh.Sf(); - } - mesh.update(); if (mesh.changing() && correctPhi) @@ -75,14 +73,8 @@ int main(int argc, char *argv[]) # include "correctPhi.H" } - // Keep the absolute fluxes for use in ddtPhiCorr - surfaceScalarField phiAbs0("phiAbs0", phi); - // Make the fluxes relative to the mesh motion - if (mesh.changing()) - { - fvc::makeRelative(phi, U); - } + fvc::makeRelative(phi, U); if (mesh.changing() && checkMeshCourantNo) { @@ -104,51 +96,11 @@ int main(int argc, char *argv[]) U = rAU*UEqn.H(); phi = (fvc::interpolate(U) & mesh.Sf()); - if (ddtPhiCorr) - { - if (mesh.changing()) - { - dimensionedScalar rDeltaT = 1.0/mesh.time().deltaT(); - - volScalarField V0byV - ( - IOobject - ( - "V0byV", - mesh.time().timeName(), - mesh - ), - mesh, - dimensionedScalar("V0byV", dimless, 1), - zeroGradientFvPatchScalarField::typeName - ); - V0byV.dimensionedInternalField() = mesh.V0()/mesh.V(); - V0byV.correctBoundaryConditions(); - - phi += rDeltaT* - ( - fvc::interpolate(rAU*V0byV)*phiAbs0 - - (fvc::interpolate(rAU*V0byV*U.oldTime()) & mesh.Sf()) - ); - } - else - { - phi += fvc::ddtPhiCorr(rAU, U, phiAbs0); - } - } - if (p.needReference()) { - if (mesh.changing()) - { - fvc::makeRelative(phi, U); - adjustPhi(phi, U, p); - fvc::makeAbsolute(phi, U); - } - else - { - adjustPhi(phi, U, p); - } + fvc::makeRelative(phi, U); + adjustPhi(phi, U, p); + fvc::makeAbsolute(phi, U); } for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) @@ -183,11 +135,11 @@ int main(int argc, char *argv[]) p.relax(); } - U -= rAU*fvc::grad(p); - U.correctBoundaryConditions(); - // Make the fluxes relative to the mesh motion fvc::makeRelative(phi, U); + + U -= rAU*fvc::grad(p); + U.correctBoundaryConditions(); } } diff --git a/applications/solvers/incompressible/icoFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/incompressible/icoFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 408a65b671..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,67 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; -} - -laplacianSchemes -{ - default none; - laplacian(nu,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(HbyA) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoFoam/FoamX/defaults/system/fvSolution b/applications/solvers/incompressible/icoFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 290da5ea43..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,48 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p PCG - { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - U PCG - { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes.cfg b/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index bb8da02b54..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 70246c785f..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index feff7678a8..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/p.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/interpolationSchemes.cfg b/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/interpolationSchemes.cfg deleted file mode 100644 index 218a143880..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/interpolationSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -interpolationSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/HbyA.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 6cc1f425ac..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/nuU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/1AUp.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoFoam/FoamX/fvSolution.cfg b/applications/solvers/incompressible/icoFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 31785b609b..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,31 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/icoFoam/FoamX/icoFoam.cfg b/applications/solvers/incompressible/icoFoam/FoamX/icoFoam.cfg deleted file mode 100644 index ded9a15725..0000000000 --- a/applications/solvers/incompressible/icoFoam/FoamX/icoFoam.cfg +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible unsteady laminar flow code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/transportProperties/NewtonianSinglePhaseTransportProperties.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pKinematic.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSchemes b/applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 2640c70ed2..0000000000 --- a/applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default backward; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,k) Gauss <>; - div(phi,B) Gauss <>; - div(phi,nuTilda) Gauss <>; - - div(B) Gauss linear; - div((nuEff*dev(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DBEff,B) Gauss linear corrected; - laplacian(DnuTildaEff,nuTilda) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(U) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSolution b/applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSolution deleted file mode 100644 index 324cf4b66e..0000000000 --- a/applications/solvers/incompressible/oodles/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-06 0; - pFinal ICCG 1e-06 0; - U BICCG 1e-05 0; - k BICCG 1e-05 0; - B BICCG 1e-05 0; - nuTilda BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/oodles/FoamX/fvSchemes.cfg b/applications/solvers/incompressible/oodles/FoamX/fvSchemes.cfg deleted file mode 100644 index 2fde7b71b7..0000000000 --- a/applications/solvers/incompressible/oodles/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "../../../incompressible/turbFoam/FoamX/fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "../../../incompressible/turbFoam/FoamX/fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/oodles/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/incompressible/oodles/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 3a0a146977..0000000000 --- a/applications/solvers/incompressible/oodles/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiBT.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/B.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiNuTilda.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/nuEffGradUT.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/oodles/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/incompressible/oodles/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index af133fa943..0000000000 --- a/applications/solvers/incompressible/oodles/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,24 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/nuEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/1AUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DBEffB.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DnuTildaEffNuTilda.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/oodles/FoamX/fvSolution.cfg b/applications/solvers/incompressible/oodles/FoamX/fvSolution.cfg deleted file mode 100644 index 1004ec6f8f..0000000000 --- a/applications/solvers/incompressible/oodles/FoamX/fvSolution.cfg +++ /dev/null @@ -1,35 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pFinal.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/B.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/nuTilda.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/oodles/FoamX/oodles.cfg b/applications/solvers/incompressible/oodles/FoamX/oodles.cfg deleted file mode 100644 index df69a317d4..0000000000 --- a/applications/solvers/incompressible/oodles/FoamX/oodles.cfg +++ /dev/null @@ -1,79 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible large eddy simulation (LES) code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/transportProperties/singlePhaseTransportProperties.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/LESmodelsIncompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pKinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuSgs.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Bkinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuTilda.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - turbulentInlet - { - description "Turbulent inlet"; - parentType inlet; - } -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - turbulentInlet turbulentInlet; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - nuSgs - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuSgs.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuSgs.cfg"; - } - - B - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/B.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/B.cfg"; - } - - nuTilda - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuTilda.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuTilda.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/simpleFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/incompressible/simpleFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 071e9c6e34..0000000000 --- a/applications/solvers/incompressible/simpleFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,79 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default steadyState; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div(phi,nuTilda) Gauss <>; - - div(R) Gauss linear; - div((nuEff*dev(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; - laplacian(DnuTildaEff,nuTilda) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(U) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/simpleFoam/FoamX/defaults/system/fvSolution b/applications/solvers/incompressible/simpleFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 86126ac846..0000000000 --- a/applications/solvers/incompressible/simpleFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,51 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-06 0.01; - U BICCG 1e-05 0.1; - k BICCG 1e-05 0.1; - epsilon BICCG 1e-05 0.1; - R BICCG 1e-05 0.1; - nuTilda BICCG 1e-05 0.1; -} - -SIMPLE -{ - nNonOrthogonalCorrectors 0; -} - -relaxationFactors -{ - p 0.3; - U 0.7; - k 0.7; - epsilon 0.7; - R 0.7; - nuTilda 0.7; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/simpleFoam/FoamX/fvSchemes.cfg b/applications/solvers/incompressible/simpleFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 4d6eca680d..0000000000 --- a/applications/solvers/incompressible/simpleFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,45 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 1.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes.cfg; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/steady.cfg"; - - include "../../turbFoam/FoamX/fvSchemes/gradSchemes.cfg"; - include "../../turbFoam/FoamX/fvSchemes/divSchemes.cfg"; - include "../../turbFoam/FoamX/fvSchemes/laplacianSchemes.cfg"; - include "../../turbFoam/FoamX/fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/simpleFoam/FoamX/fvSolution.cfg b/applications/solvers/incompressible/simpleFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 9084535b39..0000000000 --- a/applications/solvers/incompressible/simpleFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/nuTilda.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/SIMPLE.cfg"; - - relaxationFactors - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/scalar01/p.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/U.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/k.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/R.cfg"; - include "$FOAMX_CONFIG/entries/scalar01/nuTilda.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/simpleFoam/FoamX/simpleFoam.cfg b/applications/solvers/incompressible/simpleFoam/FoamX/simpleFoam.cfg deleted file mode 100644 index abe087fa73..0000000000 --- a/applications/solvers/incompressible/simpleFoam/FoamX/simpleFoam.cfg +++ /dev/null @@ -1,73 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible steady turbulent flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictSteady.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/transportProperties/singlePhaseTransportProperties.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsIncompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pKinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Rkinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuTilda.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - R - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/R.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/R.cfg"; - } - - nuTilda - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuTilda.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuTilda.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/incompressible/turbFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index a43602ff79..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,78 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; - grad(U) Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div(phi,nuTilda) Gauss <>; - div(R) Gauss linear; - div((nuEff*dev(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(nuEff,U) Gauss linear corrected; - laplacian((1|A(U)),p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(DREff,R) Gauss linear corrected; - laplacian(DnuTildaEff,nuTilda) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(U) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/defaults/system/fvSolution b/applications/solvers/incompressible/turbFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 3f61d3d934..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-06 0; - U BICCG 1e-05 0; - k BICCG 1e-05 0; - epsilon BICCG 1e-05 0; - R BICCG 1e-05 0; - nuTilda BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes.cfg b/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index bb8da02b54..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index c335c4d96e..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,26 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiNuTilda.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/nuEffGradUT.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index 191b772a68..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/p.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/U.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/interpolationSchemes.cfg b/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/interpolationSchemes.cfg deleted file mode 100644 index 5def0dab55..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/interpolationSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -interpolationSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/U.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 8385598f7b..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/nuEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/1AUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DepsilonEffEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DREffR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DnuTildaEffNuTilda.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/fvSolution.cfg b/applications/solvers/incompressible/turbFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 1d5289fb2b..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,35 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/nuTilda.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/incompressible/turbFoam/FoamX/turbFoam.cfg b/applications/solvers/incompressible/turbFoam/FoamX/turbFoam.cfg deleted file mode 100644 index 91f7ce748c..0000000000 --- a/applications/solvers/incompressible/turbFoam/FoamX/turbFoam.cfg +++ /dev/null @@ -1,73 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible transient turbulent flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/transportProperties/singlePhaseTransportProperties.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsIncompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/pKinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Rkinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuTilda.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - R - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/R.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/R.cfg"; - } - - nuTilda - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuTilda.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuTilda.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/bubbleFoam.cfg b/applications/solvers/multiphase/bubbleFoam/FoamX/bubbleFoam.cfg deleted file mode 100644 index ee0468f0a2..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/bubbleFoam.cfg +++ /dev/null @@ -1,72 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible turbulent Eulerian two phase flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - transportProperties; - turbulenceProperties; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Ua.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Ub.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/alpha.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - alpha - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/alpha.cfg"; - } - - Ua - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - Ub - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/constant/transportProperties b/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/constant/transportProperties deleted file mode 100644 index f5d8736ce0..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/constant/transportProperties +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -rhoa rhoa [1 -3 0 0 0 0 0] 1; - -rhob rhob [1 -3 0 0 0 0 0] 1000; - -nua nua [0 2 -1 0 0 0 0] 1.6e-05; - -nub nub [0 2 -1 0 0 0 0] 1e-06; - -da da [0 1 0 0 0 0 0] 0.003; - -db db [0 1 0 0 0 0 0] 0.0001; - -Cvm Cvm [0 0 0 0 0 0 0] 0.5; - -Cl Cl [0 0 0 0 0 0 0] 0; - -Ct Ct [0 0 0 0 0 0 0] 1; - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/constant/turbulenceProperties b/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/constant/turbulenceProperties deleted file mode 100644 index 0956e1957f..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/constant/turbulenceProperties +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object turbulenceProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -turbulenceModel laminar; - -turbulence off; - -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; -} - -wallFunctionCoeffs -{ - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index c2d2b6c3fd..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,72 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - div(phia,Ua) Gauss <>; - div(phib,Ub) Gauss <>; - div(phib,k) Gauss <>; - div(phib,epsilon) Gauss <>; - div(phi,alpha) Gauss <>; - div((-nuEffa*grad(Ua).T())) Gauss linear; - div((-nuEffb*grad(Ub).T())) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(nuEffa,Ua) Gauss linear corrected; - laplacian(nuEffb,Ub) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/system/fvSolution b/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index e59bb7c8de..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,47 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-10 0; - Ua BICCG 1e-05 0; - Ub BICCG 1e-05 0; - alpha BICCG 1e-10 0; - beta BICCG 1e-10 0; - k BICCG 1e-05 0; - epsilon BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; - nAlphaCorr 2; - correctAlpha no; - pRefCell 0; - pRefValue 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes.cfg b/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 3c334a8bc3..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 865fd600e6..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiaUa.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phibUb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phibk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phibEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiAlpha.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/nuEffaGradUaT.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/nuEffbGradUbT.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 31db10c709..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,22 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/nuEffaUa.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/nuEffbUb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/fvSolution.cfg b/applications/solvers/multiphase/bubbleFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 1aa4d1e114..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,47 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Ua.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Ub.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/alpha.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/beta.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - } - } - - PISO - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/label/nCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nNonOrthogonalCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nAlphaCorr.cfg"; - include "$FOAMX_CONFIG/entries/Switch/correctAlpha.cfg"; - include "$FOAMX_CONFIG/entries/ref/pRef.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/transportProperties.cfg b/applications/solvers/multiphase/bubbleFoam/FoamX/transportProperties.cfg deleted file mode 100644 index fd08411380..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/transportProperties.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/rhoa.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/rhob.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/nua.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/nub.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/da.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/db.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/Cvm.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/Cl.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/Ct.cfg"; -} - -default -{ - include "defaults/constant/transportProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/bubbleFoam/FoamX/turbulenceProperties.cfg b/applications/solvers/multiphase/bubbleFoam/FoamX/turbulenceProperties.cfg deleted file mode 100644 index 8510b9bafb..0000000000 --- a/applications/solvers/multiphase/bubbleFoam/FoamX/turbulenceProperties.cfg +++ /dev/null @@ -1,34 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "Turbulence properties"; -dictionaryPath "constant"; -entries -{ - include "$FOAMX_CONFIG/entries/turbulenceModels/incompressible/turbulenceModel.cfg"; - include "$FOAMX_CONFIG/entries/Switch/turbulence.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/laminarCoeffs.cfg"; - include "$FOAMX_CONFIG/entries/turbulenceModels/incompressible/kEpsilonCoeffsWithAlphak.cfg"; - include "$FOAMX_CONFIG/entries/turbulenceModels/incompressible/wallFunctionCoeffs.cfg"; -} - -options -{ - turbulenceModel - { - editable 0; - } -} - -default -{ - include "defaults/constant/turbulenceProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C index f0631fdd99..053a9fa813 100644 --- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C @@ -67,18 +67,16 @@ int main(int argc, char *argv[]) { #include "readControls.H" #include "CourantNo.H" + + // Make the fluxes absolute + fvc::makeAbsolute(phi, U); + #include "setDeltaT.H" runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; - // Make the fluxes absolute - if (mesh.changing()) - { - phi = fvc::interpolate(U) & mesh.Sf(); - } - scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime(); // Do any mesh changes @@ -99,14 +97,8 @@ int main(int argc, char *argv[]) #include "correctPhi.H" } - // Keep the absolute fluxes for use in ddtPhiCorr - surfaceScalarField phiAbs0("phiAbs0", phi); - // Make the fluxes relative to the mesh motion - if (mesh.changing()) - { - fvc::makeRelative(phi, U); - } + fvc::makeRelative(phi, U); if (mesh.changing() && checkMeshCourantNo) { diff --git a/applications/solvers/multiphase/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interDyMFoam/pEqn.H index 74c301af6e..c6961f6c22 100644 --- a/applications/solvers/multiphase/interDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/interDyMFoam/pEqn.H @@ -5,34 +5,6 @@ U = rAU*UEqn.H(); surfaceScalarField phiU("phiU", (fvc::interpolate(U) & mesh.Sf())); - if (ddtPhiCorr) - { - //phiU += fvc::ddtPhiCorr(rAU, rho, U, phiAbs0); - - dimensionedScalar rDeltaT = 1.0/mesh.time().deltaT(); - - volScalarField V0byV - ( - IOobject - ( - "V0byV", - mesh.time().timeName(), - mesh - ), - mesh, - dimensionedScalar("V0byV", dimless, 1), - zeroGradientFvPatchScalarField::typeName - ); - V0byV.dimensionedInternalField() = mesh.V0()/mesh.V(); - V0byV.correctBoundaryConditions(); - - phiU += rDeltaT* - ( - fvc::interpolate(rAU*rho.oldTime()*V0byV)*phiAbs0 - - (fvc::interpolate(rAU*rho.oldTime()*V0byV*U.oldTime()) & mesh.Sf()) - ); - } - phi = phiU + ( fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma) @@ -41,16 +13,9 @@ if (pd.needReference()) { - if (mesh.changing()) - { - fvc::makeRelative(phi, U); - adjustPhi(phi, U, pd); - fvc::makeAbsolute(phi, U); - } - else - { - adjustPhi(phi, U, pd); - } + fvc::makeRelative(phi, U); + adjustPhi(phi, U, pd); + fvc::makeAbsolute(phi, U); } for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) diff --git a/applications/solvers/multiphase/interFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/multiphase/interFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 9bd999a781..0000000000 --- a/applications/solvers/multiphase/interFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,67 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - div(rho*phi,U) Gauss limitedLinearV 1; - div(phi,gamma) Gauss vanLeer; - div(phirb,gamma) Gauss interfaceCompression; -} - -laplacianSchemes -{ - default Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(HbyA) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - pd; - pcorr; - gamma; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/interFoam/FoamX/defaults/system/fvSolution b/applications/solvers/multiphase/interFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index b9fdd275e5..0000000000 --- a/applications/solvers/multiphase/interFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,64 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - pcorr PCG - { - preconditioner DIC; - tolerance 1e-10; - relTol 0; - }; - pd PCG - { - preconditioner DIC; - tolerance 1e-7; - relTol 0.05; - }; - pdFinal PCG - { - preconditioner DIC; - tolerance 1e-7; - relTol 0; - }; - U PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; -} - -PISO -{ - momentumPredictor no; - nCorrectors 3; - nNonOrthogonalCorrectors 1; - nGammaCorr 1; - nGammaSubCycles 2; - cGamma 1; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/interFoam/FoamX/fvSchemes.cfg b/applications/solvers/multiphase/interFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index b7de774ca6..0000000000 --- a/applications/solvers/multiphase/interFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/defaultOnly.cfg"; - include "fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/pdPcorrGamma.cfg" -; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/interFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/multiphase/interFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 488ddd40aa..0000000000 --- a/applications/solvers/multiphase/interFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/rhoPhiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiGamma.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phirbGamma.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/interFoam/FoamX/fvSchemes/interpolationSchemes.cfg b/applications/solvers/multiphase/interFoam/FoamX/fvSchemes/interpolationSchemes.cfg deleted file mode 100644 index 9a7b1ed7ec..0000000000 --- a/applications/solvers/multiphase/interFoam/FoamX/fvSchemes/interpolationSchemes.cfg +++ /dev/null @@ -1,18 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -interpolationSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/default.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/interFoam/FoamX/fvSolution.cfg b/applications/solvers/multiphase/interFoam/FoamX/fvSolution.cfg deleted file mode 100644 index da598bafdb..0000000000 --- a/applications/solvers/multiphase/interFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,45 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pcorr.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pd.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pdFinal.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - } - } - - PISO - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/Switch/momentumPredictor.cfg"; - include "$FOAMX_CONFIG/entries/label/nCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nNonOrthogonalCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nGammaCorr.cfg"; - include "$FOAMX_CONFIG/entries/label/nGammaSubCycles.cfg"; - include "$FOAMX_CONFIG/entries/scalar/cGamma.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/interFoam/FoamX/interFoam.cfg b/applications/solvers/multiphase/interFoam/FoamX/interFoam.cfg deleted file mode 100644 index b0298c5183..0000000000 --- a/applications/solvers/multiphase/interFoam/FoamX/interFoam.cfg +++ /dev/null @@ -1,57 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Free surface-capturing unsteady laminar two-phase flow code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictAdjustTimeStep.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/transportProperties/twoPhaseTransportProperties.cfg"; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pd.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/gamma.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - - wallContactAngle - { - description "Wall boundary condition with specified contact-angle"; - parentType wall; - } -} - -patchFieldsPhysicalTypes -{ - gamma - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/gamma.cfg"; - wallContactAngle gammaContactAngle; - } - - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - pd - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/pd.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesInterFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/multiphase/lesInterFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index f827237608..0000000000 --- a/applications/solvers/multiphase/lesInterFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,73 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - div(rho*phi,U) Gauss linear; - div(phi,gamma) Gauss <>; - div(phirb,gamma) Gauss <>; - div(phi,k) Gauss <>; - div(phi,B) Gauss <>; - div(phi,nuTilda) Gauss <>; - - div(B) Gauss linear; - div((nuEff*dev(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(HbyA) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - pd; - pcorr; - gamma; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesInterFoam/FoamX/defaults/system/fvSolution b/applications/solvers/multiphase/lesInterFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 7f9bb4811d..0000000000 --- a/applications/solvers/multiphase/lesInterFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,47 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - pcorr ICCG 1e-08 0; - pd ICCG 1e-08 0; - pdFinal ICCG 1e-09 0; - U BICCG 1e-08 0; - k BICCG 1e-08 0; - B BICCG 1e-08 0; - nuTilda BICCG 1e-08 0; -} - -PISO -{ - momentumPredictor no; - nCorrectors 2; - nNonOrthogonalCorrectors 1; - nGammaCorr 1; - nGammaSubCycles 4; - cGamma 2; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes.cfg b/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index b7de774ca6..0000000000 --- a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/defaultOnly.cfg"; - include "fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/pdPcorrGamma.cfg" -; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/divPhiU.cfg b/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/divPhiU.cfg deleted file mode 100644 index 3328693803..0000000000 --- a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/divPhiU.cfg +++ /dev/null @@ -1,55 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -div(phi,U) -{ - type compound; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/discretisationScheme.cfg"; - - interpolationScheme - { - type selection; - entries - { - localBlended - { - type compound; - entries - { - scheme1 - { - type selection; - entries - { - include "$FOAMX_CONFIG/entries/interpolations/Phi.cfg"; - include "$FOAMX_CONFIG/entries/interpolations/linear.cfg"; - } - } - - scheme2 - { - type selection; - entries - { - include "$FOAMX_CONFIG/entries/interpolations/GammaV.cfg"; - include "$FOAMX_CONFIG/entries/interpolations/upwind.cfg"; - } - } - } - } - - include "$FOAMX_CONFIG/entries/interpolations/GammaV.cfg"; - include "$FOAMX_CONFIG/entries/interpolations/upwind.cfg"; - } - } - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 166508b323..0000000000 --- a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,26 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/rhoPhiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiGamma.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phirbGamma.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiBT.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/B.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiNuTilda.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/nuEffGradUT.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/interpolationSchemes.cfg b/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/interpolationSchemes.cfg deleted file mode 100644 index 218a143880..0000000000 --- a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSchemes/interpolationSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -interpolationSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/HbyA.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSolution.cfg b/applications/solvers/multiphase/lesInterFoam/FoamX/fvSolution.cfg deleted file mode 100644 index d22a13cec8..0000000000 --- a/applications/solvers/multiphase/lesInterFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,48 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pcorr.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pd.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pdFinal.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/B.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/nuTilda.cfg"; - } - } - - PISO - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/Switch/momentumPredictor.cfg"; - include "$FOAMX_CONFIG/entries/label/nCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nNonOrthogonalCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nGammaCorr.cfg"; - include "$FOAMX_CONFIG/entries/label/nGammaSubCycles.cfg"; - include "$FOAMX_CONFIG/entries/scalar/cGamma.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesInterFoam/FoamX/lesInterFoam.cfg b/applications/solvers/multiphase/lesInterFoam/FoamX/lesInterFoam.cfg deleted file mode 100644 index 6f0cd9bce2..0000000000 --- a/applications/solvers/multiphase/lesInterFoam/FoamX/lesInterFoam.cfg +++ /dev/null @@ -1,86 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Free surface-capturing unsteady LES two-phase flow code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictAdjustTimeStep.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/transportProperties/twoPhaseTransportProperties.cfg"; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/LESmodelsIncompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pd.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/gamma.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuSgs.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Bkinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuTilda.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - - wallContactAngle - { - description "Wall boundary condition with specified contact-angle"; - parentType wall; - } -} - -patchFieldsPhysicalTypes -{ - gamma - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/gamma.cfg"; - wallContactAngle gammaContactAngle; - } - - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - pd - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/pd.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - nuSgs - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuSgs.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuSgs.cfg"; - } - - B - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/B.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/B.cfg"; - } - - nuTilda - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuTilda.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuTilda.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasInterFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/multiphase/rasInterFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index d19efb662c..0000000000 --- a/applications/solvers/multiphase/rasInterFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,74 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - div(rho*phi,U) Gauss linear; - div(phi,gamma) Gauss <>; - div(phirb,gamma) Gauss <>; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phi,R) Gauss <>; - div(phi,nuTilda) Gauss <>; - - div(R) Gauss linear; - div((nuEff*dev(grad(U).T()))) Gauss linear; -} - -laplacianSchemes -{ - default Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; - interpolate(HbyA) linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - pd; - pcorr; - gamma; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasInterFoam/FoamX/defaults/system/fvSolution b/applications/solvers/multiphase/rasInterFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 86b113d4be..0000000000 --- a/applications/solvers/multiphase/rasInterFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,48 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - pcorr ICCG 1e-10 0; - pd ICCG 1e-10 0; - pdFinal ICCG 1e-08 0; - U BICCG 1e-06 0; - k BICCG 1e-08 0; - epsilon BICCG 1e-08 0; - R BICCG 1e-08 0; - nuTilda BICCG 1e-08 0; -} - -PISO -{ - momentumPredictor no; - nCorrectors 3; - nNonOrthogonalCorrectors 0; - nGammaCorr 1; - nGammaSubCycles 4; - cGamma 2; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes.cfg b/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index b7de774ca6..0000000000 --- a/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,29 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/defaultOnly.cfg"; - include "fvSchemes/interpolationSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/pdPcorrGamma.cfg" -; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index d4e641673e..0000000000 --- a/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/rhoPhiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiGamma.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phirbGamma.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiEpsilon.cfg" -; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiR.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiNuTilda.cfg" - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/nuEffGradUT.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes/interpolationSchemes.cfg b/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes/interpolationSchemes.cfg deleted file mode 100644 index 218a143880..0000000000 --- a/applications/solvers/multiphase/rasInterFoam/FoamX/fvSchemes/interpolationSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -interpolationSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/HbyA.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasInterFoam/FoamX/fvSolution.cfg b/applications/solvers/multiphase/rasInterFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 67a7c632a8..0000000000 --- a/applications/solvers/multiphase/rasInterFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,48 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pcorr.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pd.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pdFinal.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/R.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/nuTilda.cfg"; - } - } - - PISO - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/label/nCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nNonOrthogonalCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nGammaCorr.cfg"; - include "$FOAMX_CONFIG/entries/label/nGammaSubCycles.cfg"; - include "$FOAMX_CONFIG/entries/scalar/cGamma.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasInterFoam/FoamX/rasInterFoam.cfg b/applications/solvers/multiphase/rasInterFoam/FoamX/rasInterFoam.cfg deleted file mode 100644 index 090c3062e6..0000000000 --- a/applications/solvers/multiphase/rasInterFoam/FoamX/rasInterFoam.cfg +++ /dev/null @@ -1,94 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Free surface-capturing unsteady RAS two-phase flow code"; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictAdjustTimeStep.cfg"; - fvSchemes; - fvSolution; - include "$FOAMX_CONFIG/dictionaries/transportProperties/twoPhaseTransportProperties.cfg"; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/turbulenceModelsIncompressible.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pd.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/gamma.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Rkinematic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/nuTilda.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; - - wallContactAngle - { - description "Wall boundary condition with specified contact-angle"; - parentType wall; - } - - wallFunctionsContactAngle - { - description "Wall-functions boundary condition with specified contact-angle"; - parentType wallFunctions; - } -} - -patchFieldsPhysicalTypes -{ - gamma - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/gamma.cfg"; - wallContactAngle gammaContactAngle; - wallFunctionsContactAngle gammaContactAngle; - } - - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - pd - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/pd.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - R - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/R.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/R.cfg"; - } - - nuTilda - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/nuTilda.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/nuTilda.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/defaults/constant/transportProperties b/applications/solvers/multiphase/settlingFoam/FoamX/defaults/constant/transportProperties deleted file mode 100644 index 8c87e4d092..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/defaults/constant/transportProperties +++ /dev/null @@ -1,62 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -muc muc [1 -1 -1 0 0 0 0] 0.00178; - -plasticViscosityCoeff plasticViscosityCoeff [1 -1 -1 0 0 0 0] 0.00023143; - -plasticViscosityExponent plasticViscosityExponent [0 0 0 0 0 0 0] 179.26; - -BinghamPlastic on; - -yieldStressCoeff yieldStressCoeff [1 -1 -2 0 0 0 0] 0.00042189; - -yieldStressExponent yieldStressExponent [0 0 0 0 0 0 0] 1050.8; - -yieldStressOffset yieldStressOffset [0 0 0 0 0 0 0] 0; - -rhoc rhoc [1 -3 0 0 0 0 0] 996; - -rhod rhod [1 -3 0 0 0 0 0] 1996; - -VdjModel simple; - -simpleCoeffs -{ - V0 V0 [0 1 -1 0 0 0 0] (0 -0.002198 0); - a a [0 0 0 0 0 0 0] 285.84; - a1 a1 [0 0 0 0 0 0 0] 0; - alphaMin alphaMin [0 0 0 0 0 0 0] 0; -} - -generalCoeffs -{ - V0 V0 [0 1 -1 0 0 0 0] (0 -0.0018 0); - a a [0 0 0 0 0 0 0] 1e-05; - a1 a1 [0 0 0 0 0 0 0] 0.1; - alphaMin alphaMin [0 0 0 0 0 0 0] 2e-05; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/defaults/constant/turbulenceProperties b/applications/solvers/multiphase/settlingFoam/FoamX/defaults/constant/turbulenceProperties deleted file mode 100644 index ef545fe3bd..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/defaults/constant/turbulenceProperties +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object turbulenceProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -turbulenceModel kEpsilon; - -turbulence on; - -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0.85; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; -} - -wallFunctionCoeffs -{ - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/multiphase/settlingFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 6a2a8f7963..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,72 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - div(phi,U) Gauss <>; - div(phi,k) Gauss <>; - div(phi,epsilon) Gauss <>; - div(phiAlpha,Alpha) Gauss <>; - div(phiVdj,Vdj) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - laplacian(mut,Alpha) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/defaults/system/fvSolution b/applications/solvers/multiphase/settlingFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index a382f29c64..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-07 0; - U BICCG 1e-07 0; - k BICCG 1e-07 0; - epsilon BICCG 1e-07 0; - rho ICCG 1e-07 0; - Alpha BICCG 1e-07 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes.cfg b/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 3c334a8bc3..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index c709e6b447..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,24 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phik.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiAlphaAlpha.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiVdjVdj.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index 34b83a6427..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/muEffU.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DkEffk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DepsilonEffEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/mutAlpha.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/fvSolution.cfg b/applications/solvers/multiphase/settlingFoam/FoamX/fvSolution.cfg deleted file mode 100644 index d6149dc80e..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,35 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/U.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/rho.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Alpha.cfg"; - } - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/PISO.cfg"; -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/settlingFoam.cfg b/applications/solvers/multiphase/settlingFoam/FoamX/settlingFoam.cfg deleted file mode 100644 index a986cde1e0..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/settlingFoam.cfg +++ /dev/null @@ -1,66 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible turbulent two phase flow settling code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDict.cfg"; - fvSchemes; - fvSolution; - transportProperties; - turbulenceProperties; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/U.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/alpha.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - alpha - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/alpha.cfg"; - } - - U - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/transportProperties.cfg b/applications/solvers/multiphase/settlingFoam/FoamX/transportProperties.cfg deleted file mode 100644 index a9b4d286ba..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/transportProperties.cfg +++ /dev/null @@ -1,70 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/muc.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/plasticViscosityCoeff.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/plasticViscosityExponent.cfg"; - include "$FOAMX_CONFIG/entries/Switch/BinghamPlastic.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/yieldStressCoeff.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/yieldStressExponent.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/yieldStressOffset.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/rhoc.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/rhod.cfg"; - - VdjModel - { - type model; - displayName "VdjModel"; - description "VDJ model selection"; - default simple; - valueList - ( - simple - general - ); - } - - simpleCoeffs - { - type dictionary; - displayName "Simple Model Coefficients"; - description "Simple model coefficients"; - entries - { - include "$FOAMX_CONFIG/entries/dimensionedVector/V0.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/a.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/a1.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/alphaMin.cfg"; - } - } - - generalCoeffs - { - type dictionary; - displayName "General Model Coefficients"; - description "General model coefficients"; - entries - { - include "$FOAMX_CONFIG/entries/dimensionedVector/V0.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/a.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/a1.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/alphaMin.cfg"; - } - } -} - -default -{ - include "defaults/constant/transportProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/settlingFoam/FoamX/turbulenceProperties.cfg b/applications/solvers/multiphase/settlingFoam/FoamX/turbulenceProperties.cfg deleted file mode 100644 index 4d1e4e732f..0000000000 --- a/applications/solvers/multiphase/settlingFoam/FoamX/turbulenceProperties.cfg +++ /dev/null @@ -1,34 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "Turbulence properties"; -dictionaryPath "constant"; -entries -{ - include "$FOAMX_CONFIG/entries/turbulenceModels/incompressible/turbulenceModel.cfg"; - include "$FOAMX_CONFIG/entries/Switch/turbulence.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/laminarCoeffs.cfg"; - include "$FOAMX_CONFIG/entries/turbulenceModels/incompressible/kEpsilonCoeffsWithC3.cfg"; - include "$FOAMX_CONFIG/entries/turbulenceModels/incompressible/wallFunctionCoeffs.cfg"; -} - -options -{ - turbulenceModel - { - editable 0; - } -} - -default -{ - include "defaults/constant/turbulenceProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/environmentalProperties b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/environmentalProperties deleted file mode 100644 index e9aee6c9b5..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/environmentalProperties +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object environmentalProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -g g [0 1 -2 0 0 0 0] (0 -9.81 0); - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/initAlphaFieldProperties b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/initAlphaFieldProperties deleted file mode 100644 index 1c0bee593e..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/initAlphaFieldProperties +++ /dev/null @@ -1,41 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object initAlphaFieldProperties; -} - -// ************************************************************************* // - -xMin xMin [0 1 0 0 0] -100.0; - -xMax xMax [0 1 0 0 0] 100.0; - -yMin yMin [0 1 0 0 0] 0.0; - -yMax yMax [0 1 0 0 0] 0.750; - -zMin zMin [0 1 0 0 0] 0.0; - -zMax zMax [0 1 0 0 0] 1.0; - -insideBoxAlphaValue insideBoxAlphaValue [0 0 0 0 0] 0.999; - -outsideBoxAlphaValue outsideBoxAlphaValue [0 0 0 0 0] 1.0e-6; - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/interfacialProperties b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/interfacialProperties deleted file mode 100644 index cbcf71870a..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/interfacialProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object interfacialProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dragModela SchillerNaumann; -dragModelb SchillerNaumann; - -dragPhase blended; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // \ No newline at end of file diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/kineticTheoryProperties b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/kineticTheoryProperties deleted file mode 100644 index ff1a05f224..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/kineticTheoryProperties +++ /dev/null @@ -1,51 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object interfacialProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -kineticTheory off; - -equilibrium on; - -e e [ 0 0 0 0 0 0 0 ] 0.9 ; - -alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6 ; - -alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5 ; - -Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05 ; - -eta eta [ 0 0 0 0 0 0 0 ] 2.0 ; - -p p [ 0 0 0 0 0 0 0 ] 5.0 ; - -phi phi [ 0 0 0 0 0 0 0 ] 25.0 ; - -viscosityModel Syamlal; - -conductivityModel HrenyaSinclair; - -HrenyaSinclairCoeffs -{ - L L [ 0 1 0 0 0 0 0 ] 5.0e-4 ; -} -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/ppProperties b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/ppProperties deleted file mode 100644 index 54dc1dda38..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/ppProperties +++ /dev/null @@ -1,34 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object ppProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -preAlphaExp 300; - -expMax 10.0; - -alphaMax 0.6; - -//g0 g0 [ 0 2 -2 0 0 0 0 ] 1000 ; -g0 g0 [ 0 2 -2 0 0 0 0 ] 0 ; - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/transportProperties b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/transportProperties deleted file mode 100644 index 11ff417de4..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/transportProperties +++ /dev/null @@ -1,48 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -// water -phaseb -{ - nu nu [0 2 -1 0 0 0 0] 1.0e-06; - rho rho [1 -3 0 0 0 0 0] 1000.0; - d d [0 1 0 0 0 0 0] 0.0001; -} - -// air -phasea -{ - nu nu [0 2 -1 0 0 0 0] 1.6e-05; - rho rho [1 -3 0 0 0 0 0] 1.0; - d d [0 1 0 0 0 0 0] 0.003; -} - -Cvm Cvm [0 0 0 0 0 0 0] 0.5; - -Cl Cl [0 0 0 0 0 0 0] 0; - -Ct Ct [0 0 0 0 0 0 0] 1.0; - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/turbulenceProperties b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/turbulenceProperties deleted file mode 100644 index 023bcfc148..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/constant/turbulenceProperties +++ /dev/null @@ -1,45 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object turbulenceProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -turbulenceModel kEpsilon; - -turbulence off; - -kEpsilonCoeffs -{ - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; -} - -wallFunctionCoeffs -{ - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 17e02ca976..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - div(phia,Ua) Gauss <>; - div(phib,Ub) Gauss <>; - div(phib,k) Gauss <>; - div(phib,epsilon) Gauss <>; - div(phi,alpha) Gauss <>; - div(phir,alpha) Gauss <>; - div(phi,Theta) Gauss <>; - div(Rca) Gauss linear; - div(Rcb) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(nuEffa,Ua) Gauss linear corrected; - laplacian(nuEffb,Ub) Gauss linear corrected; - laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(ppMagf,alpha) Gauss linear corrected; - laplacian((alphak*nuEffb),k) Gauss linear corrected; - laplacian((alphaEps*nuEffb),epsilon) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/system/fvSolution b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index e2fffde183..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,48 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p ICCG 1e-10 0; - Ua BICCG 1e-05 0; - Ub BICCG 1e-05 0; - alpha BICCG 1e-10 0; - beta BICCG 1e-10 0; - Theta BICCG 1e-05 0; - k BICCG 1e-05 0; - epsilon BICCG 1e-05 0; -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; - nAlphaCorr 2; - correctAlpha no; - pRefCell 0; - pRefValue 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/div/phiTheta.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/div/phiTheta.cfg deleted file mode 100644 index 09209d66b3..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/div/phiTheta.cfg +++ /dev/null @@ -1,15 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -div(phi,Theta) -{ - include "$FOAMX_CONFIG//dictionaries/fvSchemes/div/scalar.cfg"; - iconURL "/FoamX/icons/small/maths/divPhiTheta.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/nuEffEpsilon.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/nuEffEpsilon.cfg deleted file mode 100644 index 6121968887..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/nuEffEpsilon.cfg +++ /dev/null @@ -1,13 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacian((alphaEps*nuEffb),epsilon) -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/vector.cfg"; - iconURL "/FoamX/icons/small/maths/laplacian/nuEffEpsilon.gif"; -} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/nuEffk.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/nuEffk.cfg deleted file mode 100644 index 0d15aca4ff..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/nuEffk.cfg +++ /dev/null @@ -1,13 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacian((alphak*nuEffb),k) -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/vector.cfg"; - iconURL "/FoamX/icons/small/maths/laplacian/nuEffk.gif"; -} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/ppMagfAlpha.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/ppMagfAlpha.cfg deleted file mode 100644 index 4402e933b4..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSchemes/laplacian/ppMagfAlpha.cfg +++ /dev/null @@ -1,13 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacian(ppMagf,alpha) -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/vector.cfg"; - iconURL "/FoamX/icons/small/maths/laplacian/ppMagfAlpha.gif"; -} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSolution/solvers/Theta.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSolution/solvers/Theta.cfg deleted file mode 100644 index 9f8caa8130..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/fvSolution/solvers/Theta.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -Theta -{ - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/asymmetricSparse.cfg"; - description "Solver for the Theta equation"; - iconURL "/FoamX/icons/small/maths/Theta.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragModela.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragModela.cfg deleted file mode 100644 index e11cb7663f..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragModela.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -dragModela -{ - type word; - description "dragmodel for phase a"; - helpURL "controlDict.html"; - default SchillerNaumann; - valueList - ( - Syamlal - SchillerNaumann - GidaspowSchillerNaumann - Gibilaro - Ergun - ); -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragModelb.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragModelb.cfg deleted file mode 100644 index b0369800ed..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragModelb.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -dragModelb -{ - type word; - description "dragmodel for phase b"; - helpURL "controlDict.html"; - default SchillerNaumann; - valueList - ( - Syamlal - SchillerNaumann - GidaspowSchillerNaumann - Gibilaro - Ergun - ); -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragPhase.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragPhase.cfg deleted file mode 100644 index 71a6e355c5..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/dictionaries/interfacialProperties/dragPhase.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -dragPhase -{ - type word; - description "Phase used for calculating drag, or from which the size-info is used."; - helpURL "controlDict.html"; - default a; - valueList - ( - a - b - blended - ); -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/Switch/kineticEquilibrium.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/Switch/kineticEquilibrium.cfg deleted file mode 100644 index e636008d14..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/Switch/kineticEquilibrium.cfg +++ /dev/null @@ -1,17 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -equilibrium -{ - type SwitchOnOff; - description "Assume production=dissipation for the granular temperature?"; - iconURL "/FoamX/icons/small/maths/Switch.gif"; - default off; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/Switch/kineticTheory.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/Switch/kineticTheory.cfg deleted file mode 100644 index afdf7fc41a..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/Switch/kineticTheory.cfg +++ /dev/null @@ -1,17 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -kineticTheory -{ - type SwitchOnOff; - description "Do you wish to calculate the granular temperature?"; - iconURL "/FoamX/icons/small/maths/Switch.gif"; - default off; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTFr.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTFr.cfg deleted file mode 100644 index ee8f406bb1..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTFr.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -Fr -{ - type dimensionedScalar; - description "empirical material constant for normal frictional stress"; - iconURL "/FoamX/icons/small/maths/Fr.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTe.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTe.cfg deleted file mode 100644 index e264980c8f..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTe.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -e -{ - type dimensionedScalar; - description "coefficient of restitution"; - iconURL "/FoamX/icons/small/maths/e.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTeta.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTeta.cfg deleted file mode 100644 index 83c0708856..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTeta.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -eta -{ - type dimensionedScalar; - description "empirical material constant for normal frictional stress"; - iconURL "/FoamX/icons/small/maths/eta.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTp.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTp.cfg deleted file mode 100644 index 92e624ce6c..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTp.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -p -{ - type dimensionedScalar; - description "empirical material constant for normal frictional stress"; - iconURL "/FoamX/icons/small/maths/p.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTphi.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTphi.cfg deleted file mode 100644 index 06e4e73475..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/KTphi.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -phi -{ - type dimensionedScalar; - description "angle of internal friction"; - iconURL "/FoamX/icons/small/maths/phi.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/L.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/L.cfg deleted file mode 100644 index 049819cce7..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/L.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -L -{ - type dimensionedScalar; - description "L - characteristic length"; - iconURL "/FoamX/icons/small/maths/L.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/alphaMax.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/alphaMax.cfg deleted file mode 100644 index c9192c3512..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/alphaMax.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -alphaMax -{ - type dimensionedScalar; - description "maximum packing"; - iconURL "/FoamX/icons/small/maths/alphaMax.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/alphaMinFriction.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/alphaMinFriction.cfg deleted file mode 100644 index 0d4e291421..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/alphaMinFriction.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -alphaMinFriction -{ - type dimensionedScalar; - description "minimum packing for friction"; - iconURL "/FoamX/icons/small/maths/alphaMin.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/d.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/d.cfg deleted file mode 100644 index b328add368..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/d.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -d -{ - type dimensionedScalar; - description "d"; - iconURL "/FoamX/icons/small/maths/d.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/g0.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/g0.cfg deleted file mode 100644 index 7864df73cd..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/dimensionedScalar/g0.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -g0 -{ - type dimensionedScalar; - description "ppForce = g0*min(expMax, exp(preAlphaExp*(alpha - alphaMax)))"; - iconURL "/FoamX/icons/small/maths/g0.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/geometricFields/Theta.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/geometricFields/Theta.cfg deleted file mode 100644 index fe6d3f077f..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/geometricFields/Theta.cfg +++ /dev/null @@ -1,18 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -Theta -{ - description "Granular temperature, particle velocity fluctuations"; - fieldType scalar; - iconURL "/FoamX/icons/small/maths/Theta.gif"; - geometryType vol; - dimensions [ 0 2 -2 0 0 0 0 ]; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/HrenyaSinclairCoeffs.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/HrenyaSinclairCoeffs.cfg deleted file mode 100644 index 6661a6445e..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/HrenyaSinclairCoeffs.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -HrenyaSinclairCoeffs -{ - type dictionary; - description "Hrenya-Sinclair conductivity model coefficients"; - entries - { - include "../../entries/dimensionedScalar/L.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/conductivityModels.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/conductivityModels.cfg deleted file mode 100644 index db16b2837b..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/conductivityModels.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -conductivityModel -{ - type word; - description "conductivity model for granular temperature eq"; - helpURL "controlDict.html"; - default HrenyaSinclair; - valueList - ( - HrenyaSinclair - Gidaspow - Syamlal - ); -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/viscosityModels.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/viscosityModels.cfg deleted file mode 100644 index 799d88ba0c..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/kineticTheoryModels/viscosityModels.cfg +++ /dev/null @@ -1,24 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -viscosityModel -{ - type word; - description "viscosity model for granular temperature eq"; - helpURL "controlDict.html"; - default HrenyaSinclair; - valueList - ( - HrenyaSinclair - Gidaspow - Syamlal - none - ); -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/phaseModels/phasea.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/phaseModels/phasea.cfg deleted file mode 100644 index 46030f60e5..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/phaseModels/phasea.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -phasea -{ - type dictionary; - description "Transport properties for phase a"; - entries - { - include "$FOAMX_CONFIG/entries/dimensionedScalar/rho.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/nu.cfg"; - include "../../entries/dimensionedScalar/d.cfg"; - } -} - - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/phaseModels/phaseb.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/phaseModels/phaseb.cfg deleted file mode 100644 index a346d3051a..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/phaseModels/phaseb.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -phaseb -{ - type dictionary; - description "Transport properties for phase b"; - entries - { - include "$FOAMX_CONFIG/entries/dimensionedScalar/rho.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/nu.cfg"; - include "../../entries/dimensionedScalar/d.cfg"; - } -} - - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/alphaMax.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/alphaMax.cfg deleted file mode 100644 index dbada474c1..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/alphaMax.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -alphaMax -{ - type scalar; - description "ppForce = g0*min(expMax, exp(preAlphaExp*(alpha - alphaMax)))"; - iconURL "/FoamX/icons/small/maths/K.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/expMax.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/expMax.cfg deleted file mode 100644 index 76dbd0d0b8..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/expMax.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -expMax -{ - type scalar; - description "ppForce = g0*min(expMax, exp(preAlphaExp*(alpha - alphaMax)))"; - iconURL "/FoamX/icons/small/maths/K.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/preAlphaExp.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/preAlphaExp.cfg deleted file mode 100644 index a69eeca925..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/entries/scalar/preAlphaExp.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -preAlphaExp -{ - type scalar; - description "ppForce = g0*min(expMax, exp(preAlphaExp*(alpha - alphaMax)))"; - iconURL "/FoamX/icons/small/maths/K.gif"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index 3c334a8bc3..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/ddt/transient.cfg"; - - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/defaultOnly.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/p.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 221807fd71..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiaUa.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phibUb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phibk.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phibEpsilon.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phiAlpha.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/phirAlpha.cfg"; - include "../dictionaries/fvSchemes/div/phiTheta.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/Rca.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/Rcb.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index f8216c4243..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/nuEffaUa.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/nuEffbUb.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/rhoAUp.cfg"; - include "../dictionaries/fvSchemes/laplacian/ppMagfAlpha.cfg"; - include "../dictionaries/fvSchemes/laplacian/nuEffEpsilon.cfg"; - include "../dictionaries/fvSchemes/laplacian/nuEffk.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSolution.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 873d9c1064..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,48 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/pSymm.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Ua.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/Ub.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/alpha.cfg"; - include "dictionaries/fvSolution/solvers/Theta.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/k.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/epsilon.cfg"; - } - } - - PISO - { - type dictionary; - entries - { - include "$FOAMX_CONFIG/entries/Switch/momentumPredictor.cfg"; - include "$FOAMX_CONFIG/entries/label/nCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nNonOrthogonalCorrectors.cfg"; - include "$FOAMX_CONFIG/entries/label/nAlphaCorr.cfg"; - include "$FOAMX_CONFIG/entries/Switch/correctAlpha.cfg"; - include "$FOAMX_CONFIG/entries/ref/pRef.cfg"; - } - } -} - -default -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/interfacialProperties.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/interfacialProperties.cfg deleted file mode 100644 index 89b0d30123..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/interfacialProperties.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "interfacial properties"; -dictionaryPath "constant"; - -entries -{ - include "dictionaries/interfacialProperties/dragModela.cfg"; - include "dictionaries/interfacialProperties/dragModelb.cfg"; - include "dictionaries/interfacialProperties/dragPhase.cfg"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/kineticTheoryProperties.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/kineticTheoryProperties.cfg deleted file mode 100644 index b2a456ac8c..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/kineticTheoryProperties.cfg +++ /dev/null @@ -1,34 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "kinetic theory of granular flow properties"; -dictionaryPath "constant"; - -entries -{ - include "entries/Switch/kineticTheory.cfg"; - include "entries/Switch/kineticEquilibrium.cfg"; - include "entries/kineticTheoryModels/viscosityModels.cfg"; - include "entries/kineticTheoryModels/conductivityModels.cfg"; - include "entries/kineticTheoryModels/HrenyaSinclairCoeffs.cfg"; - include "entries/dimensionedScalar/KTe.cfg"; - include "entries/dimensionedScalar/alphaMax.cfg"; - include "entries/dimensionedScalar/alphaMinFriction.cfg"; - include "entries/dimensionedScalar/KTFr.cfg"; - include "entries/dimensionedScalar/KTeta.cfg"; - include "entries/dimensionedScalar/KTp.cfg"; - include "entries/dimensionedScalar/KTphi.cfg"; -} - -default -{ - include "defaults/constant/kineticTheoryProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/ppProperties.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/ppProperties.cfg deleted file mode 100644 index 4ab8dc935d..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/ppProperties.cfg +++ /dev/null @@ -1,26 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "particle-particle interaction properties"; -dictionaryPath "constant"; - -entries -{ - include "entries/scalar/preAlphaExp.cfg"; - include "entries/scalar/expMax.cfg"; - include "entries/scalar/alphaMax.cfg"; - include "entries/dimensionedScalar/g0.cfg"; -} - -default -{ - include "defaults/constant/ppProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/transportProperties.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/transportProperties.cfg deleted file mode 100644 index 361e4d051b..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/transportProperties.cfg +++ /dev/null @@ -1,25 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/transportProperties/transportProperties.cfg"; - -entries -{ - include "entries/phaseModels/phasea.cfg"; - include "entries/phaseModels/phaseb.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/Cvm.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/Cl.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/Ct.cfg"; -} - -default -{ - include "defaults/constant/transportProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/turbulenceProperties.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/turbulenceProperties.cfg deleted file mode 100644 index 74af41a3ab..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/turbulenceProperties.cfg +++ /dev/null @@ -1,34 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "Turbulence properties"; -dictionaryPath "constant"; -entries -{ - include "$FOAMX_CONFIG/entries/Switch/turbulence.cfg"; - include "$FOAMX_CONFIG/dictionaries/turbulenceProperties/laminarCoeffs.cfg"; - include "$FOAMX_CONFIG/entries/turbulenceModels/incompressible/kEpsilonCoeffsWithAlphak.cfg"; - include "$FOAMX_CONFIG/entries/turbulenceModels/incompressible/wallFunctionCoeffs.cfg"; -} - -options -{ - turbulenceModel - { - editable 0; - } -} - -default -{ - include "defaults/constant/turbulenceProperties"; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/twoPhaseEulerFoam.cfg b/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/twoPhaseEulerFoam.cfg deleted file mode 100644 index 2da449cd19..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/FoamX/twoPhaseEulerFoam.cfg +++ /dev/null @@ -1,81 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Incompressible turbulent Eulerian two phase flow code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictAdjustTimeStep.cfg"; - fvSchemes; - fvSolution; - transportProperties; - turbulenceProperties; - include "$FOAMX_CONFIG/dictionaries/environmentalProperties/environmentalPropertiesg.cfg"; - interfacialProperties; - kineticTheoryProperties; - ppProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/pDynamic.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Ua.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/Ub.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/k.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/alpha.cfg"; - include "entries/geometricFields/Theta.cfg"; -} - -patchPhysicalTypes -{ - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/patches.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/patches.cfg"; -} - -patchFieldsPhysicalTypes -{ - alpha - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/alpha.cfg"; - } - - Ua - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - Ub - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/U.cfg"; - } - - p - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/p.cfg"; - } - - k - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/k.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/k.cfg"; - } - - epsilon - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/epsilon.cfg"; - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/wallFunctions/epsilon.cfg"; - } - - Theta - { - include "$FOAMX_CONFIG/entries/patchPhysicalTypes/standard/alpha.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H index b889a6dc6b..e8b056ed7e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H @@ -24,12 +24,18 @@ if (g0.value() > 0.0) { - surfaceScalarField alphaf = fvc::interpolate(alpha); + ppMagf = rUaAf*fvc::interpolate + ( + (1.0/(rhoa*(alpha + scalar(0.0001)))) + *g0*min(exp(preAlphaExp*(alpha - alphaMax)), expMax) + ); - // Correct the particle-particle force magnitude - ppMagf = g0*rUaAf*min(exp(preAlphaExp*(alphaf - alphaMax)), expMax); - - alphaEqn -= fvm::laplacian(ppMagf, alpha); + alphaEqn -= fvm::laplacian + ( + (fvc::interpolate(alpha) + scalar(0.0001))*ppMagf, + alpha, + "laplacian(alphaPpMag,alpha)" + ); } alphaEqn.relax(); diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/constant/mechanicalProperties b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/constant/mechanicalProperties deleted file mode 100644 index 094175a9df..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/constant/mechanicalProperties +++ /dev/null @@ -1,34 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object mechanicalProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -rho rho [1 -3 0 0 0 0 0] 7854; - -nu nu [0 0 0 0 0 0 0] 0.3; - -E E [1 -1 -2 0 0 0 0] 2e+11; - -planeStress yes; - - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/constant/thermalProperties b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/constant/thermalProperties deleted file mode 100644 index 572aa3cc28..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/constant/thermalProperties +++ /dev/null @@ -1,34 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object thermalProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -C C [0 2 -2 -1 0 0 0] 434; - -k k [1 1 -3 -1 0 0 0] 60.5; - -alpha alpha [0 0 0 -1 0 0 0] 1.1e-05; - -thermalStress no; - - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/system/fvSchemes b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/system/fvSchemes deleted file mode 100644 index 4d8f0d6aa9..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/system/fvSchemes +++ /dev/null @@ -1,68 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -d2dt2Schemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(D) leastSquares; - grad(T) leastSquares; -} - -divSchemes -{ - default none; - div(sigmaD) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(DD,D) Gauss linear corrected; - laplacian(DT,T) Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - D yes; - T yes; -} - - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/system/fvSolution b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/system/fvSolution deleted file mode 100644 index 669a9eb8a8..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/defaults/system/fvSolution +++ /dev/null @@ -1,39 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -FoamFile -{ - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - D ICCG 1e-06 0.01; - T ICCG 1e-06 0.01; -} - -stressAnalysis -{ - compactNormalStress yes; - nCorrectors 1; - U 1e-06; -} - - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes.cfg deleted file mode 100644 index c28263142d..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSchemes/fvSchemes.cfg"; - -entries -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/d2dt2/allSchemes.cfg"; - include "fvSchemes/gradSchemes.cfg"; - include "fvSchemes/divSchemes.cfg"; - include "fvSchemes/laplacianSchemes.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/interpolation/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/snGrad/defaultOnly.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/flux/DT.cfg"; -} - -default -{ - include "defaults/system/fvSchemes"; -} - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/divSchemes.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/divSchemes.cfg deleted file mode 100644 index 8147327b4a..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/divSchemes.cfg +++ /dev/null @@ -1,19 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -divSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/div/sigmaD.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/gradSchemes.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/gradSchemes.cfg deleted file mode 100644 index eb047e9377..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/gradSchemes.cfg +++ /dev/null @@ -1,21 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -gradSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/D.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/grad/T.cfg"; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/laplacianSchemes.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/laplacianSchemes.cfg deleted file mode 100644 index eda186ac09..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSchemes/laplacianSchemes.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -laplacianSchemes -{ - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/schemes.cfg"; - entries - { - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/default.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DDD.cfg"; - include "$FOAMX_CONFIG/dictionaries/fvSchemes/laplacian/DTT.cfg"; - } -} - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSolution.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSolution.cfg deleted file mode 100644 index 468bc7ac14..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/fvSolution.cfg +++ /dev/null @@ -1,36 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -include "$FOAMX_CONFIG/dictionaries/fvSolution/fvSolution.cfg"; - -entries -{ - solvers - { - type dictionary; - entries - { - D - { - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/symmetricSparse.cfg"; - description "Solver for the D equation"; - iconURL "/FoamX/icons/small/maths/D.gif"; - } - - include "$FOAMX_CONFIG/dictionaries/fvSolution/solvers/T.cfg"; - } - } - include "$FOAMX_CONFIG/dictionaries/fvSolution/stressAnalysis.cfg"; -} - -defaults -{ - include "defaults/system/fvSolution"; -} - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/mechanicalProperties.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/mechanicalProperties.cfg deleted file mode 100644 index 07919eddb4..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/mechanicalProperties.cfg +++ /dev/null @@ -1,26 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "Dictionary of mechanical properties"; -dictionaryPath "constant"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/rho.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/stress/nu.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/stress/E.cfg"; - include "$FOAMX_CONFIG/entries/Switch/planeStress.cfg"; -} - -defaulst -{ - include "defaults/constant/mechanicalProperties"; -} - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/patchFieldTypes.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/patchFieldTypes.cfg deleted file mode 100644 index 203079445a..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/patchFieldTypes.cfg +++ /dev/null @@ -1,85 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -tractionDisplacement -{ - displayName "tractionDisplacement"; - description "Traction boundary condition"; - type patchField; - options - { - type - { - default tractionDisplacement; - } - } - - entries - { - traction - { - type vectorField; - displayName "traction"; - description "Boundary traction"; - } - - pressure - { - type scalarField; - displayName "pressure"; - description "Boundary Pressure"; - } - - value - { - type field; - displayName "value"; - description "Field Value"; - } - } -} - -traction -{ - displayName "traction"; - description "Traction boundary condition"; - type patchField; - options - { - type - { - default traction; - } - } - - entries - { - traction - { - type vectorField; - displayName "traction"; - description "Boundary traction"; - } - - pressure - { - type scalarField; - displayName "pressure"; - description "Boundary Pressure"; - } - - value - { - type field; - displayName "value"; - description "Field Value"; - } - } -} - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/solidDisplacementFoam.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/solidDisplacementFoam.cfg deleted file mode 100644 index f3881e44b5..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/solidDisplacementFoam.cfg +++ /dev/null @@ -1,81 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -description "Basic linear elastic stress analysis code."; - -dictionaries -{ - include "$FOAMX_CONFIG/dictionaries/controlDict/controlDictSteady.cfg"; - fvSchemes; - fvSolution; - mechanicalProperties; - thermalProperties; -} - -fields -{ - include "$FOAMX_CONFIG/entries/geometricFields/displacement.cfg"; - include "$FOAMX_CONFIG/entries/geometricFields/T.cfg"; -} - -patchPhysicalTypes -{ - slip - { - description "Slip"; - } - - tractionAdiabatic - { - description "Traction and adiabatic"; - } - - tractionFixedTemp - { - description "Traction and fixed temperature"; - } - - constrainedAdiabatic - { - description "Constrained displacement, adiabatic"; - } - - constrainedFixedTemp - { - description "Constrained displacement, fixed temp"; - } -} - -patchFieldTypes -{ - include "patchFieldTypes.cfg"; -} - -patchFieldsPhysicalTypes -{ - D - { - slip slip; - tractionAdiabatic tractionDisplacement; - tractionFixedTemp tractionDisplacement; - constrainedAdiabatic fixedValue; - constrainedFixedTemp fixedValue; - } - - T - { - slip slip; - tractionAdiabatic zeroGradient; - tractionFixedTemp fixedValue; - constrainedAdiabatic zeroGradient; - constrainedFixedTemp fixedValue; - } -} - - -// ************************************************************************* // diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/thermalProperties.cfg b/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/thermalProperties.cfg deleted file mode 100644 index c5e0159cc5..0000000000 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/FoamX/thermalProperties.cfg +++ /dev/null @@ -1,26 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ - -type dictionary; -description "Dictionary of thermal properties"; -dictionaryPath "constant"; - -entries -{ - include "$FOAMX_CONFIG/entries/dimensionedScalar/stress/C.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/stress/k.cfg"; - include "$FOAMX_CONFIG/entries/dimensionedScalar/stress/alpha.cfg"; - include "$FOAMX_CONFIG/entries/Switch/thermalStress.cfg"; -} - -defaults -{ - include "defaults/constant/thermalProperties"; -} - -// ************************************************************************* // diff --git a/applications/utilities/errorEstimation/estimateScalarError/FoamX/estimateScalarError.cfg b/applications/utilities/errorEstimation/estimateScalarError/FoamX/estimateScalarError.cfg deleted file mode 100644 index e9128ce70c..0000000000 --- a/applications/utilities/errorEstimation/estimateScalarError/FoamX/estimateScalarError.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// estimateScalarError tool definition - -description "Estimate the solution error for a scalar transport equation in standard form"; - -estimateScalarErrorDict -{ - type dictionary; - description "estimateScalarError control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseTimeArguments; - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/FoamX/icoErrorEstimate.cfg b/applications/utilities/errorEstimation/icoErrorEstimate/FoamX/icoErrorEstimate.cfg deleted file mode 100644 index fdc4422724..0000000000 --- a/applications/utilities/errorEstimation/icoErrorEstimate/FoamX/icoErrorEstimate.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// icoErrorEstimate tool definition - -description "Error estimation for incompressible laminar flow"; - -icoErrorEstimateDict -{ - type dictionary; - description "icoErrorEstimate control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseTimeArguments; - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/errorEstimation/icoMomentError/FoamX/icoMomentError.cfg b/applications/utilities/errorEstimation/icoMomentError/FoamX/icoMomentError.cfg deleted file mode 100644 index 6b9ddbbd87..0000000000 --- a/applications/utilities/errorEstimation/icoMomentError/FoamX/icoMomentError.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// icoMomentError tool definition - -description "Estimates error for the incompressible laminar CFD application icoFoam"; - -icoMomentErrorDict -{ - type dictionary; - description "icoMomentError control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseTimeArguments; - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/errorEstimation/momentScalarError/FoamX/momentScalarError.cfg b/applications/utilities/errorEstimation/momentScalarError/FoamX/momentScalarError.cfg deleted file mode 100644 index 67088c8bd0..0000000000 --- a/applications/utilities/errorEstimation/momentScalarError/FoamX/momentScalarError.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// momentScalarError tool definition - -description "Estimates the error in the solution for a scalar transport equation in the standard form"; - -momentScalarErrorDict -{ - type dictionary; - description "momentScalarError control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseTimeArguments; - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/FoamX/autoRefineMesh.cfg b/applications/utilities/mesh/advanced/autoRefineMesh/FoamX/autoRefineMesh.cfg deleted file mode 100644 index 760a41d187..0000000000 --- a/applications/utilities/mesh/advanced/autoRefineMesh/FoamX/autoRefineMesh.cfg +++ /dev/null @@ -1,27 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// autoRefineMesh tool definition - -description "Utility to refine cells near to a surface"; - -autoRefineMeshDict -{ - type dictionary; - description "autoRefineMesh control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseTimeArguments; - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/mesh/advanced/collapseEdges/FoamX/collapseEdges.cfg b/applications/utilities/mesh/advanced/collapseEdges/FoamX/collapseEdges.cfg deleted file mode 100644 index f95ba140fe..0000000000 --- a/applications/utilities/mesh/advanced/collapseEdges/FoamX/collapseEdges.cfg +++ /dev/null @@ -1,32 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// collapseEdges tool definition - -description "Collapse short edges and combines edges that are in line"; - -collapseEdgesDict -{ - type dictionary; - description "collapseEdges control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseArguments; - entries - { - include "$FOAMX_CONFIG/entries/arguments/edgeLength.cfg"; - include "$FOAMX_CONFIG/entries/arguments/mergeAngle.cfg"; - } - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/FoamX/combinePatchFaces.cfg b/applications/utilities/mesh/advanced/combinePatchFaces/FoamX/combinePatchFaces.cfg deleted file mode 100644 index 80a5768e93..0000000000 --- a/applications/utilities/mesh/advanced/combinePatchFaces/FoamX/combinePatchFaces.cfg +++ /dev/null @@ -1,32 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// combinePatchFaces tool definition - -description "Checks for neighbouring patch faces on same cell and combines them"; - -combinePatchFacesDict -{ - type dictionary; - description "combinePatchFaces control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseArguments; - entries - { - include "$FOAMX_CONFIG/entries/arguments/featureAngle.cfg"; - include "$FOAMX_CONFIG/entries/arguments/allowConcaveFaces.cfg"; - } - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/mesh/advanced/refinementLevel/FoamX/refinementLevel.cfg b/applications/utilities/mesh/advanced/refinementLevel/FoamX/refinementLevel.cfg deleted file mode 100644 index 30ce5beca7..0000000000 --- a/applications/utilities/mesh/advanced/refinementLevel/FoamX/refinementLevel.cfg +++ /dev/null @@ -1,31 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// refinementLevel tool definition - -description "Estimates the refinement level on refined cartesian meshes"; - -refinementLevelDict -{ - type dictionary; - description "refinementLevel control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseArguments; - entries - { - include "$FOAMX_CONFIG/entries/arguments/readLevel"; - } - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx b/applications/utilities/mesh/conversion/Optional/Allwmake old mode 100644 new mode 100755 similarity index 100% rename from applications/utilities/postProcessing/graphics/PV3FoamReader/PV3-3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx rename to applications/utilities/mesh/conversion/Optional/Allwmake diff --git a/applications/utilities/mesh/conversion/ccm26ToFoam/Allwmake b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake similarity index 100% rename from applications/utilities/mesh/conversion/ccm26ToFoam/Allwmake rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake diff --git a/applications/utilities/mesh/conversion/ccm26ToFoam/README b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/README similarity index 100% rename from applications/utilities/mesh/conversion/ccm26ToFoam/README rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/README diff --git a/applications/utilities/mesh/conversion/ccm26ToFoam/ccm26ToFoam/Make/files b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/files similarity index 100% rename from applications/utilities/mesh/conversion/ccm26ToFoam/ccm26ToFoam/Make/files rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/files diff --git a/applications/utilities/mesh/conversion/ccm26ToFoam/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options similarity index 70% rename from applications/utilities/mesh/conversion/ccm26ToFoam/ccm26ToFoam/Make/options rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options index 94b98d0a69..061793379c 100644 --- a/applications/utilities/mesh/conversion/ccm26ToFoam/ccm26ToFoam/Make/options +++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/Make/options @@ -2,9 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/other/libccmio \ - -I$(LIB_SRC)/other/libccmio/lnInclude + -I$(LIB_SRC)/other/libccmio/libccmio/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lccmio + -lccmio \ + -ladf diff --git a/applications/utilities/mesh/conversion/ccm26ToFoam/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/ccm26ToFoam.C similarity index 100% rename from applications/utilities/mesh/conversion/ccm26ToFoam/ccm26ToFoam/ccm26ToFoam.C rename to applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam/ccm26ToFoam.C diff --git a/applications/utilities/mesh/conversion/ansysToFoam/FoamX/ansysToFoam.cfg b/applications/utilities/mesh/conversion/ansysToFoam/FoamX/ansysToFoam.cfg deleted file mode 100644 index b2afc319c3..0000000000 --- a/applications/utilities/mesh/conversion/ansysToFoam/FoamX/ansysToFoam.cfg +++ /dev/null @@ -1,32 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// ansysToFoam tool definition - -description "ANSYS to OpenFOAM mesh converter"; - -ansysToFoamDict -{ - type dictionary; - description "ansysToFoam control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseArguments; - entries - { - include "$FOAMX_CONFIG/entries/arguments/meshFile.cfg"; - include "$FOAMX_CONFIG/entries/arguments/scale.cfg"; - } - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L index 5150717d82..ea650ad98a 100644 --- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L +++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L @@ -70,7 +70,11 @@ PtrList > slPatchCellFaces; // Dummy yywrap to keep yylex happy at compile time. // It is called by yylex but is not used as the mechanism to change file. // See <> +#if YY_FLEX_SUBMINOR_VERSION < 34 extern "C" int yywrap() +#else +int yyFlexLexer::yywrap() +#endif { return 1; } @@ -393,7 +397,7 @@ int main(int argc, char *argv[]) } // Warning: tet face order has changed between version 1.9.6 and 2.0 - // + // label faceIndex[7][6] = { {-1, -1, -1, -1, -1, -1}, // 0 diff --git a/applications/utilities/mesh/conversion/ccm26ToFoam/FoamX/ccm24ToFoam.cfg b/applications/utilities/mesh/conversion/ccm26ToFoam/FoamX/ccm24ToFoam.cfg deleted file mode 100644 index e9a8edf50c..0000000000 --- a/applications/utilities/mesh/conversion/ccm26ToFoam/FoamX/ccm24ToFoam.cfg +++ /dev/null @@ -1,31 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// ccm24ToFoam tool definition - -description "Converts CCM/NGeom files written by Prostar/ccm to OpenFOAM"; - -ccm24ToFoamDict -{ - type dictionary; - description "ccm24ToFoam control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseArguments; - entries - { - include "$FOAMX_CONFIG/entries/arguments/meshFile.cfg"; - } - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/cfxToFoam/FoamX/cfxToFoam.cfg b/applications/utilities/mesh/conversion/cfxToFoam/FoamX/cfxToFoam.cfg deleted file mode 100644 index 18b1d3cc2b..0000000000 --- a/applications/utilities/mesh/conversion/cfxToFoam/FoamX/cfxToFoam.cfg +++ /dev/null @@ -1,32 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// cfxToFoam tool definition - -description "CFX to OpenFOAM mesh converter"; - -cfxToFoamDict -{ - type dictionary; - description "cfxToFoam control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseArguments; - entries - { - include "$FOAMX_CONFIG/entries/arguments/meshFile.cfg"; - include "$FOAMX_CONFIG/entries/arguments/scale.cfg"; - } - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L index cb9d0a8f64..22bbb4002b 100644 --- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L @@ -116,7 +116,11 @@ void uniquify(word& name, HashSet& patchNames) // Dummy yywrap to keep yylex happy at compile time. // It is called by yylex but is not used as the mechanism to change file. // See <> +#if YY_FLEX_SUBMINOR_VERSION < 34 extern "C" int yywrap() +#else +int yyFlexLexer::yywrap() +#endif { return 1; } diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/FoamX/fluentMeshToFoam.cfg b/applications/utilities/mesh/conversion/fluentMeshToFoam/FoamX/fluentMeshToFoam.cfg deleted file mode 100644 index 4aa420620f..0000000000 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/FoamX/fluentMeshToFoam.cfg +++ /dev/null @@ -1,32 +0,0 @@ -/*---------------------------------------------------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -// fluentMeshToFoam tool definition - -description "Fluent to OpenFOAM mesh converter"; - -fluentMeshToFoamDict -{ - type dictionary; - description "fluentMeshToFoam control dictionary"; - dictionaryPath "system"; - - entries - { - arguments - { - type rootCaseArguments; - entries - { - include "$FOAMX_CONFIG/entries/arguments/meshFile.cfg"; - include "$FOAMX_CONFIG/entries/arguments/scale.cfg"; - } - } - } -} - -// ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/README.txt b/applications/utilities/mesh/conversion/fluentMeshToFoam/README.txt index 034172bfcc..8089acb531 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/README.txt +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/README.txt @@ -1,8 +1,6 @@ Notes for fluentMeshToFoam with zone preservation ################################################# -New options do not work with FoamX - 1. New option added: - writeSets: Writes all Fluent boundaries faceSets preserving Fluent names diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L index f2d041e542..f028ac227a 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L @@ -93,7 +93,7 @@ SLList