diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict b/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict index 98503931ac..515ad8fc85 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict +++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object boxTurbDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +19,5 @@ Ea 10; k0 5; + // ************************************************************************* // diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties index 919c996245..39f1d33649 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties +++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -nu nu [0 2 -1 0 0 0 0] 0.025; +nu nu [ 0 2 -1 0 0 0 0 ] 0.025; + // ************************************************************************* // diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties index 92118a1ff6..9869493485 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties +++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,16 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -UOsigma 0.090295049; +UOsigma 0.090295; -UOalpha 0.81532036; +UOalpha 0.81532; UOKupper 10; UOKlower 7; + // ************************************************************************* // diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict index f059d93cde..bbbc76ae09 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict +++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -45,4 +45,5 @@ runTimeModifiable yes; graphFormat raw; + // ************************************************************************* // diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes index 9d912c030f..845956eea8 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes +++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -53,7 +54,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution index d2a0410ecf..d58906f99c 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution +++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,24 +10,28 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -36,4 +40,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties index 677850a270..26216fcde0 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,145 +10,91 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Turbulence model selection -RASModel kEpsilon; +RASModel kEpsilon; -// Do you wish to calculate turbulence? -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; -// Laminar model coefficients laminarCoeffs { } -// Standard k-epsilon model coefficients kEpsilonCoeffs { - // Cmu - Cmu 0.09; - // C1 - C1 1.44; - // C2 - C2 1.92; - // C3 - C3 -0.33; - // alphah - alphah 1; - // alphak - alphak 1; - // alphaEps - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } -// RNG k-epsilon model coefficients RNGkEpsilonCoeffs { - // Cmu - Cmu 0.0845; - // C1 - C1 1.42; - // C2 - C2 1.68; - // C3 - C3 -0.33; - // alphah - alphah 1; - // alphak - alphak 1.39; - // alphaEps - alphaEps 1.39; - // eta0 - eta0 4.38; - // beta - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 -0.33; + alphah 1; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } -// Launder-Sharma low Reynolds number k-epsilon model coefficients LaunderSharmaKECoeffs { - // Cmu - Cmu 0.09; - // C1 - C1 1.44; - // C2 - C2 1.92; - // C3 - C3 -0.33; - // alphah - alphah 1; - // alphak - alphak 1; - // alphaEps - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } -// Launder-Reece-Rodi RSTM with wall functions model coefficients LRRCoeffs { - // Cmu - Cmu 0.09; - // Clrr1 - Clrr1 1.8; - // Clrr2 - Clrr2 0.6; - // C1 - C1 1.44; - // C2 - C2 1.92; - // Cs - Cs 0.25; - // Ceps - Ceps 0.15; - // alphah - alphah 1; - // alphaEps - alphaEps 0.76923; - // alphaR - alphaR 1.22; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } -// Launder-Gibson RSTM with wall reflection and wall functions model coefficients LaunderGibsonRSTMCoeffs { - // Cmu - Cmu 0.09; - // Clg1 - Clg1 1.8; - // Clg2 - Clg2 0.6; - // C1 - C1 1.44; - // C2 - C2 1.92; - // C1Ref - C1Ref 0.5; - // C2Ref - C2Ref 0.3; - // Cs - Cs 0.25; - // Ceps - Ceps 0.15; - // alphah - alphah 1; - // alphaEps - alphaEps 0.76923; - // alphaR - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } -// Wall function coefficients wallFunctionCoeffs { - // kappa - kappa 0.4187; - // E - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties index 03e0adce89..a866ff549f 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index d883b02f39..4a7f8b7b2b 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,108 +10,108 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object kinematicCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Particle sub-models -InjectionModel ManualInjection; -DragModel SphereDrag; -DispersionModel StochasticDispersionRAS; -WallInteractionModel StandardWallInteraction; +InjectionModel ManualInjection; -// Minimum particle mass -minParticleMass minParticleMass [ 1 0 0 0 0] 1.0e-15; +DragModel SphereDrag; -// Parcel thermo properties -rho0 rho0 [ 1 -3 0 0 0] 5000; +DispersionModel StochasticDispersionRAS; -// Coupling between particles and carrier phase via source terms -coupled true; +WallInteractionModel StandardWallInteraction; -// Integer used to identify different parcel types -parcelTypeId 2; +minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; + +rho0 rho0 [ 1 -3 0 0 0 ] 5000; + +coupled true; + +parcelTypeId 2; interpolationSchemes { - rho cell; - U cellPointFace; - mu cell; + rho cell; + U cellPointFace; + mu cell; } integrationSchemes { - U Euler; + U Euler; } ManualInjectionCoeffs { - // Parcel basis type - parcelBasisType mass; - - // Total mass to inject - massTotal massTotal [ 1 0 0 0 0] 2.0e-4; - - SOI 0.0; - positionsFile kinematicCloud1Positions; - U0 (0 0 0); + parcelBasisType mass; + massTotal massTotal [ 1 0 0 0 0 ] 0.0002; + SOI 0; + positionsFile kinematicCloud1Positions; + U0 ( 0 0 0 ); parcelPDF { - pdfType RosinRammler; + pdfType RosinRammler; RosinRammlerPDF { - minValue 50.0e-06; - maxValue 100.0e-06; - d (75.0e-06); - n (0.5); + minValue 5e-05; + maxValue 0.0001; + d ( 7.5e-05 ); + n ( 0.5 ); } } } ConeInjectionCoeffs { - SOI 0.001; - duration 0.005; - position (0.25 0.25 0.05); - direction (0 -1 0); - parcelsPerSecond 10000; - volumeFlowRate Constant; + SOI 0.001; + duration 0.005; + position ( 0.25 0.25 0.05 ); + direction ( 0 -1 0 ); + parcelsPerSecond 10000; + volumeFlowRate Constant; volumeFlowRateCoeffs { - value 0.01; + value 0.01; } - Umag Constant; + + Umag Constant; UmagCoeffs { - value 50.0; + value 50; } - thetaInner Constant; + + thetaInner Constant; thetaInnerCoeffs { - value 0.0; + value 0; } - thetaOuter Constant; + + thetaOuter Constant; thetaOuterCoeffs { - value 30.0; + value 30; } + parcelPDF { - pdfType RosinRammler; + pdfType RosinRammler; RosinRammlerPDF { - minValue 50.0e-06; - maxValue 100.0e-06; - d (75.0e-06); - n (0.5); + minValue 5e-05; + maxValue 0.0001; + d ( 7.5e-05 ); + n ( 0.5 ); } } } StandardWallInteractionCoeffs { - e e [ 0 0 0 0 0] 1; - mu mu [ 0 0 0 0 0] 0; + e e [ 0 0 0 0 0 ] 1; + mu mu [ 0 0 0 0 0 ] 0; } + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 795aeda2cd..fd752a082c 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,83 +10,84 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermoCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Particle sub-models -InjectionModel ManualInjection; -DragModel SphereDrag; -DispersionModel StochasticDispersionRAS; -WallInteractionModel StandardWallInteraction; -HeatTransferModel RanzMarshall; +InjectionModel ManualInjection; -radiation off; +DragModel SphereDrag; -// Minimum particle mass -minParticleMass minParticleMass [ 1 0 0 0 0] 1.0e-15; +DispersionModel StochasticDispersionRAS; -// Parcel thermo properties -rho0 rho0 [ 1 -3 0 0 0] 2500; -T0 T0 [ 0 0 0 1 0] 300; -cp0 cp0 [ 0 2 -2 -1 0] 900; -epsilon0 epsilon0 [ 0 0 0 0 0] 1; -f0 f0 [ 0 0 0 0 0] 0.5; +WallInteractionModel StandardWallInteraction; -// Coupling between particles and carrier phase via source terms -coupled true; +HeatTransferModel RanzMarshall; -// Integer used to identify different parcel types -parcelTypeId 1; +radiation off; + +minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; + +rho0 rho0 [ 1 -3 0 0 0 ] 2500; + +T0 T0 [ 0 0 0 1 0 ] 300; + +cp0 cp0 [ 0 2 -2 -1 0 ] 900; + +epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; + +f0 f0 [ 0 0 0 0 0 ] 0.5; + +coupled true; + +parcelTypeId 1; interpolationSchemes { - rho cell; - U cellPointFace; - mu cell; - T cell; - Cp cell; + rho cell; + U cellPointFace; + mu cell; + T cell; + Cp cell; } integrationSchemes { - U Euler; - T Analytical; + U Euler; + T Analytical; } ManualInjectionCoeffs { - // Total mass to inject - massTotal massTotal [ 1 0 0 0 0] 1e-4; - - // Parcel basis type - parcelBasisType mass; - - SOI 0.0; - positionsFile thermoCloud1Positions; - U0 (0 0 0); + massTotal massTotal [ 1 0 0 0 0 ] 0.0001; + parcelBasisType mass; + SOI 0; + positionsFile thermoCloud1Positions; + U0 ( 0 0 0 ); parcelPDF { - pdfType RosinRammler; + pdfType RosinRammler; RosinRammlerPDF { - minValue 5.0e-06; - maxValue 500.0e-06; - d (50.0e-06); - n (0.5); + minValue 5e-06; + maxValue 0.0005; + d ( 5e-05 ); + n ( 0.5 ); } } } StandardWallInteractionCoeffs { - e e [ 0 0 0 0 0] 1; - mu mu [ 0 0 0 0 0] 0; + e e [ 0 0 0 0 0 ] 1; + mu mu [ 0 0 0 0 0 ] 0; } RanzMarshallCoeffs { - Pr Pr [ 0 0 0 0 0] 0.7; + Pr Pr [ 0 0 0 0 0 ] 0.7; } + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties index 0b16fbae76..d02b85fec4 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Thermophysical model thermoType hThermo>>>>; mixture air 1 28.9 1007 0 1.84e-05 0.7; + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/controlDict index 02438600d4..498ad80a54 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/controlDict +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,61 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Foam Application Class - -// Start point of run startFrom latestTime; -// Calculation start time startTime 0; -// End point of run stopAt endTime; -// Calculation end time endTime 0.5; -// Calculation time step -deltaT 1.0e-4; +deltaT 0.0001; -// Type of write output control writeControl adjustableRunTime; -// Interval with which the results are output writeInterval 0.01; -// Limits number of time directories before overwriting purgeWrite 0; -// Write Format writeFormat ascii; -// Significant figures of written ASCII data writePrecision 10; -// Write Compression writeCompression uncompressed; -// Time directories name format timeFormat general; -// Decimal precision of time directory names timePrecision 6; -// Can parameters be modified during run time? runTimeModifiable yes; -// Automatic adjustment of time step? adjustTimeStep yes; -// maxCo maxCo 0.2; -// maxDeltaT maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/decomposeParDict index d99b832df1..5b181b0e75 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/decomposeParDict +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method metis; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (1 1 1); + n ( 1 1 1 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSchemes b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSchemes index 9f6d142451..9f72da684a 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSchemes +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,24 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; 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 upwind; div(phid,p) Gauss upwind; @@ -42,14 +37,12 @@ divSchemes div(phi,epsilon) Gauss upwind; div(U) Gauss linear; div((muEff*dev2(grad(U).T()))) Gauss linear; - div(phi,Yi_h) Gauss upwind; + div(phi,Yi_h) Gauss upwind; } -// Laplacian discretisation schemes laplacianSchemes { - // Default scheme - default Gauss linear corrected; + default Gauss linear corrected; laplacian(muEff,U) Gauss linear corrected; laplacian(mut,U) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; @@ -59,26 +52,21 @@ laplacianSchemes 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; + p ; } + // ************************************************************************* // diff --git a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSolution b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSolution index 699b805794..219c7b1dbf 100644 --- a/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/Lagrangian/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,128 +10,149 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - // Solver for the rho equation - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - // Solver for the U equation - U PBiCG - { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the p equation - p PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - G PCG - { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - Yi PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - CO2 PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - O2 PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - N2 PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - CH4 PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - H2 PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - H2O PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - CO PBiCG - { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } - // Solver for the h equation - h PBiCG + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the R equation - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the k equation - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + G { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the epsilon equation - epsilon PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + Yi { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + CO2 + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + O2 + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + N2 + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + CH4 + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + H2 + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + H2O + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + CO + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + h + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO { - // Transonic? - transonic yes; - // Number of PISO correctors + transonic yes; nCorrectors 2; - // Number of non-orthogonal correctors nNonOrthogonalCorrectors 0; - // momentumPredictor? momentumPredictor yes; } + // ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/flange/constant/transportProperties b/tutorials/basic/laplacianFoam/flange/constant/transportProperties index e202aa0bc7..38a48552bb 100644 --- a/tutorials/basic/laplacianFoam/flange/constant/transportProperties +++ b/tutorials/basic/laplacianFoam/flange/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -DT DT [0 2 -1 0 0 0 0] 4e-05; +DT DT [ 0 2 -1 0 0 0 0 ] 4e-05; + // ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict index 07a2154310..f936785ffa 100644 --- a/tutorials/basic/laplacianFoam/flange/system/controlDict +++ b/tutorials/basic/laplacianFoam/flange/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSchemes b/tutorials/basic/laplacianFoam/flange/system/fvSchemes index ecfee2c2c7..0791ea9054 100644 --- a/tutorials/basic/laplacianFoam/flange/system/fvSchemes +++ b/tutorials/basic/laplacianFoam/flange/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -33,7 +34,7 @@ divSchemes laplacianSchemes { default none; - laplacian(DT,T) Gauss linear corrected; + laplacian(DT,T) Gauss linear corrected; } interpolationSchemes @@ -49,7 +50,8 @@ snGradSchemes fluxRequired { default no; - T; + T ; } + // ************************************************************************* // diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSolution b/tutorials/basic/laplacianFoam/flange/system/fvSolution index 13898e12f6..705e6c81f5 100644 --- a/tutorials/basic/laplacianFoam/flange/system/fvSolution +++ b/tutorials/basic/laplacianFoam/flange/system/fvSolution @@ -25,6 +25,7 @@ solvers relTol 0; } } + SIMPLE { nNonOrthogonalCorrectors 2; diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict index 2300e2c09e..c160f2f414 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/controlDict +++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes index ab3c77e43d..77418cb53a 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes +++ b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default steadyState; + default steadyState; } gradSchemes @@ -48,7 +49,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSolution b/tutorials/basic/potentialFoam/cylinder/system/fvSolution index 6626b9c525..231dfc27bb 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/fvSolution +++ b/tutorials/basic/potentialFoam/cylinder/system/fvSolution @@ -25,6 +25,7 @@ solvers relTol 0; } } + SIMPLE { nNonOrthogonalCorrectors 3; diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict index 2300e2c09e..c160f2f414 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict +++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes index ab3c77e43d..77418cb53a 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes +++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default steadyState; + default steadyState; } gradSchemes @@ -48,7 +49,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution index 0e3753d777..bff0832c0a 100644 --- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution +++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution @@ -25,6 +25,7 @@ solvers relTol 0; } } + SIMPLE { nNonOrthogonalCorrectors 0; diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties index 0621796365..080db3de43 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -DT DT [0 2 -1 0 0 0 0] 0.01; +DT DT [ 0 2 -1 0 0 0 0 ] 0.01; + // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict index 754277eb25..83058ea620 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes index 6c290f72df..3ffd8859ee 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -49,7 +50,8 @@ snGradSchemes fluxRequired { default no; - T; + T ; } + // ************************************************************************* // diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution index 272840702d..44b0ece791 100644 --- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution +++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution @@ -25,6 +25,7 @@ solvers relTol 0; } } + SIMPLE { nNonOrthogonalCorrectors 0; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties index 1976bb4dac..56c915c924 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object LESProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESModel oneEqEddy; +LESModel oneEqEddy; -delta cubeRootVol; +delta cubeRootVol; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,34 +27,34 @@ laminarCoeffs oneEqEddyCoeffs { - ce 1.048; - ck 0.094; + ce 1.048; + ck 0.094; } dynOneEqEddyCoeffs { - ce 1.05; - filter simple; + ce 1.05; + filter simple; } lowReOneEqEddyCoeffs { - ck 0.07; - ce 1.05; - beta 0.01; + ck 0.07; + ce 1.05; + beta 0.01; } SmagorinskyCoeffs { - ck 0.02; - ce 0.202; + ck 0.02; + ce 0.202; } DeardorffDiffStressCoeffs { - ce 1.048; - ck 0.094; - cm 4.13; + ce 1.048; + ck 0.094; + cm 4.13; } cubeRootVolCoeffs @@ -68,6 +69,7 @@ PrandtlCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -75,9 +77,11 @@ PrandtlCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Cdelta 0.158; + + Cdelta 0.158; } vanDriestCoeffs @@ -87,6 +91,7 @@ vanDriestCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -94,10 +99,12 @@ vanDriestCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Aplus 26; - Cdelta 0.158; + + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -107,14 +114,16 @@ smoothCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } -kappa 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E 9; + E 9; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties index 88b91cb81a..c82a1b4cc9 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation constant; fuel Propane; -Su Su [0 1 -1 0 0 0 0] 0.135; +Su Su [ 0 1 -1 0 0 0 0 ] 0.135; SuModel transport; -equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6; +equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.6; -sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338; +sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 338; XiModel transport; -XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; +XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62; -XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; +XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1; -uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; +uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1; GuldersCoeffs { @@ -45,6 +46,7 @@ GuldersCoeffs beta -0.5; f 2.3; } + Propane { W 0.446; @@ -54,6 +56,7 @@ GuldersCoeffs beta -0.2; f 2.3; } + IsoOctane { W 0.4658; @@ -67,16 +70,15 @@ GuldersCoeffs ignite no; -ignitionSites -( -); +ignitionSites ( ); ignitionSphereFraction 0; -ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0; +ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0; ignitionCircleFraction 0; -ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; +ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties index 03e0adce89..a866ff549f 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties index 0ca3b84735..8e705f32e5 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hhuMixtureThermo>>>>; -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675; +stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675; fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672; @@ -28,14 +29,5 @@ products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9 burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; -/* -thermoType hhuMixtureThermo>>>>; - -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 9.286; - -reactants reactants 1 28 1330.9 2.133e+06 1.798e-05 0.7; - -products products 1 28 1579.9 0 5.016e-05 0.7; -*/ // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict index eb71c634bb..3aefd793e1 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -47,33 +47,28 @@ functions ( fieldAverage1 { - // Type of functionObject type fieldAverage; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - + functionObjectLibs ( "libfieldFunctionObjects.so" ); enabled true; - outputControl outputTime; - - // Fields to be averaged - runTime modifiable fields ( U { - mean on; - prime2Mean on; - base time; + mean on; + prime2Mean on; + base time; } + p { - mean on; - prime2Mean on; - base time; + mean on; + prime2Mean on; + base time; } ); } ); + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes index 319151c4c3..78f524d421 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -37,14 +38,7 @@ divSchemes div(phiXi,Xi) Gauss limitedLinear 1; div(phiXi,Su) Gauss limitedLinear 1; div(phiSt,b) Gauss limitedLinear01 1; - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - fu limitedLinear01 1; - ft limitedLinear01 1; - b limitedLinear01 1; - h limitedLinear 1; - hu limitedLinear 1; - }; + div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; }; div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; @@ -77,7 +71,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution index 43ce07f2a0..cd3fb63f14 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,90 +10,116 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - p PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - ft PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + ft { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - fu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + fu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - b PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + b { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Xi PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Xi { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Su PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Su { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - h PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + h { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - hu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + hu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -102,4 +128,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties index fb22276165..95bb1c14f8 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object LESProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESModel oneEqEddy; +LESModel oneEqEddy; -delta cubeRootVol; +delta cubeRootVol; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,34 +27,34 @@ laminarCoeffs oneEqEddyCoeffs { - ce 1.048; - ck 0.094; + ce 1.048; + ck 0.094; } dynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } lowReOneEqEddyCoeffs { - ck 0.07; - ce 1.05; - beta 0.01; + ck 0.07; + ce 1.05; + beta 0.01; } SmagorinskyCoeffs { - ck 0.02; - ce 0.202; + ck 0.02; + ce 0.202; } DeardorffDiffStressCoeffs { - ce 1.048; - ck 0.094; - cm 4.13; + ce 1.048; + ck 0.094; + cm 4.13; } cubeRootVolCoeffs @@ -68,6 +69,7 @@ PrandtlCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -75,9 +77,11 @@ PrandtlCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Cdelta 0.158; + + Cdelta 0.158; } vanDriestCoeffs @@ -87,6 +91,7 @@ vanDriestCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -94,10 +99,12 @@ vanDriestCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Aplus 26; - Cdelta 0.158; + + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -107,14 +114,16 @@ smoothCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } -kappa 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E 9; + E 9; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties index 000883e1da..1568261fe2 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders; fuel Propane; -Su Su [0 1 -1 0 0 0 0] 0.135; +Su Su [ 0 1 -1 0 0 0 0 ] 0.135; SuModel transport; -equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6; +equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.6; -sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338; +sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 338; XiModel transport; -XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; +XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62; -XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; +XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1; -uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; +uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1; GuldersCoeffs { @@ -45,6 +46,7 @@ GuldersCoeffs beta -0.5; f 2.3; } + Propane { W 0.446; @@ -54,6 +56,7 @@ GuldersCoeffs beta -0.2; f 2.3; } + IsoOctane { W 0.4658; @@ -67,24 +70,15 @@ GuldersCoeffs ignite yes; -ignitionSites -( - - { - location (0 0 0); - diameter 0.003; - start 0; - duration 0.001; - strength 2; - } -); +ignitionSites ( { location ( 0 0 0 ) ; diameter 0.003 ; start 0 ; duration 0.001 ; strength 2 ; } ); ignitionSphereFraction 1; -ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0; +ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0; ignitionCircleFraction 0; -ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; +ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties index ca80af21ee..ce7f648b7f 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 ); + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties index 0ca3b84735..7c8fd76fe3 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hhuMixtureThermo>>>>; -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675; +stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675; fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672; @@ -28,14 +29,5 @@ products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9 burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; -/* -thermoType hhuMixtureThermo>>>>; - -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 9.286; - -reactants reactants 1 28 1330.9 2.133e+06 1.798e-05 0.7; - -products products 1 28 1579.9 0 5.016e-05 0.7; -*/ // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict index 26a0e1c65a..d79aed22c6 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -47,33 +47,28 @@ functions ( fieldAverage1 { - // Type of functionObject type fieldAverage; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - + functionObjectLibs ( "libfieldFunctionObjects.so" ); enabled true; - outputControl outputTime; - - // Fields to be averaged - runTime modifiable fields ( U { - mean on; - prime2Mean on; - base time; + mean on; + prime2Mean on; + base time; } + p { - mean on; - prime2Mean on; - base time; + mean on; + prime2Mean on; + base time; } ); } ); + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes index 319151c4c3..2398134a00 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -37,14 +38,7 @@ divSchemes div(phiXi,Xi) Gauss limitedLinear 1; div(phiXi,Su) Gauss limitedLinear 1; div(phiSt,b) Gauss limitedLinear01 1; - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - fu limitedLinear01 1; - ft limitedLinear01 1; - b limitedLinear01 1; - h limitedLinear 1; - hu limitedLinear 1; - }; + div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; }; div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; @@ -77,7 +71,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution index 43ce07f2a0..d4656531ed 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,90 +10,116 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - p PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - ft PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + ft { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - fu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + fu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - b PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + b { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Xi PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Xi { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Su PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Su { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - h PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + h { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - hu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + hu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -102,4 +128,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties index 6fbe9dea83..564a9fbe23 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel LaunderSharmaKE; +RASModel LaunderSharmaKE; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,73 +27,74 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0; - alphah 1.111; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0; + alphah 1.111; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 0; - alphah 1.111; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 0; + alphah 1.111; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0; - alphah 1.111; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0; + alphah 1.111; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties index 19878d0cfe..0aac5c44db 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders; fuel Propane; -Su Su [0 1 -1 0 0 0 0] 0.434; +Su Su [ 0 1 -1 0 0 0 0 ] 0.434; SuModel unstrained; -equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 1; +equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1; -sigmaExt sigmaExt [0 0 -1 0 0 0 0] 100000; +sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 100000; XiModel transport; -XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; +XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62; -XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; +XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1; -uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; +uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1; GuldersCoeffs { @@ -45,6 +46,7 @@ GuldersCoeffs beta -0.5; f 2.3; } + Propane { W 0.446; @@ -54,6 +56,7 @@ GuldersCoeffs beta -0.2; f 2.3; } + IsoOctane { W 0.4658; @@ -67,24 +70,15 @@ GuldersCoeffs ignite yes; -ignitionSites -( - - { - location (0 0 0.0005); - diameter 0.003; - start 0; - duration 0.001; - strength 1; - } -); +ignitionSites ( { location ( 0 0 0.0005 ) ; diameter 0.003 ; start 0 ; duration 0.001 ; strength 1 ; } ); ignitionSphereFraction 1; -ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0.001; +ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0.001; ignitionCircleFraction 0.5; -ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0.001; +ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0.001; + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties index ca80af21ee..645c9af099 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 ); + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties index 41ef30b1ef..8e705f32e5 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hhuMixtureThermo>>>>; -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675; +stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675; fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672; @@ -28,4 +29,5 @@ products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9 burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict index 8cf37a2495..576ae51176 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -49,4 +49,5 @@ maxCo 0.2; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes index 8a345e5483..94a4bd22bf 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -38,14 +39,7 @@ divSchemes div(phiXi,Xi) Gauss limitedLinear 1; div(phiXi,Su) Gauss limitedLinear 1; div(phiSt,b) Gauss limitedLinear01 1; - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - fu limitedLinear01 1; - ft limitedLinear01 1; - b limitedLinear01 1; - h limitedLinear 1; - hu limitedLinear 1; - }; + div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; }; div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; @@ -79,7 +73,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution index 35819bb013..061b461dd0 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,90 +10,116 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - p PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - ft PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + ft { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - fu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + fu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - b PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + b { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Xi PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Xi { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Su PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Su { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - h PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + h { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - hu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + hu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -103,4 +129,5 @@ PISO momentumPredictor yes; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat index 1681c54f00..2684dd73c8 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon index c14d3d7e02..e9dd46eb33 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/k b/tutorials/combustion/dieselFoam/aachenBomb/0/k index e6e58aecfa..251a39ce81 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/k +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/k @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/mut b/tutorials/combustion/dieselFoam/aachenBomb/0/mut index 2750ce32ec..e687f9b8fa 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/mut +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/mut @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties index c652dd95b2..991a2915d9 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties @@ -2,23 +2,24 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,74 +27,74 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; muLimiter on; - Lsgs 0.0002; - + Lsgs 0.0002; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 -0.33; + alphah 1; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - Cs 0.25; - Ceps 0.15; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + Cs 0.25; + Ceps 0.15; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties index a607222ee1..be340ec092 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties @@ -2,42 +2,42 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -chemistry off; +chemistry off; -chemistrySolver ODE; -//chemistrySolver EulerImplicit; -//chemistrySolver sequential; +chemistrySolver ODE; -initialChemicalTimeStep 1.0e-7; +initialChemicalTimeStep 1e-07; sequentialCoeffs { - cTauChem 1.0e-3; + cTauChem 0.001; } EulerImplicitCoeffs { - cTauChem 5.0e-2; - equilibriumRateLimiter off; + cTauChem 0.05; + equilibriumRateLimiter off; } ODECoeffs { ODESolver SIBS; - eps 5.0e-2; - scale 1.0; + eps 0.05; + scale 1; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties index a038d1e7f5..b43b4967c8 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties @@ -2,26 +2,28 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0 ; +Cmix Cmix [ 0 0 0 0 0 0 0 ] 1; ignitionProperties1 { - ignite off; - ignitionPoint ignitionPoint [ 0 1 0 0 0 0 0 ] ( 0.2 0 0.02 ) ; - timing timing [ 0 0 1 0 0 0 0 ] 0.0e-1 ; - duration duration [ 0 0 1 0 0 0 0 ] 1.0e-0 ; + ignite off; + ignitionPoint ignitionPoint [ 0 1 0 0 0 0 0 ] ( 0.2 0 0.02 ); + timing timing [ 0 0 1 0 0 0 0 ] 0; + duration duration [ 0 0 1 0 0 0 0 ] 1; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties index 03e0adce89..b5ad4b1cfd 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties @@ -2,18 +2,20 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties index 81b8b07bc6..1ae195e668 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object injectorProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -32,7 +33,7 @@ FoamFile 1.0 ); - massFlowRateProfile + massFlowRateProfile ( (0 0.1272) (4.16667e-05 6.1634) @@ -91,7 +92,7 @@ FoamFile 1.0 ); - massFlowRateProfile + massFlowRateProfile ( (0 0.1272) (4.16667e-05 6.1634) @@ -132,7 +133,7 @@ FoamFile (0.00125 1.0) ); } - } + } ) // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary index 5e28555623..2e94e303b7 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties index 8a53ee8d1e..ec151bbf0a 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties @@ -2,14 +2,15 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object sprayProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,20 +25,13 @@ interpolationSchemes subCycles 2; -atomizationModel off; -//atomizationModel LISA; +atomizationModel off; + +includeOscillation yes; -includeOscillation yes; -//breakupModel TAB; -//breakupModel ETAB; -//breakupModel ReitzDiwakar; breakupModel ReitzKHRT; -//injectorModel constInjector; -//injectorModel ChomiakInjector; -//injectorModel definedInjector; -//injectorModel pressureSwirlInjector; -injectorModel hollowConeInjector; +injectorModel hollowConeInjector; collisionModel off; @@ -53,33 +47,27 @@ wallModel reflect; specConstAtomizationCoeffs { - dropletNozzleDiameterRatio - ( - 0.4 - ); - sprayAngle - ( - 10 - ); + dropletNozzleDiameterRatio ( 0.4 ); + sprayAngle ( 10 ); } TABCoeffs { - y0 0.0; - yDot0 0.0; - Cmu 10.0; - Comega 8.0; + y0 0; + yDot0 0; + Cmu 10; + Comega 8; WeCrit 12; } ETABCoeffs { - Cmu 10.0; - Comega 8.0; - WeCrit 12; - k1 0.2; - k2 0.2; - WeTransition 100.0; + Cmu 10; + Comega 8; + WeCrit 12; + k1 0.2; + k2 0.2; + WeTransition 100; } ReitzDiwakarCoeffs @@ -134,45 +122,25 @@ hollowConeInjectorCoeffs { dropletPDF { - //pdfType exponential; pdfType RosinRammler; - RosinRammlerPDF { - minValue 1.00e-6; - maxValue 1.50e-4; - - d - ( - 1.5e-4 - ); - - n - ( - 3 - ); + minValue 1e-06; + maxValue 0.00015; + d ( 0.00015 ); + n ( 3 ); } + exponentialPDF { - minValue 1.0e-4; - maxValue 1.0e-3; - - lambda - ( - 1.0e+4 - ); + minValue 0.0001; + maxValue 0.001; + lambda ( 10000 ); } } - innerConeAngle - ( - 0.0 - ); - - outerConeAngle - ( - 20.0 - ); + innerConeAngle ( 0 ); + outerConeAngle ( 20 ); } reflectCoeffs @@ -180,4 +148,5 @@ reflectCoeffs elasticity 0.9; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties index e23158128b..2423823385 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties @@ -2,34 +2,33 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; - object thermodynamicProperties; + location "constant"; + object thermophysicalProperties; } -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hMixtureThermo; +thermoType hMixtureThermo; -CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; -// We use the central thermo data: -CHEMKINThermoFile "~OpenFOAM/thermoData/therm.dat"; +CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; + +CHEMKINThermoFile "~OpenFOAM/thermoData/therm.dat"; inertSpecie N2; -liquidComponents -( - C7H16 -); +liquidComponents ( C7H16 ); liquidProperties { - C7H16 C7H16 defaultCoeffs; + C7H16 C7H16 defaultCoeffs; } -/*********************************************************************/ + +// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties index 3d7edb19ec..88ce3d1bc4 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties @@ -2,18 +2,20 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RASModel; +simulationType RASModel; + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict index 951d757ff8..081c1d7369 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict @@ -2,49 +2,50 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +startFrom startTime; -startFrom startTime; +startTime 0; -startTime 0; +stopAt endTime; -stopAt endTime; +endTime 0.01; -endTime 0.01; +deltaT 2.5e-06; -deltaT 2.5e-06; +writeControl adjustableRunTime; -writeControl adjustableRunTime; +writeInterval 5e-05; -writeInterval 5.0e-5; +purgeWrite 0; -purgeWrite 0; +writeFormat binary; -writeFormat binary; +writePrecision 6; -writePrecision 6; +writeCompression uncompressed; -writeCompression uncompressed; +timeFormat general; -timeFormat general; +timePrecision 6; -timePrecision 6; +adjustTimeStep yes; -adjustTimeStep yes; +maxCo 0.1; -maxCo 0.1; +runTimeModifiable yes; -runTimeModifiable yes; // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes index e3033a80a2..5ed3bb30fa 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes @@ -2,21 +2,22 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -27,31 +28,26 @@ gradSchemes divSchemes { - default none; - div(phi,rho) Gauss limitedLinear 1; - div(phi,U) Gauss limitedLinearV 1; - div(phiU,p) Gauss linear; - div(phi,k) Gauss limitedLinear 1; + default none; + div(phi,rho) Gauss limitedLinear 1; + div(phi,U) Gauss limitedLinearV 1; + div(phiU,p) Gauss linear; + div(phi,k) Gauss limitedLinear 1; div(phi,epsilon) Gauss limitedLinear 1; - div(phi,Yi_h) Gauss upwind; - div(phi,fu_ft_h) Gauss multivariateSelection - { - fu limitedLinear 1; - ft limitedLinear 1; - h limitedLinear 1; - }; + div(phi,Yi_h) Gauss upwind; + div(phi,fu_ft_h) Gauss multivariateSelection { fu limitedLinear 1 ; ft limitedLinear 1 ; h limitedLinear 1 ; }; div((muEff*dev2(grad(U).T()))) Gauss linear; } laplacianSchemes { - default Gauss linear corrected; - laplacian(muEff,U) Gauss linear corrected; - laplacian(muEff,ft) Gauss linear corrected; - laplacian(muEff,fu) Gauss linear corrected; + default Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; + laplacian(muEff,ft) Gauss linear corrected; + laplacian(muEff,fu) Gauss linear corrected; laplacian(((alphah*mut)+alpha),h) Gauss linear corrected; laplacian((rho|A(U)),p) Gauss linear corrected; - laplacian(rhoD,k) Gauss linear corrected; + laplacian(rhoD,k) Gauss linear corrected; laplacian(rhoD,epsilon) Gauss linear corrected; } @@ -68,7 +64,8 @@ snGradSchemes fluxRequired { - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution index 3183443d6e..6c09239a76 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution @@ -2,14 +2,15 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,53 +19,59 @@ solvers { rho { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + U { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + p { - solver PCG; - preconditioner DIC; - tolerance 1e-09; - relTol 0; - }; + solver PCG; + preconditioner DIC; + tolerance 1e-09; + relTol 0; + } + Yi { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + h { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + k { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + epsilon { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } } PISO @@ -73,4 +80,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties b/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties index 6236e36490..62bcf8bb71 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,73 +27,74 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0; - alphah 1.111; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0; + alphah 1.111; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 -0.33; + alphah 1; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties index 1b0c9a7916..e79c47968c 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders; fuel IsoOctane; -Su Su [0 1 -1 0 0 0 0] 0; +Su Su [ 0 1 -1 0 0 0 0 ] 0; SuModel unstrained; -equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 1; +equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1; -sigmaExt sigmaExt [0 0 -1 0 0 0 0] 100000; +sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 100000; XiModel transport; -XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; +XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62; -XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; +XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1; -uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; +uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1; GuldersCoeffs { @@ -45,6 +46,7 @@ GuldersCoeffs beta -0.5; f 2.3; } + Propane { W 0.446; @@ -54,6 +56,7 @@ GuldersCoeffs beta -0.2; f 2.3; } + IsoOctane { W 0.4658; @@ -69,7 +72,6 @@ ignite yes; ignitionSites ( - { location (0.03 0 0.091); diameter 0.002; @@ -79,11 +81,13 @@ ignitionSites } ); -ignitionSphereFraction 1.0; +ignitionSphereFraction 1; -ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0; -ignitionCircleFraction 1; +ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0; + +ignitionCircleFraction 1; + +ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0; -ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry index 4b8dc36854..2ed448b1dd 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry +++ b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,22 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object engineGeometry; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // engineMesh layered; -conRodLength conRodLength [0 1 0 0 0 0 0] 0.147; +conRodLength conRodLength [ 0 1 0 0 0 0 0 ] 0.147; -bore bore [0 1 0 0 0 0 0] 0.092; +bore bore [ 0 1 0 0 0 0 0 ] 0.092; -stroke stroke [0 1 0 0 0 0 0] 0.08423; +stroke stroke [ 0 1 0 0 0 0 0 ] 0.08423; -clearance clearance [0 1 0 0 0 0 0] 0.00115; +clearance clearance [ 0 1 0 0 0 0 0 ] 0.00115; + +rpm rpm [ 0 0 -1 0 0 0 0 ] 1500; -rpm rpm [0 0 -1 0 0 0 0] 1500; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties index ca80af21ee..645c9af099 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 ); + // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties index a45a851b18..493713c379 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hhuMixtureThermo>>>>; -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.0336; +stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336; fuel fuel 1 114.23 298.15 5000 1000 19.3963 0.0488137 -1.55798e-05 2.17831e-09 -1.08391e-13 -37133.9 -78.8531 0.429357 0.0765769 8.41306e-06 -5.86603e-08 2.79414e-11 -30446.4 25.6735 1.67212e-06 170.672; @@ -28,4 +29,5 @@ products products 1 28.8478 298.15 5000 1000 3.10156 0.00124723 -4.2071e- burntProducts burntProducts 1 28.6068 200 6000 1000 3.12468 0.00178578 -5.94695e-07 9.09801e-11 -5.1246e-15 -11005.8 5.03593 3.47612 0.000758205 -3.68739e-07 1.3449e-09 -8.08868e-13 -11071.5 3.3058 1.67212e-06 170.672; + // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict index ba6351bc7c..359d4d135a 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime -180; @@ -43,10 +43,11 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1.0; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st index d3c9a99858..2ae209cb5f 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,7 +10,8 @@ FoamFile version 2.0; format ascii; class dictionary; - object controlDict; + location "system"; + object controlDict.1st; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,10 +45,11 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1.0; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd index ea956c0093..4ec457ba62 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,7 +10,8 @@ FoamFile version 2.0; format ascii; class dictionary; - object controlDict; + location "system"; + object controlDict.2nd; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,10 +45,11 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1.0; // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes index 9d7fa7421b..98d6c3c358 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -38,14 +39,7 @@ divSchemes div(phiXi,Xi) Gauss upwind; div(phiXi,Su) Gauss upwind; div(phiSt,b) Gauss limitedLinear01 1; - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - fu limitedLinear01 1; - ft limitedLinear01 1; - b limitedLinear01 1; - h limitedLinear 1; - hu limitedLinear 1; - }; + div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; }; div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; @@ -79,7 +73,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution index 42e0957d17..a940d2ad89 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,90 +10,116 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - p PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - ft PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + ft { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - fu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + fu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - b PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + b { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Xi PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Xi { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Su PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Su { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - h PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + h { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - hu PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + hu { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -104,4 +130,5 @@ PISO fluxGradp no; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties index 1eb45d2f88..9081551c6f 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +19,5 @@ thermoType hThermo>>>>; -//thermoType hThermo>>>>; -// Replacates constThermo (Cp = const) -/* -mixture N2 - 1 28.01348 - 0 10000 1000 - 3.5 0 0 0 0 0 0 - 3.5 0 0 0 0 0 0 -// 3.5 0 0 0 0 -1043.52 0 -// 3.5 0 0 0 0 -1043.52 0 -// 0.0268142 0.3177838 -11.3155513; // Blottner - 1.458e-06 110; // Sutherland -*/ -// janafThermo +mixture N2 1 28.01348 100 10000 1000 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 1.458e-06 110; -mixture N2 - 1 28.01348 - 100 10000 1000 - 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 - -923.93753 5.8718221 - 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 - -1046.9637 2.9674391 -// 0.0268142 0.3177838 -11.3155513; // Blottner - 1.458e-06 110; // Sutherland // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict index c8548cf171..b2f7a33295 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,4 +47,5 @@ maxCo 0.5; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes index feda8725db..af6b9b8917 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//fluxScheme Tadmor; // KT -fluxScheme Kurganov; // KNP +fluxScheme Kurganov; ddtSchemes { @@ -30,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -40,13 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; + default linear; reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; -// reconstruct(rho) upwind; -// reconstruct(U) upwind; -// reconstruct(T) upwind; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -54,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution index c2802217ad..bcef973269 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09 - relTol 0.1; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09 relTol 0.1; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict index f8a45e93a2..d578a3cadd 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,50 +10,22 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPointFace; -setFormat raw; -surfaceFormat vtk; -sets -( - cone25 - { - type face; - axis x; - start ( 0.0 0.0 0.0); - end ( 92.08087e-03 42.939e-03 0.0); - nPoints 92; - } +setFormat raw; - cone55 - { - type face; - axis x; - start ( 92.08087e-03 42.939e-03 0.0); - end ( 153.6830e-03 130.92e-03 0.0); - nPoints 61; - } +surfaceFormat vtk; - base - { - type face; - axis x; - start ( 153.6830e-03 130.92e-03 0.0); - end ( 193.6750e-03 130.92e-03 0.0); - nPoints 40; - } -); +sets ( cone25 { type face ; axis x ; start ( 0 0 0 ) ; end ( 0.09208087 0.042939 0 ) ; nPoints 92 ; } cone55 { type face ; axis x ; start ( 0.09208087 0.042939 0 ) ; end ( 0.153683 0.13092 0 ) ; nPoints 61 ; } base { type face ; axis x ; start ( 0.153683 0.13092 0 ) ; end ( 0.193675 0.13092 0 ) ; nPoints 40 ; } ); -surfaces (); +surfaces ( ); + +fields ( p wallHeatTransRate ); -fields -( - p - wallHeatTransRate -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties index 86b760a58e..841a143c18 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hThermo>>>>; -mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0; +mixture normalisedGas 1 11640.3 2.5 0 0 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict index 6f0806d917..8b725998ed 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -42,10 +43,11 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep yes; +adjustTimeStep yes; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1; // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes index eb9e787aef..af6b9b8917 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//fluxScheme Tadmor; // KT -fluxScheme Kurganov; // KNP +fluxScheme Kurganov; ddtSchemes { @@ -30,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -40,13 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; - reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; -// reconstruct(rho) upwind; -// reconstruct(U) upwind; -// reconstruct(T) upwind; + default linear; + reconstruct(rho) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -54,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution index 19baedc7b2..ed875f376e 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10 relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties index 86b760a58e..841a143c18 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hThermo>>>>; -mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0; +mixture normalisedGas 1 11640.3 2.5 0 0 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict index d5385089b9..5fa869b4cd 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -51,4 +51,5 @@ maxCo 0.2; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes index eb9e787aef..af6b9b8917 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//fluxScheme Tadmor; // KT -fluxScheme Kurganov; // KNP +fluxScheme Kurganov; ddtSchemes { @@ -30,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -40,13 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; - reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; -// reconstruct(rho) upwind; -// reconstruct(U) upwind; -// reconstruct(T) upwind; + default linear; + reconstruct(rho) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -54,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution index 19baedc7b2..ed875f376e 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10 relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties index 32f2bf50c6..919fec0cea 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hThermo>>>>; -mixture air 1 28.96 1004.5 2.544e+06 0.0 1.0; +mixture air 1 28.96 1004.5 2.544e+06 0 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict index 38434ebd6f..37f1018867 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,43 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +startFrom startTime; -startFrom startTime; +startTime 0; -startTime 0; +stopAt endTime; -stopAt endTime; +endTime 0.007; -endTime 0.007; +deltaT 1e-06; -deltaT 1e-06; +writeControl adjustableRunTime; -writeControl adjustableRunTime; +writeInterval 0.001; -writeInterval 0.001; +cycleWrite 0; -cycleWrite 0; +writeFormat ascii; -writeFormat ascii; - -writePrecision 6; +writePrecision 6; writeCompression uncompressed; -timeFormat general; +timeFormat general; -timePrecision 6; +timePrecision 6; runTimeModifiable yes; -adjustTimeStep yes; +adjustTimeStep yes; -maxCo 0.2; +maxCo 0.2; + +maxDeltaT 1; -maxDeltaT 1; // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes index 8bf05386b7..af6b9b8917 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluxScheme Kurganov; +fluxScheme Kurganov; ddtSchemes { @@ -29,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -39,10 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; + default linear; reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -50,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution index 19baedc7b2..ed875f376e 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10 relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict index 460a73553c..d8e4f7301d 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,22 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPoint; -setFormat raw; -surfaceFormat vtk; -sets -( - line - { - type face; - axis x; - start (-5 0 0); - end ( 5 0 0); - nPoints 100; - } -); +setFormat raw; -surfaces (); +surfaceFormat vtk; + +sets ( line { type face ; axis x ; start ( -5 0 0 ) ; end ( 5 0 0 ) ; nPoints 100 ; } ); + +surfaces ( ); + +fields ( p U.component(0) T rho ); -fields -( - p U.component(0) T rho -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict index 83d5d1949f..2bc2098275 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volVectorFieldValue U (0 0 0) - volScalarFieldValue T 348.43206 - volScalarFieldValue p 1.0e+5 -); +defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); -regions -( - boxToCell - { - box (0 -1 -1) (5 1 1); +regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); - fieldValues - ( - volScalarFieldValue T 278.74564 - volScalarFieldValue p 1.0e+4 - ); - } -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties index 86b760a58e..841a143c18 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // thermoType hThermo>>>>; -mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0; +mixture normalisedGas 1 11640.3 2.5 0 0 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict index 301694b88c..a65835e805 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -23,7 +23,7 @@ stopAt endTime; endTime 0.2; -deltaT 1e-04; +deltaT 0.0001; writeControl runTime; @@ -45,8 +45,9 @@ runTimeModifiable yes; adjustTimeStep no; -maxCo 1.0; +maxCo 1; maxDeltaT 1e-06; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes index 56ca99dbd2..af6b9b8917 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -fluxScheme Kurganov; +fluxScheme Kurganov; ddtSchemes { @@ -29,7 +30,7 @@ gradSchemes divSchemes { default none; - div(tauMC) Gauss linear; + div(tauMC) Gauss linear; } laplacianSchemes @@ -39,10 +40,10 @@ laplacianSchemes interpolationSchemes { - default linear; - reconstruct(rho) vanLeer; - reconstruct(U) vanLeerV; - reconstruct(T) vanLeer; + default linear; + reconstruct(rho) vanLeer; + reconstruct(U) vanLeerV; + reconstruct(T) vanLeer; } snGradSchemes @@ -50,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution index 19baedc7b2..ed875f376e 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,31 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho diagonal {}; - rhoU diagonal {}; - rhoE diagonal {}; - - U smoothSolver + rho { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-09; - relTol 0.01; - }; + solver diagonal; + } - h smoothSolver + rhoU { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-10 - relTol 0; - }; + solver diagonal; + } + + rhoE + { + solver diagonal; + } + + U + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-09; + relTol 0.01; + } + + h + { + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-10 relTol 0; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties index 1af73fab26..26216fcde0 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,73 +27,74 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 -0.33; + alphah 1; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones index 0570df3948..e5104d4460 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object porousZones; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties index c38497facb..bd1a6c1f04 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,19 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + thermoType hThermo>>>>; -mixture - air 1 28.9 // specieThermo - 1007 0 // hConstThermo -// 1.84766e-05 0.7 // constTransport - 300K -// 2.68477e-05 0.7 // constTransport - 500K -// 3.93094e-05 0.7 // constTransport - 900K - 1.4792e-06 116 // sutherlandTransport (Star-CD) -// 1.4584e-06 110.33 // sutherlandTransport (European Space Agency) -; +mixture air 1 28.9 1007 0 1.4792e-06 116; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict index 3924b69fcc..d7d107cf4c 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -49,4 +49,5 @@ maxCo 10; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes index 3eb78297f7..2d98eef357 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,7 +29,6 @@ gradSchemes divSchemes { default none; - div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phiU,p) Gauss linear; @@ -37,7 +37,6 @@ divSchemes div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; div(phi,omega) Gauss upwind; - div((rho*R)) Gauss linear; div(R) Gauss linear; div(U) Gauss linear; @@ -47,7 +46,6 @@ divSchemes laplacianSchemes { default none; - laplacian(muEff,U) Gauss linear corrected; laplacian(mut,U) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; @@ -71,8 +69,8 @@ snGradSchemes fluxRequired { default no; - - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution index bdf27a66c4..41749badaf 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,98 +10,120 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; - UFinal PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0.1; + } + + UFinal { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - p PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0.01; - }; - pFinal PCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.01; + } + + pFinal { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - h PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + h { - preconditioner DILU; - tolerance 1e-05; - relTol 0.1; - }; - hFinal PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0.1; + } + + hFinal { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - omega PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + omega { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PIMPLE { - nOuterCorrectors 50; - nCorrectors 1; + nOuterCorrectors 50; + nCorrectors 1; nNonOrthogonalCorrectors 0; momentumPredictor yes; - - pMin pMin [1 -1 -2 0 0 0 0] 1000; + pMin pMin [ 1 -1 -2 0 0 0 0 ] 1000; } relaxationFactors { - U 0.7; - p 0.3; - rho 0.05; - h 0.7; - k 0.7; - omega 0.7; + U 0.7; + p 0.3; + rho 0.05; + h 0.7; + k 0.7; + omega 0.7; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties index ed200ef229..25be4174a3 100644 --- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object LESProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESModel oneEqEddy; +LESModel oneEqEddy; -printCoeffs on; +printCoeffs on; -delta cubeRootVol; +delta cubeRootVol; laminarCoeffs { @@ -26,34 +27,34 @@ laminarCoeffs oneEqEddyCoeffs { - ce 1.048; - ck 0.094; + ce 1.048; + ck 0.094; } dynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } lowReOneEqEddyCoeffs { - ck 0.07; - ce 1.05; - beta 0.01; + ck 0.07; + ce 1.05; + beta 0.01; } SmagorinskyCoeffs { - ck 0.02; - ce 0.202; + ck 0.02; + ce 0.202; } DeardorffDiffStressCoeffs { - ce 1.048; - ck 0.094; - cm 4.13; + ce 1.048; + ck 0.094; + cm 4.13; } cubeRootVolCoeffs @@ -68,6 +69,7 @@ PrandtlCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -75,9 +77,11 @@ PrandtlCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Cdelta 0.158; + + Cdelta 0.158; } vanDriestCoeffs @@ -87,6 +91,7 @@ vanDriestCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -94,10 +99,12 @@ vanDriestCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Aplus 26; - Cdelta 0.158; + + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -107,14 +114,16 @@ smoothCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } -kappa 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E 9; + E 9; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties index 7eb3ee5b9f..7f85f2afd5 100644 --- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +19,5 @@ thermoType hThermo>>>>; mixture air 1 28.9 1007 0 1.84e-05 0.7; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict index be7feda05d..c90f2db15f 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,61 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Foam Application Class - -// Start point of run startFrom startTime; -// Calculation start time startTime 0; -// End point of run stopAt endTime; -// Calculation end time endTime 1; -// Calculation time step deltaT 0.01; -// Type of write output control writeControl runTime; -// Interval with which the results are output writeInterval 0.1; -// Limits number of time directories before overwriting purgeWrite 0; -// Write Format writeFormat ascii; -// Significant figures of written ASCII data writePrecision 6; -// Write Compression writeCompression uncompressed; -// Time directories name format timeFormat general; -// Decimal precision of time directory names timePrecision 6; -// Can parameters be modified during run time? runTimeModifiable yes; -// Automatic adjustment of time step? adjustTimeStep no; -// maxCo maxCo 0.3; -// maxDeltaT maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes index 27cf1a8bee..ce82f9337b 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,24 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; 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 limitedLinearV 1; div(phid,p) Gauss limitedLinear 1; @@ -48,10 +43,8 @@ divSchemes 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; @@ -63,26 +56,21 @@ laplacianSchemes 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; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution index d362358b02..2d540c81d3 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,78 +10,84 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - // Solver for the rho equation - rho PCG + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - // Solver for the U equation - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the p equation - p PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + p { - preconditioner DIC; - tolerance 1e-06; - relTol 0; - }; - // Solver for the h equation - h PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + h { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the R equation - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the k equation - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the epsilon equation - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - // Solver for the omega equation - omega PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + omega { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO { - // Number of PISO correctors nCorrectors 2; - // Number of non-orthogonal correctors nNonOrthogonalCorrectors 0; - // momentumPredictor? momentumPredictor yes; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict index 691db89a86..23e7202b52 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -45,4 +45,5 @@ graphFormat raw; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes index 0491812793..5a36eadc4b 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,80 +10,60 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default steadyState; + default steadyState; } gradSchemes { - default Gauss linear; - // UEqn - grad(U) Gauss linear; - grad(p) Gauss linear; + default Gauss linear; + grad(U) Gauss linear; + grad(p) Gauss linear; } divSchemes { - //- default Gauss upwind; - // UEqn - div(phi,U) Gauss upwind; - div((muEff*dev2(grad(U).T()))) Gauss linear; - // hEqn - div(phi,h) Gauss upwind; - // epsilonEqn - div(phi,epsilon) Gauss upwind; - // kEqn - div(phi,k) Gauss upwind; - - // experimental - div(phid,p) Gauss linear; + div(phi,U) Gauss upwind; + div((muEff*dev2(grad(U).T()))) Gauss linear; + div(phi,h) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(phi,k) Gauss upwind; + div(phid,p) Gauss linear; } laplacianSchemes { - //- default Gauss linear corrected; - // UEqn - laplacian(muEff,U) Gauss linear corrected; - - // hEqn - laplacian(alphaEff,h) Gauss linear corrected; - - // pCorrect + laplacian(muEff,U) Gauss linear corrected; + laplacian(alphaEff,h) Gauss linear corrected; laplacian((rho|A(U)),p) Gauss linear corrected; - - laplacian((rho*rAU),p) Gauss linear corrected; - - // epsilonEqn - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - - // kEqn - laplacian(DkEff,k) Gauss linear corrected; - - // potential - laplacian(1,p) Gauss linear corrected; + laplacian((rho*rAU),p) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(1,p) Gauss linear corrected; } interpolationSchemes { - default linear; - // default upwind phi; - div(U,p) upwind phi; + default linear; + div(U,p) upwind phi; } snGradSchemes { - default corrected; + default corrected; } fluxRequired { - default no; - p; + default no; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution index 83ed3bd9a9..337edfcc98 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,73 +10,76 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p GAMG + p { - tolerance 1e-8; - relTol 0.05; - - smoother GaussSeidel; - + solver GAMG; + tolerance 1e-08; + relTol 0.05; + smoother GaussSeidel; cacheAgglomeration off; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - U smoothSolver + U { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-6; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-06; + relTol 0.1; + } - h PBiCG + h { - preconditioner DILU; - tolerance 1e-6; - relTol 0.1; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0.1; + } - k smoothSolver + k { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-7; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } - epsilon smoothSolver + epsilon { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-7; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } } SIMPLE { - // nUCorrectors 0; - nNonOrthogonalCorrectors 0; - pMin pMin [1 -1 -2 0 0 0 0] 100; + nNonOrthogonalCorrectors 0; + pMin pMin [ 1 -1 -2 0 0 0 0 ] 100; } relaxationFactors { - p 0.3; - rho 0.05; - U 0.7; - k 0.7; - epsilon 0.7; - h 0.5; + p 0.3; + rho 0.05; + U 0.7; + k 0.7; + epsilon 0.7; + h 0.5; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties index 1af73fab26..48bd2ba117 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties @@ -2,23 +2,24 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,73 +27,74 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 -0.33; + alphah 1; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones index 0570df3948..e5104d4460 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object porousZones; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties index c38497facb..ab0fa0fe3c 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties @@ -2,27 +2,22 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + thermoType hThermo>>>>; -mixture - air 1 28.9 // specieThermo - 1007 0 // hConstThermo -// 1.84766e-05 0.7 // constTransport - 300K -// 2.68477e-05 0.7 // constTransport - 500K -// 3.93094e-05 0.7 // constTransport - 900K - 1.4792e-06 116 // sutherlandTransport (Star-CD) -// 1.4584e-06 110.33 // sutherlandTransport (European Space Agency) -; +mixture air 1 28.9 1007 0 1.4792e-06 116; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict index b354267d9e..85cf9616b9 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict @@ -2,19 +2,19 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -45,4 +45,5 @@ graphFormat raw; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes index 1ba8b44722..d3687aaaf9 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes @@ -2,86 +2,67 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default steadyState; + default steadyState; } gradSchemes { - default Gauss linear; - // UEqn - grad(U) Gauss linear; - grad(p) Gauss linear; + default Gauss linear; + grad(U) Gauss linear; + grad(p) Gauss linear; } divSchemes { - //- default Gauss upwind; - // UEqn - div(phi,U) Gauss upwind; - div((muEff*dev2(grad(U).T()))) Gauss linear; - // hEqn - div(phi,h) Gauss upwind; - // epsilonEqn - div(phi,epsilon) Gauss upwind; - // kEqn - div(phi,k) Gauss upwind; - - // experimental - div(phid,p) Gauss linear; + div(phi,U) Gauss upwind; + div((muEff*dev2(grad(U).T()))) Gauss linear; + div(phi,h) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(phi,k) Gauss upwind; + div(phid,p) Gauss linear; } laplacianSchemes { - //- default Gauss linear corrected; - // UEqn - laplacian(muEff,U) Gauss linear corrected; - - // hEqn - laplacian(alphaEff,h) Gauss linear corrected; - - // pCorrect + laplacian(muEff,U) Gauss linear corrected; + laplacian(alphaEff,h) Gauss linear corrected; laplacian((rho*rAU),p) Gauss linear corrected; - - // epsilonEqn - laplacian(DepsilonEff,epsilon) Gauss linear corrected; - - // kEqn - laplacian(DkEff,k) Gauss linear corrected; - - // potential - laplacian(1,p) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(1,p) Gauss linear corrected; } interpolationSchemes { - default linear; - // default upwind phi; - div(U,p) upwind phi; + default linear; + div(U,p) upwind phi; } snGradSchemes { - default corrected; + default corrected; } fluxRequired { - default no; - p; + default no; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution index 4a45976750..fa9e34149b 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -2,73 +2,76 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p GAMG + p { - tolerance 1e-8; - relTol 0.05; - - smoother GaussSeidel; - + solver GAMG; + tolerance 1e-08; + relTol 0.05; + smoother GaussSeidel; cacheAgglomeration off; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - h PBiCG + h { - preconditioner DILU; - tolerance 1e-6; - relTol 0.1; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0.1; + } - k smoothSolver + k { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-7; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } - epsilon smoothSolver + epsilon { - smoother GaussSeidel; - nSweeps 2; - tolerance 1e-7; - relTol 0.1; - }; + solver smoothSolver; + smoother GaussSeidel; + nSweeps 2; + tolerance 1e-07; + relTol 0.1; + } } SIMPLE { - nUCorrectors 2; - nNonOrthogonalCorrectors 0; - pMin pMin [1 -1 -2 0 0 0 0] 100; + nUCorrectors 2; + nNonOrthogonalCorrectors 0; + pMin pMin [ 1 -1 -2 0 0 0 0 ] 100; } relaxationFactors { - p 0.3; - rho 1; - U 0.7; - k 0.9; - epsilon 0.9; - h 0.9; + p 0.3; + rho 1; + U 0.7; + k 0.9; + epsilon 0.9; + h 0.9; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties index 06d85de3fd..c6bf31c073 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 1.78571; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571; + +R R [ 0 2 -2 -1 0 0 0 ] 0.714286; -R R [0 2 -2 -1 0 0 0] 0.714286; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict index 4a7ac2d550..11edd652c6 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes index 2f67c16f8a..dce91897e2 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -53,7 +54,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution index 8275db3d4b..d0dcdc1851 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,36 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PBiCG + p { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rho PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoU PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoU { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoE PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoE { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO @@ -48,4 +56,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties b/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties index f3770d3970..35229cd985 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties +++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,24 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object initProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -x0 0 ; +x0 0; -pL 1.0e+5 ; -TL 348.43206 ; -UL ( 0 0 0 ) ; +pL 100000; + +TL 348.432; + +UL ( 0 0 0 ); + +pR 10000; + +TR 278.746; + +UR ( 0 0 0 ); -pR 1.0e+4 ; -TR 278.74564 ; -UR ( 0 0 0 ) ; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties b/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties index 059e9ca5da..99575bf65f 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties +++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 717.5; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5; + +R R [ 0 2 -2 -1 0 0 0 ] 287; -R R [0 2 -2 -1 0 0 0] 287; // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict index cf7893b764..e22c10e25d 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes index 2f67c16f8a..dce91897e2 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -53,7 +54,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution index 8275db3d4b..d0dcdc1851 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,36 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PBiCG + p { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rho PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoU PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoU { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoE PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoE { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO @@ -48,4 +56,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict index 6e6e27cd9e..9d71da62e2 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,35 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPoint; -setFormat raw; +setFormat raw; -sets -( - data - { - type uniform; +sets ( data { type uniform ; axis x ; start ( -4.995 0 0 ) ; end ( 4.995 0 0 ) ; nPoints 1000 ; } ); - axis x; - start (-4.995 0 0); - end (4.995 0 0); - nPoints 1000; - } -); +surfaces ( ); -surfaces -(); +fields ( T magU p ); -fields -( - T - magU - p -); // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict index 83d5d1949f..2bc2098275 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict +++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volVectorFieldValue U (0 0 0) - volScalarFieldValue T 348.43206 - volScalarFieldValue p 1.0e+5 -); +defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); -regions -( - boxToCell - { - box (0 -1 -1) (5 1 1); +regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); - fieldValues - ( - volScalarFieldValue T 278.74564 - volScalarFieldValue p 1.0e+4 - ); - } -); // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties b/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties index 059e9ca5da..99575bf65f 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties +++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 717.5; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5; + +R R [ 0 2 -2 -1 0 0 0 ] 287; -R R [0 2 -2 -1 0 0 0] 287; // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict index dae184a1a5..581f82c6b5 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,43 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +startFrom startTime; -startFrom startTime; +startTime 0; -startTime 0; +stopAt endTime; -stopAt endTime; +endTime 0.007; -endTime 0.007; +deltaT 2e-05; -deltaT 2e-05; +writeControl runTime; -writeControl runTime; +writeInterval 0.001; -writeInterval 0.001; +purgeWrite 0; -purgeWrite 0; +writeFormat ascii; -writeFormat ascii; - -writePrecision 6; +writePrecision 6; writeCompression uncompressed; -timeFormat general; +timeFormat general; -timePrecision 6; +timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.05; +maxCo 0.05; + +maxDeltaT 1; -maxDeltaT 1; // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes index d21dcd7c0d..6433c7d1b3 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -48,7 +49,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution index 945f35d9e3..e9d281212c 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,49 +10,60 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-15; - relTol 0; - }; - rho PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoU PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoU { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoE PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoE { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoH PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoH { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO { nOuterCorrectors 3; - nCorrectors 1; - HbyAblend 0.0; + nCorrectors 1; + HbyAblend 0; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict index 83d5d1949f..2bc2098275 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict +++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volVectorFieldValue U (0 0 0) - volScalarFieldValue T 348.43206 - volScalarFieldValue p 1.0e+5 -); +defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); -regions -( - boxToCell - { - box (0 -1 -1) (5 1 1); +regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); - fieldValues - ( - volScalarFieldValue T 278.74564 - volScalarFieldValue p 1.0e+4 - ); - } -); // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties index 06d85de3fd..c6bf31c073 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 1.78571; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571; + +R R [ 0 2 -2 -1 0 0 0 ] 0.714286; -R R [0 2 -2 -1 0 0 0] 0.714286; // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict index 301694b88c..a65835e805 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -23,7 +23,7 @@ stopAt endTime; endTime 0.2; -deltaT 1e-04; +deltaT 0.0001; writeControl runTime; @@ -45,8 +45,9 @@ runTimeModifiable yes; adjustTimeStep no; -maxCo 1.0; +maxCo 1; maxDeltaT 1e-06; + // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes index ad2e2bb1e5..e849daf6ed 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,14 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; -} + default Euler; +} gradSchemes { @@ -32,7 +33,7 @@ divSchemes laplacianSchemes { - default Gauss linear corrected; + default Gauss linear corrected; } interpolationSchemes @@ -48,7 +49,8 @@ snGradSchemes fluxRequired { default yes; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution index c0d4b7c2e7..e3d198e89e 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,49 +10,60 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-15; - relTol 0; - }; - rho PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoU PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoU { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoE PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoE { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rhoH PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rhoH { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO { nOuterCorrectors 2; - nCorrectors 2; - HbyAblend 0.95; + nCorrectors 2; + HbyAblend 0.95; } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties index 06d85de3fd..c6bf31c073 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 1.78571; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571; + +R R [ 0 2 -2 -1 0 0 0 ] 0.714286; -R R [0 2 -2 -1 0 0 0] 0.714286; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties index d6a0c72beb..1e9d5be60c 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -mu mu [1 -1 -1 0 0 0 0] 0; +mu mu [ 1 -1 -1 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict index be42312415..7bf4401d7d 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes index 45bb66da3a..1c36c50aa6 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -55,7 +56,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution index 478fdf9138..bc954e2aa2 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,36 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PBiCG + p { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - U PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - rho PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + rho { - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - e PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + } + + e { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -48,4 +56,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties index 059e9ca5da..99575bf65f 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [0 2 -2 -1 0 0 0] 717.5; +Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5; + +R R [ 0 2 -2 -1 0 0 0 ] 287; -R R [0 2 -2 -1 0 0 0] 287; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties index d6a0c72beb..1e9d5be60c 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -mu mu [1 -1 -1 0 0 0 0] 0; +mu mu [ 1 -1 -1 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict index cf7893b764..e22c10e25d 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes index efcc5c9ab6..deef4abd26 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -55,7 +56,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution index 61c4ec92c4..1e1334a389 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,36 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PBiCG + p { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - U PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; - rho PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } + + rho { - preconditioner DIC; - tolerance 1e-15; - relTol 0; - }; - e PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-15; + relTol 0; + } + + e { - preconditioner DILU; - tolerance 1e-15; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-15; + relTol 0; + } } PISO @@ -48,4 +56,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict index 6e6e27cd9e..9d71da62e2 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,35 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPoint; -setFormat raw; +setFormat raw; -sets -( - data - { - type uniform; +sets ( data { type uniform ; axis x ; start ( -4.995 0 0 ) ; end ( 4.995 0 0 ) ; nPoints 1000 ; } ); - axis x; - start (-4.995 0 0); - end (4.995 0 0); - nPoints 1000; - } -); +surfaces ( ); -surfaces -(); +fields ( T magU p ); -fields -( - T - magU - p -); // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict index 83d5d1949f..2bc2098275 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volVectorFieldValue U (0 0 0) - volScalarFieldValue T 348.43206 - volScalarFieldValue p 1.0e+5 -); +defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); -regions -( - boxToCell - { - box (0 -1 -1) (5 1 1); +regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); - fieldValues - ( - volScalarFieldValue T 278.74564 - volScalarFieldValue p 1.0e+4 - ); - } -); // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties index 2a25f1c02a..226b420b22 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel LaunderSharmaKE; +RASModel LaunderSharmaKE; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,73 +27,74 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 -0.33; + alphah 1; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphah 1; + alphaEps 0.76923; + alphaR 1.22; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties index 2ac1bd2d59..8e15891e50 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +19,5 @@ thermoType hThermo resolveFeatureAngle get refined up to the maximum level. - + features ( ); refinementSurfaces { fridgeA { - // Surface-wise min and max refinement level - level (2 2); + level ( 2 2 ); } + fridgeB { - // Surface-wise min and max refinement level - level (2 2); + level ( 2 2 ); } + igloo { - // Surface-wise min and max refinement level - level (1 1); + level ( 1 1 ); } } - // Resolve sharp angles on fridges resolveFeatureAngle 60; - - - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - refinementRegions { } - - // Mesh selection - // ~~~~~~~~~~~~~~ - - // After refinement patches get added for all refinementSurfaces and - // all cells intersecting the surfaces get put into these patches. The - // section reachable from the locationInMesh is kept. - // NOTE: This point should never be on a face, always inside a cell, even - // after refinement. - locationInMesh (3 0.28 0.43); + locationInMesh ( 3 0.28 0.43 ); } - - -// Settings for the snapping. snapControls { - //- Number of patch smoothing iterations before finding correspondence - // to surface - nSmoothPatch 3; - - //- Relative distance for points to be attracted by surface feature point - // or edge. True distance is this factor times local - // maximum edge length. - tolerance 4.0; - - //- Number of mesh displacement relaxation iterations. - nSolveIter 30; - - //- Maximum number of snapping relaxation iterations. Should stop - // before upon reaching a correct mesh. - nRelaxIter 5; + nSmoothPatch 3; + tolerance 4; + nSolveIter 30; + nRelaxIter 5; } - - -// Settings for the layer addition. addLayersControls { - // Per final patch (so not geometry!) the layer information layers { fridgeA_region0 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + fridgeB_region0 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + igloo_region0 { - nSurfaceLayers 1; + nSurfaceLayers 1; } } - // Expansion factor for layer mesh - expansionRatio 1.0; - - //- Wanted thickness of final added cell layer. If multiple layers - // is the - // thickness of the layer furthest away from the wall. - // Relative to undistorted size of cell outside layer. + expansionRatio 1; finalLayerRatio 0.5; - - //- Minimum thickness of cell layer. If for any reason layer - // cannot be above minThickness do not add layer. - // Relative to undistorted size of cell outside layer. - minThickness 0.25; - - //- If points get not extruded do nGrow layers of connected faces that are - // also not grown. This helps convergence of the layer addition process - // close to features. - nGrow 0; - - - // Advanced settings - - //- When not to extrude surface. 0 is flat surface, 90 is when two faces - // make straight angle. - featureAngle 60; - - //- Maximum number of snapping relaxation iterations. Should stop - // before upon reaching a correct mesh. - nRelaxIter 5; - - // Number of smoothing iterations of surface normals + minThickness 0.25; + nGrow 0; + featureAngle 60; + nRelaxIter 5; nSmoothSurfaceNormals 1; - - // Number of smoothing iterations of interior mesh movement direction - nSmoothNormals 3; - - // Smooth layer thickness over surface patches + nSmoothNormals 3; nSmoothThickness 10; - - // Stop layer growth on highly warped cells maxFaceThicknessRatio 0.5; - - // Reduce layer growth where ratio thickness to medial - // distance is large maxThicknessToMedialRatio 0.3; - - // Angle used to pick up medial axis points minMedianAxisAngle 130; - - // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; } - - -// Generic mesh quality settings. At any undoable phase these determine -// where to undo. meshQualityControls { - //- Maximum non-orthogonality allowed. Set to 180 to disable. - maxNonOrtho 65; - - //- Max skewness allowed. Set to <0 to disable. + maxNonOrtho 65; maxBoundarySkewness 20; maxInternalSkewness 4; - - //- Max concaveness allowed. Is angle (in degrees) below which concavity - // is allowed. 0 is straight face, <0 would be convex face. - // Set to 180 to disable. - maxConcave 80; - - //- Minimum projected area v.s. actual area. Set to -1 to disable. - minFlatness 0.5; - - //- Minimum pyramid volume. Is absolute volume of cell pyramid. - // Set to very negative number (e.g. -1E30) to disable. - minVol 1e-13; - - //- Minimum face area. Set to <0 to disable. - minArea -1; - - //- Minimum face twist. Set to <-1 to disable. dot product of face normal - //- and face centre triangles normal - minTwist 0.05; - - //- minimum normalised cell determinant - //- 1 = hex, <= 0 = folded or flattened illegal cell - minDeterminant 0.001; - - //- minFaceWeight (0 -> 0.5) - minFaceWeight 0.05; - - //- minVolRatio (0 -> 1) - minVolRatio 0.01; - - //must be >0 for Fluent compatibility + maxConcave 80; + minFlatness 0.5; + minVol 1e-13; + minArea -1; + minTwist 0.05; + minDeterminant 0.001; + minFaceWeight 0.05; + minVolRatio 0.01; minTriangleTwist -1; - - - // Advanced - - //- Number of error distribution iterations - nSmoothScale 4; - //- amount to scale back displacement at error points - errorReduction 0.75; + nSmoothScale 4; + errorReduction 0.75; } +debug 0; -// Advanced +mergeTolerance 1e-06; -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - -// Merge tolerance. Is fraction of overall bounding box of initial mesh. -// Note: the write tolerance needs to be higher than this. -mergeTolerance 1E-6; // ************************************************************************* // diff --git a/tutorials/mesh/snappyHexMesh/motorBike/system/controlDict b/tutorials/mesh/snappyHexMesh/motorBike/system/controlDict index b2622384dd..ef80311ee1 100644 --- a/tutorials/mesh/snappyHexMesh/motorBike/system/controlDict +++ b/tutorials/mesh/snappyHexMesh/motorBike/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -32,7 +31,6 @@ writeInterval 1; purgeWrite 0; -//writeFormat binary; writeFormat ascii; writePrecision 7; @@ -45,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/mesh/snappyHexMesh/motorBike/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/motorBike/system/decomposeParDict index 25b7e5c29b..c0de7923c6 100644 --- a/tutorials/mesh/snappyHexMesh/motorBike/system/decomposeParDict +++ b/tutorials/mesh/snappyHexMesh/motorBike/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,18 +18,16 @@ FoamFile numberOfSubdomains 6; method hierarchical; -//method metis; -//method parMetis; simpleCoeffs { - n (4 1 1); + n ( 4 1 1 ); delta 0.001; } hierarchicalCoeffs { - n (3 2 1); + n ( 3 2 1 ); delta 0.001; order xyz; } @@ -40,8 +39,6 @@ manualCoeffs metisCoeffs { - //n (5 1 1); - //cellWeightsFile "constant/cellWeightsFile"; } diff --git a/tutorials/mesh/snappyHexMesh/motorBike/system/fvSchemes b/tutorials/mesh/snappyHexMesh/motorBike/system/fvSchemes index 51ebb81a9d..2fa85964b7 100644 --- a/tutorials/mesh/snappyHexMesh/motorBike/system/fvSchemes +++ b/tutorials/mesh/snappyHexMesh/motorBike/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,9 +10,9 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes @@ -24,8 +24,6 @@ gradSchemes { default Gauss linear; grad(p) Gauss linear; - - //snGradCorr(cellMotionU) Gauss linear; } divSchemes @@ -39,7 +37,6 @@ laplacianSchemes default none; laplacian(nu,U) Gauss linear corrected; laplacian(1|A(U),p) Gauss linear corrected; - laplacian(diffusivity,cellMotionU) Gauss linear uncorrected; } @@ -57,7 +54,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/mesh/snappyHexMesh/motorBike/system/fvSolution b/tutorials/mesh/snappyHexMesh/motorBike/system/fvSolution index 242f5524a2..876c8c233f 100644 --- a/tutorials/mesh/snappyHexMesh/motorBike/system/fvSolution +++ b/tutorials/mesh/snappyHexMesh/motorBike/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,21 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers -{ - //p ICCG 1e-06 0; - p AMG 1e-06 0 10; - U BICCG 1e-05 0; - - // Meshmotion - cellMotionU ICCG 1e-6 0.0; - cellMotionUx ICCG 1e-6 0.0; -} +{} PISO { diff --git a/tutorials/mesh/snappyHexMesh/motorBike/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/motorBike/system/snappyHexMeshDict index e3d24a6921..fa094e1b03 100644 --- a/tutorials/mesh/snappyHexMesh/motorBike/system/snappyHexMeshDict +++ b/tutorials/mesh/snappyHexMesh/motorBike/system/snappyHexMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,568 +10,450 @@ FoamFile version 2.0; format ascii; class dictionary; - object autoHexMeshDict; + location "system"; + object snappyHexMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Which of the steps to run castellatedMesh true; + snap true; + addLayers true; - -// Geometry. Definition of all surfaces. All surfaces are of class -// searchableSurface. -// Surfaces are used -// - to specify refinement for any mesh cell intersecting it -// - to specify refinement for any mesh cell inside/outside/near -// - to 'snap' the mesh boundary to the surface geometry { motorBike.stl { - type triSurfaceMesh; - name motorBike; + type triSurfaceMesh; + name motorBike; } refinementBox { - type searchableBox; - min (-0.3 -0.4 -0.1); - max ( 3.0 0.4 1.4); + type searchableBox; + min ( -0.3 -0.4 -0.1 ); + max ( 3 0.4 1.4 ); } -}; +} - - -// Settings for the castellatedMesh generation. castellatedMeshControls { - - // Refinement parameters - // ~~~~~~~~~~~~~~~~~~~~~ - - // While refining maximum number of cells per processor. This is basically - // the number of cells that fit on a processor. If you choose this too small - // it will do just more refinement iterations to obtain a similar mesh. - maxLocalCells 1000000; - - // Overall cell limit (approximately). Refinement will stop immediately - // upon reaching this number so a refinement level might not complete. - // Note that this is the number of cells before removing the part which - // is not 'visible' from the keepPoint. The final number of cells might - // actually be a lot less. - maxGlobalCells 2000000; - - // The surface refinement loop might spend lots of iterations refining just a - // few cells. This setting will cause refinement to stop if <= minimumRefine - // are selected for refinement. Note: it will at least do one iteration - // (unless the number of cells to refine is 0) + maxLocalCells 1000000; + maxGlobalCells 2000000; minRefinementCells 10; - - // Number of buffer layers between different levels. - // 1 means normal 2:1 refinement restriction, larger means slower - // refinement. nCellsBetweenLevels 2; - - - - // Explicit feature edge refinement - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies a level for any cell intersected by its edges. - // This is a featureEdgeMesh, read from constant/triSurface for now. - features - ( - //{ - // file "someLine.eMesh"; - // level 2; - //} - ); - - - - // Surface based refinement - // ~~~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies two levels for every surface. The first is the minimum level, - // every cell intersecting a surface gets refined up to the minimum level. - // The second level is the maximum level. Cells that 'see' multiple - // intersections where the intersections make an - // angle > resolveFeatureAngle get refined up to the maximum level. - + features ( ); refinementSurfaces { motorBike { - // Surface-wise min and max refinement level - level (5 6); + level ( 5 6 ); } } - // Resolve sharp angles resolveFeatureAngle 30; - - - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - refinementRegions { refinementBox { - mode inside; - levels ((1E15 4)); + mode inside; + levels ( ( 1e+15 4 ) ); } } - - // Mesh selection - // ~~~~~~~~~~~~~~ - - // After refinement patches get added for all refinementSurfaces and - // all cells intersecting the surfaces get put into these patches. The - // section reachable from the locationInMesh is kept. - // NOTE: This point should never be on a face, always inside a cell, even - // after refinement. - locationInMesh (3 3 0.43); + locationInMesh ( 3 3 0.43 ); } - - -// Settings for the snapping. snapControls { - //- Number of patch smoothing iterations before finding correspondence - // to surface - nSmoothPatch 3; - - //- Relative distance for points to be attracted by surface feature point - // or edge. True distance is this factor times local - // maximum edge length. - tolerance 4.0; - - //- Number of mesh displacement relaxation iterations. - nSolveIter 30; - - //- Maximum number of snapping relaxation iterations. Should stop - // before upon reaching a correct mesh. - nRelaxIter 5; + nSmoothPatch 3; + tolerance 4; + nSolveIter 30; + nRelaxIter 5; } - - -// Settings for the layer addition. addLayersControls { - // Per final patch (so not geometry!) the layer information layers { minZ { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_frt-fairing:001%1 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_windshield:002%2 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rr-wh-rim:005%5 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rr-wh-rim:010%10 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-wh-rim:011%11 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-wh-brake-disk:012%12 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_frame:016-shadow%13 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-susp:014%14 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-susp:014-shadow%15 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_frame:016%16 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rr-wh-rim:005-shadow%17 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rr-wh-chain-hub:022%22 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rearseat%24 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_frt-fairing%25 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_windshield%26 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_headlights%27 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_driversseat%28 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-body%29 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fuel-tank%30 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_exhaust%31 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rr-wh-rim%32 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-mud-guard%33 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-wh-rim%34 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-wh-brake-disk%35 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-brake-caliper%36 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-wh-tyre%37 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_hbars%38 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-forks%39 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_chain%40 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rr-wh-tyre%41 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_square-dial%42 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_round-dial%43 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_dial-holder%44 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-susp%45 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-brake-lights%46 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-light-bracket%47 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_frame%48 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-mud-guard%49 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-susp-spring-damp%50 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fairing-inner-plate%51 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_clutch-housing%52 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_radiator%53 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_water-pipe%54 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_water-pump%55 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_engine%56 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-shock-link%57 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-brake-fluid-pot-bracket%58 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-brake-fluid-pot%59 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_footpeg%60 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rr-wh-chain-hub%61 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-brake-caliper%62 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rider-helmet%65 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rider-visor%66 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rider-boots%67 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rider-gloves%68 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rider-body%69 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_frame:0%70 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_frt-fairing:001-shadow%74 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_windshield-shadow%75 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-mud-guard-shadow%81 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_fr-wh-brake-disk-shadow%83 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-mud-guard-shadow%84 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-susp-spring-damp-shadow%85 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_radiator-shadow%86 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-shock-link-shadow%87 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rear-brake-fluid-pot-bracket-shadow%88 { - nSurfaceLayers 1; + nSurfaceLayers 1; } + motorBike_rr-wh-chain-hub-shadow%89 { - nSurfaceLayers 1; + nSurfaceLayers 1; } } - // Expansion factor for layer mesh - expansionRatio 1.0; - - //- Wanted thickness of final added cell layer. If multiple layers - // is the - // thickness of the layer furthest away from the wall. - // Relative to undistorted size of cell outside layer. + expansionRatio 1; finalLayerRatio 0.3; - - //- Minimum thickness of cell layer. If for any reason layer - // cannot be above minThickness do not add layer. - // Relative to undistorted size of cell outside layer. - minThickness 0.1; - - //- If points get not extruded do nGrow layers of connected faces that are - // also not grown. This helps convergence of the layer addition process - // close to features. - nGrow 1; - - - // Advanced settings - - //- When not to extrude surface. 0 is flat surface, 90 is when two faces - // make straight angle. - featureAngle 30; - - //- Maximum number of snapping relaxation iterations. Should stop - // before upon reaching a correct mesh. - nRelaxIter 3; - - // Number of smoothing iterations of surface normals + minThickness 0.1; + nGrow 1; + featureAngle 30; + nRelaxIter 3; nSmoothSurfaceNormals 1; - - // Number of smoothing iterations of interior mesh movement direction - nSmoothNormals 3; - - // Smooth layer thickness over surface patches + nSmoothNormals 3; nSmoothThickness 10; - - // Stop layer growth on highly warped cells maxFaceThicknessRatio 0.5; - - // Reduce layer growth where ratio thickness to medial - // distance is large maxThicknessToMedialRatio 0.3; - - // Angle used to pick up medial axis points minMedianAxisAngle 130; - - // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; } - - -// Generic mesh quality settings. At any undoable phase these determine -// where to undo. meshQualityControls { - //- Maximum non-orthogonality allowed. Set to 180 to disable. - maxNonOrtho 65; - - //- Max skewness allowed. Set to <0 to disable. + maxNonOrtho 65; maxBoundarySkewness 20; maxInternalSkewness 4; - - //- Max concaveness allowed. Is angle (in degrees) below which concavity - // is allowed. 0 is straight face, <0 would be convex face. - // Set to 180 to disable. - maxConcave 80; - - //- Minimum projected area v.s. actual area. Set to -1 to disable. - minFlatness 0.5; - - //- Minimum pyramid volume. Is absolute volume of cell pyramid. - // Set to very negative number (e.g. -1E30) to disable. - minVol 1e-13; - - //- Minimum face area. Set to <0 to disable. - minArea -1; - - //- Minimum face twist. Set to <-1 to disable. dot product of face normal - //- and face centre triangles normal - minTwist 0.02; - - //- minimum normalised cell determinant - //- 1 = hex, <= 0 = folded or flattened illegal cell - minDeterminant 0.001; - - //- minFaceWeight (0 -> 0.5) - minFaceWeight 0.02; - - //- minVolRatio (0 -> 1) - minVolRatio 0.01; - - //must be >0 for Fluent compatibility + maxConcave 80; + minFlatness 0.5; + minVol 1e-13; + minArea -1; + minTwist 0.02; + minDeterminant 0.001; + minFaceWeight 0.02; + minVolRatio 0.01; minTriangleTwist -1; - - - // Advanced - - //- Number of error distribution iterations - nSmoothScale 4; - //- amount to scale back displacement at error points - errorReduction 0.75; + nSmoothScale 4; + errorReduction 0.75; } +debug 0; -// Advanced +mergeTolerance 1e-06; -// Flags for optional output -// 0 : only write final meshes -// 1 : write intermediate meshes -// 2 : write volScalarField with cellLevel for postprocessing -// 4 : write current intersections as .obj files -debug 0; - - -// Merge tolerance. Is fraction of overall bounding box of initial mesh. -// Note: the write tolerance needs to be higher than this. -mergeTolerance 1E-6; // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/boundary b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/boundary index eaeb38f09e..e9d933420b 100644 --- a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/boundary +++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/controlDict b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/controlDict index eb2d79fa78..c43b52a448 100644 --- a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/controlDict +++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,4 +45,5 @@ runTimeModifiable yes; adjustTimeStep no; + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSchemes b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSchemes index 83f984c2ed..f923afcfac 100644 --- a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSchemes +++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +53,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSolution b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSolution index ca4069e5cc..4667034336 100644 --- a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSolution +++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,14 +10,28 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p ICCG 1e-06 0; - U BICCG 1e-05 0; + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -28,4 +42,5 @@ PISO pRefValue 0; } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/mdSolution b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/mdSolution index fa264d59f7..dfef948901 100644 --- a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/mdSolution +++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/mdSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object mdSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -integrationMethod verletLeapfrog; +integrationMethod verletLeapfrog; -potentialEnergyLimit 5.256e-20; +potentialEnergyLimit 5.256e-20; -// ************************************************************************* // \ No newline at end of file + +// ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/molConfigDict b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/molConfigDict index 9423fb934a..6bd9f1538e 100644 --- a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/molConfigDict +++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/molConfigDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,57 +10,55 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object molConfigDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Subdictionaries specifying the contents of zones - -// Euler angles, expressed in degrees as phi, theta, psi, see http://mathworld.wolfram.com/EulerAngles.html - bottomWall { - massDensity 1220.0; - temperature 300.0; - velocityDistribution maxwellian; - bulkVelocity (0.0 0.0 0.0); - id Ar; - mass 6.63352033e-26; - latticeStructure FCC; - anchor (1.05e-9 3.18e-9 2.87e-9); - anchorSpecifies molecule; - tethered yes; - orientationAngles (30 0 0); + massDensity 1220; + temperature 300; + velocityDistribution maxwellian; + bulkVelocity ( 0 0 0 ); + id Ar; + mass 6.63352033e-26; + latticeStructure FCC; + anchor ( 1.05e-09 3.18e-09 2.87e-09 ); + anchorSpecifies molecule; + tethered yes; + orientationAngles ( 30 0 0 ); } liquid { - massDensity 1100.0; - temperature 250.0; - velocityDistribution maxwellian; - bulkVelocity (245.0 0.0 0.0); - id Ne; - mass 3.350996347e-26; - latticeStructure SC; - anchor (1.05e-9 3.18e-9 2.87e-9); - anchorSpecifies molecule; - tethered no; - orientationAngles (45 0 0); + massDensity 1100; + temperature 250; + velocityDistribution maxwellian; + bulkVelocity ( 245 0 0 ); + id Ne; + mass 3.350996347e-26; + latticeStructure SC; + anchor ( 1.05e-09 3.18e-09 2.87e-09 ); + anchorSpecifies molecule; + tethered no; + orientationAngles ( 45 0 0 ); } topWall { - massDensity 1220.0; - temperature 200.0; - velocityDistribution maxwellian; - bulkVelocity (0.0 0.0 0.0); - id Ar; - mass 6.63352033e-26; - latticeStructure BCC; - anchor (1.05e-9 3.18e-9 2.87e-9); - anchorSpecifies corner; - tethered yes; - orientationAngles (0 0 0); + massDensity 1220; + temperature 200; + velocityDistribution maxwellian; + bulkVelocity ( 0 0 0 ); + id Ar; + mass 6.63352033e-26; + latticeStructure BCC; + anchor ( 1.05e-09 3.18e-09 2.87e-09 ); + anchorSpecifies corner; + tethered yes; + orientationAngles ( 0 0 0 ); } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/potentialDict b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/potentialDict index 7f9346077f..56a7bbee71 100644 --- a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/potentialDict +++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/potentialDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,100 +10,78 @@ FoamFile version 2.0; format ascii; class dictionary; - object potentials; + location "system"; + object potentialDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Subdictionaries specifying types of intermolecular potential. -// Sub-sub dictionaries specify the potentials themselves. - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Removal order - -// This is the order in which to remove overlapping pairs if more than one -// type of molecule is present. The most valuable molecule type is at the -// right hand end, the molecule that will be removed 1st is 1st on the list. -// Not all types need to be present, a molecule that is not present is -// automatically less valuable than any on the list. For molecules of the -// same type there is no control over which is removed. - -removalOrder 2 (Ne Ar); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Pair potentials - -// If there are r different type of molecules, and a pair force is required -// between all combinations, then there are C = r(r+1)/2 combinations, -// i.e. for r = {1,2,3,4}, C = {1,3,6,10} (sum of triangular numbers). - -// Pair potentials are specified by the combinaition of their ids, -// for MOLA and MOLB, "MOLA-MOLB" OR "MOLB-MOLA" is acceptable -// (strictly OR, both or neither will thrown an error) +removalOrder 2 ( Ne Ar ); pair { Ar-Ar { pairPotential maitlandSmith; - rCut 1.0e-9; - rMin 0.15e-9; + rCut 1e-09; + rMin 1.5e-10; dr 5e-14; maitlandSmithCoeffs { - m 13.0; - gamma 7.5; - rm 0.3756e-9; - epsilon 1.990108438e-21; + m 13; + gamma 7.5; + rm 3.756e-10; + epsilon 1.990108438e-21; } - energyScalingFunction doubleSigmoid; + + energyScalingFunction doubleSigmoid; doubleSigmoidCoeffs { - shift1 0.9e-9; - scale1 0.3e11; - shift2 0.97e-9; - scale2 1.2e11; + shift1 9e-10; + scale1 -64771072; + shift2 9.7e-10; + scale2 -259084288; } + writeTables yes; } Ar-Ne { pairPotential maitlandSmith; - rCut 0.9e-9; - rMin 0.1e-9; + rCut 9e-10; + rMin 1e-10; dr 5e-14; maitlandSmithCoeffs { - m 13.0; + m 13; gamma 4; - rm 0.348e-9; + rm 3.48e-10; epsilon 8.765026657e-22; } - energyScalingFunction shiftedForce; + + energyScalingFunction shiftedForce; writeTables yes; } Ne-Ne { pairPotential maitlandSmith; - rCut 0.8e-9; - rMin 0.1e-9; + rCut 8e-10; + rMin 1e-10; dr 5e-14; maitlandSmithCoeffs { - m 13.0; + m 13; gamma 5; - rm 0.30739e-9; + rm 3.0739e-10; epsilon 5.813260729e-22; } - energyScalingFunction shiftedForce; + + energyScalingFunction shiftedForce; writeTables yes; } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Tethering Potentials - tether { Ar @@ -112,20 +90,15 @@ tether restrainedHarmonicSpringCoeffs { springConstant 0.1; - rR 1.2e-9; + rR 1.2e-09; } } } -// ************************************************************************* // - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// External Forces - -// Bulk external forces (namely gravity) will be specified as forces rather -// than potentials to allow their direction to be controlled. - external { - gravity (0 0 0); + gravity ( 0 0 0 ); } + + +// ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/boundary b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/boundary index b94dd10f19..a58d17ed7f 100644 --- a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/boundary +++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/controlDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/controlDict index d28aa58840..4643687163 100644 --- a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/controlDict +++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,4 +45,5 @@ runTimeModifiable yes; adjustTimeStep no; + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/decomposeParDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/decomposeParDict index 69e7126628..2b1855ea46 100644 --- a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/decomposeParDict +++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,36 +10,31 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // numberOfSubdomains 4; -method metis; +method metis; simpleCoeffs { - n (4 1 1); + n ( 4 1 1 ); delta 0.001; } hierarchicalCoeffs { - n (1 1 1); + n ( 1 1 1 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSchemes b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSchemes index 83f984c2ed..f923afcfac 100644 --- a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSchemes +++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +53,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSolution b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSolution index ca4069e5cc..4667034336 100644 --- a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSolution +++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,14 +10,28 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p ICCG 1e-06 0; - U BICCG 1e-05 0; + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -28,4 +42,5 @@ PISO pRefValue 0; } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/mdSolution b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/mdSolution index fa264d59f7..dfef948901 100644 --- a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/mdSolution +++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/mdSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object mdSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -integrationMethod verletLeapfrog; +integrationMethod verletLeapfrog; -potentialEnergyLimit 5.256e-20; +potentialEnergyLimit 5.256e-20; -// ************************************************************************* // \ No newline at end of file + +// ************************************************************************* // diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/molConfigDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/molConfigDict index 63d337e5dc..937130f4ac 100644 --- a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/molConfigDict +++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/molConfigDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,58 +10,55 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object molConfigDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Subdictionaries specifying the contents of zones - for the moment have a single species in each block - move to mixed - -// Euler angles, expressed in degrees as phi, theta, psi, see http://mathworld.wolfram.com/EulerAngles.html - sectionA { - massDensity 1220.0; - temperature 300.0; - velocityDistribution maxwellian; - bulkVelocity (-250.0 0.0 0.0); - id Ar; - mass 6.63352033e-26; - latticeStructure SC; - anchor (0.0 0.0 0.0); - anchorSpecifies molecule; - tethered no; - orientationAngles (0 0 0); + massDensity 1220; + temperature 300; + velocityDistribution maxwellian; + bulkVelocity ( -250 0 0 ); + id Ar; + mass 6.63352033e-26; + latticeStructure SC; + anchor ( 0 0 0 ); + anchorSpecifies molecule; + tethered no; + orientationAngles ( 0 0 0 ); } sectionB { - massDensity 1220.0; - temperature 300.0; - velocityDistribution maxwellian; - bulkVelocity (-250.0 0.0 0.0); - id Ne; - mass 3.350917e-26; - latticeStructure SC; - anchor (0.0 0.0 0.0); - anchorSpecifies molecule; - tethered no; - orientationAngles (0 0 0); + massDensity 1220; + temperature 300; + velocityDistribution maxwellian; + bulkVelocity ( -250 0 0 ); + id Ne; + mass 3.350917e-26; + latticeStructure SC; + anchor ( 0 0 0 ); + anchorSpecifies molecule; + tethered no; + orientationAngles ( 0 0 0 ); } sectionC { - massDensity 1220.0; - temperature 300.0; - velocityDistribution maxwellian; - bulkVelocity (-250.0 0.0 0.0); - id Ar; - mass 6.63352033e-26; - latticeStructure SC; - anchor (0.0 0.0 0.0); - anchorSpecifies molecule; - tethered no; - orientationAngles (0 0 0); + massDensity 1220; + temperature 300; + velocityDistribution maxwellian; + bulkVelocity ( -250 0 0 ); + id Ar; + mass 6.63352033e-26; + latticeStructure SC; + anchor ( 0 0 0 ); + anchorSpecifies molecule; + tethered no; + orientationAngles ( 0 0 0 ); } + // ************************************************************************* // - \ No newline at end of file diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/potentialDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/potentialDict index 7789766620..0386a6994e 100644 --- a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/potentialDict +++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/potentialDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,95 +10,77 @@ FoamFile version 2.0; format ascii; class dictionary; - object potentials; + location "system"; + object potentialDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Subdictionaries specifying types of intermolecular potential. -// Sub-sub dictionaries specify the potentials themselves. - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Removal order - -// This is the order in which to remove overlapping pairs if more than one -// type of molecule is present. The most valuable molecule type is at the -// right hand end, the molecule that will be removed 1st is 1st on the list. -// Not all types need to be present, a molecule that is not present is -// automatically less valuable than any on the list. For molecules of the -// same type there is no control over which is removed. - -removalOrder 1 (Ar); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Pair potentials - -// If there are r different type of molecules, and a pair force is required -// between all combinations, then there are C = r(r+1)/2 combinations, -// i.e. for r = {1,2,3,4}, C = {1,3,6,10} (sum of triangular numbers). - -// Pair potentials are specified by the combinaition of their ids, -// for MOLA and MOLB, "MOLA-MOLB" OR "MOLB-MOLA" is acceptable -// (strictly OR, both or neither will thrown an error) +removalOrder 1 ( Ar ); pair { Ar-Ar { pairPotential maitlandSmith; - rCut 1.0e-9; - rMin 0.15e-9; + rCut 1e-09; + rMin 1.5e-10; dr 5e-14; maitlandSmithCoeffs { - m 13.0; - gamma 7.5; - rm 0.3756e-9; - epsilon 1.990108438e-21; + m 13; + gamma 7.5; + rm 3.756e-10; + epsilon 1.990108438e-21; } - energyScalingFunction doubleSigmoid; + + energyScalingFunction doubleSigmoid; doubleSigmoidCoeffs { - shift1 0.9e-9; - scale1 0.3e11; - shift2 0.97e-9; - scale2 1.2e11; + shift1 9e-10; + scale1 -64771072; + shift2 9.7e-10; + scale2 -259084288; } + writeTables no; } Ar-Ne { pairPotential maitlandSmith; - rCut 0.9e-9; - rMin 0.1e-9; + rCut 9e-10; + rMin 1e-10; dr 5e-14; maitlandSmithCoeffs { - m 13.0; + m 13; gamma 4; - rm 0.348e-9; + rm 3.48e-10; epsilon 8.765026657e-22; } - energyScalingFunction shiftedForce; + + energyScalingFunction shiftedForce; writeTables no; } Ne-Ne { pairPotential maitlandSmith; - rCut 0.8e-9; - rMin 0.1e-9; + rCut 8e-10; + rMin 1e-10; dr 5e-14; maitlandSmithCoeffs { - m 13.0; + m 13; gamma 5; - rm 0.30739e-9; + rm 3.0739e-10; epsilon 5.813260729e-22; } - energyScalingFunction shiftedForce; + + energyScalingFunction shiftedForce; writeTables no; } } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary index 54dbb7ef4a..b3548de91c 100644 --- a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary +++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/controlDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/controlDict index 76f7ed8a7e..f1052a4864 100644 --- a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/controlDict +++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,4 +45,5 @@ runTimeModifiable yes; adjustTimeStep no; + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSchemes b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSchemes index 83f984c2ed..f923afcfac 100644 --- a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSchemes +++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +53,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSolution b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSolution index ca4069e5cc..4667034336 100644 --- a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSolution +++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,14 +10,28 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p ICCG 1e-06 0; - U BICCG 1e-05 0; + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -28,4 +42,5 @@ PISO pRefValue 0; } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict index e044b83785..2dd296045b 100644 --- a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict +++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object mdEquilibrationDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -equilibrationTargetTemperature 300.0; +equilibrationTargetTemperature 300; -// ************************************************************************* // \ No newline at end of file + +// ************************************************************************* // diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdSolution b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdSolution index fa264d59f7..dfef948901 100644 --- a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdSolution +++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object mdSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -integrationMethod verletLeapfrog; +integrationMethod verletLeapfrog; -potentialEnergyLimit 5.256e-20; +potentialEnergyLimit 5.256e-20; -// ************************************************************************* // \ No newline at end of file + +// ************************************************************************* // diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/molConfigDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/molConfigDict index 9ae0513869..6f48e375e8 100644 --- a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/molConfigDict +++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/molConfigDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,26 +10,25 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object molConfigDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Euler angles, expressed in degrees as phi, theta, psi, -// see http://mathworld.wolfram.com/EulerAngles.html - liquid { - massDensity 1220.0; - temperature 300.0; - velocityDistribution maxwellian; - bulkVelocity (0.0 0.0 0.0); - id Ar; - mass 6.63352033e-26; - latticeStructure SC; - anchor (0.0 0.0 0.0); - anchorSpecifies molecule; - tethered no; - orientationAngles (0 0 0); + massDensity 1220; + temperature 300; + velocityDistribution maxwellian; + bulkVelocity ( 0 0 0 ); + id Ar; + mass 6.63352033e-26; + latticeStructure SC; + anchor ( 0 0 0 ); + anchorSpecifies molecule; + tethered no; + orientationAngles ( 0 0 0 ); } + // ************************************************************************* // diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/potentialDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/potentialDict index 15af6ed181..1abf7b0e56 100644 --- a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/potentialDict +++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/potentialDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,64 +10,39 @@ FoamFile version 2.0; format ascii; class dictionary; - object potentials; + location "system"; + object potentialDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Subdictionaries specifying types of intermolecular potential. -// Sub-sub dictionaries specify the potentials themselves. - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Removal order - -// This is the order in which to remove overlapping pairs if more than one -// type of molecule is present. The most valuable molecule type is at the -// right hand end, the molecule that will be removed 1st is 1st on the list. -// Not all types need to be present, a molecule that is not present is -// automatically less valuable than any on the list. For molecules of the -// same type there is no control over which is removed. - -removalOrder 1 (Ar); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Pair potentials - -// If there are r different type of molecules, and a pair force is required -// between all combinations, then there are C = r(r+1)/2 combinations, -// i.e. for r = {1,2,3,4}, C = {1,3,6,10} (sum of triangular numbers). - -// Pair potentials are specified by the combinaition of their ids, -// for MOLA and MOLB, "MOLA-MOLB" OR "MOLB-MOLA" is acceptable -// (strictly OR, both or neither will thrown an error) +removalOrder 1 ( Ar ); pair { Ar-Ar { pairPotential azizChen; - rCut 1.2e-9; - rMin 0.15e-9; + rCut 1.2e-09; + rMin 1.5e-10; dr 2e-14; azizChenCoeffs { - epsilon 1.97742255e-21; - rm 3.759e-10; - A 0.9502720e7; - alpha 16.345655; - C6 1.0914254; - C8 0.6002595; - C10 0.3700113; - D 1.4; - gamma 2.0; + epsilon 1.97742255e-21; + rm 3.759e-10; + A 9502720; + alpha 16.345655; + C6 1.0914254; + C8 0.6002595; + C10 0.3700113; + D 1.4; + gamma 2; } - energyScalingFunction noScaling; + + energyScalingFunction noScaling; writeTables yes; } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Tethering Potentials - tether { Ar @@ -76,20 +51,15 @@ tether restrainedHarmonicSpringCoeffs { springConstant 0.0277; - rR 1.2e-9; + rR 1.2e-09; } } } -// ************************************************************************* // - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// External Forces - -// Bulk external forces (namely gravity) will be specified as forces rather -// than potentials to allow their direction to be controlled. - external { - gravity (0 0 0); + gravity ( 0 0 0 ); } + + +// ************************************************************************* // diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties index 3bb698673a..3569e78dc3 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel laminar; +RASModel laminar; -turbulence off; +turbulence off; -printCoeffs off; +printCoeffs off; laminarCoeffs { @@ -26,17 +27,18 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties index 03e0adce89..a866ff549f 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties index 11155a1923..cfdcc78cc7 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,26 +10,28 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rhoa rhoa [1 -3 0 0 0 0 0] 1; +rhoa rhoa [ 1 -3 0 0 0 0 0 ] 1; -rhob rhob [1 -3 0 0 0 0 0] 1000; +rhob rhob [ 1 -3 0 0 0 0 0 ] 1000; -nua nua [0 2 -1 0 0 0 0] 1.6e-05; +nua nua [ 0 2 -1 0 0 0 0 ] 1.6e-05; -nub nub [0 2 -1 0 0 0 0] 1e-06; +nub nub [ 0 2 -1 0 0 0 0 ] 1e-06; -da da [0 1 0 0 0 0 0] 0.003; +da da [ 0 1 0 0 0 0 0 ] 0.003; -db db [0 1 0 0 0 0 0] 0.0001; +db db [ 0 1 0 0 0 0 0 ] 0.0001; -Cvm Cvm [0 0 0 0 0 0 0] 0.5; +Cvm Cvm [ 0 0 0 0 0 0 0 ] 0.5; -Cl Cl [0 0 0 0 0 0 0] 0; +Cl Cl [ 0 0 0 0 0 0 0 ] 0; + +Ct Ct [ 0 0 0 0 0 0 0 ] 1; -Ct Ct [0 0 0 0 0 0 0] 1; // ************************************************************************* // diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict index aad7cb2e75..3691a7b810 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes index 8a016bd1c4..9817f51954 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -29,7 +30,7 @@ divSchemes default none; div(phia,Ua) Gauss limitedLinearV 1; div(phib,Ub) Gauss limitedLinearV 1; - div(phib,k) Gauss limitedLinear 1; + div(phib,k) Gauss limitedLinear 1; div(phib,epsilon) Gauss limitedLinear 1; div(phi,alpha) Gauss limitedLinear01 1; div((-nuEffa*grad(Ua).T())) Gauss linear; @@ -57,7 +58,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution index 8ca429638c..e987a2da9f 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,54 +10,68 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-10; - relTol 0; - }; - Ua PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-10; + relTol 0; + } + + Ua { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Ub PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Ub { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - alpha PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + alpha { - preconditioner DILU; - tolerance 1e-10; - relTol 0; - }; - beta PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-10; + relTol 0; + } + + beta { - preconditioner DILU; - tolerance 1e-10; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-10; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -70,4 +84,5 @@ PISO pRefValue 0; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties index 86f1040611..ef3e3809da 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties @@ -1,15 +1,16 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object LESProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,96 +25,96 @@ laminarCoeffs devOneEqEddyCoeffs { - ck 0.07; - ce 1.05; + ck 0.07; + ce 1.05; } oneEqEddyCoeffs { - ck 0.07; - ce 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce 1.05; - ck 0.07; - cD2 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce 1.05; - ck 0.09; - cm 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; - CDES 0.65; - ck 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -128,6 +129,7 @@ PrandtlCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -135,9 +137,11 @@ PrandtlCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Cdelta 0.158; + + Cdelta 0.158; } vanDriestCoeffs @@ -147,6 +151,7 @@ vanDriestCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -154,10 +159,12 @@ vanDriestCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Aplus 26; - Cdelta 0.158; + + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -167,14 +174,16 @@ smoothCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } -kappa 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E 9; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary index f7d75820c3..b2c07faf58 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties index 39d5cf170c..806b177923 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties @@ -1,29 +1,31 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -barotropicCompressibilityModel linear; //Chung; +barotropicCompressibilityModel linear; -psiv psiv [0 -2 2 0 0] 2.5e-06; +psiv psiv [ 0 -2 2 0 0 ] 2.5e-06; -rholSat rholSat [1 -3 0 0 0] 830; +rholSat rholSat [ 1 -3 0 0 0 ] 830; -psil psil [0 -2 2 0 0] 5e-07; +psil psil [ 0 -2 2 0 0 ] 5e-07; -pSat pSat [1 -1 -2 0 0] 4500; +pSat pSat [ 1 -1 -2 0 0 ] 4500; + +rhoMin rhoMin [ 1 -3 0 0 0 ] 0.001; -rhoMin rhoMin [1 -3 0 0 0] 0.001; // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties index dcf82123d2..7d254ddcf2 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties @@ -1,21 +1,23 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -mul mul [1 -1 -1 0 0] 6.500e-03; -muv muv [1 -1 -1 0 0] 5.953e-06; +mul mul [ 1 -1 -1 0 0 ] 0.0065; + +muv muv [ 1 -1 -1 0 0 ] 5.953e-06; twoPhase { @@ -27,43 +29,46 @@ twoPhase phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 7.831e-06; - rho rho [1 -3 0 0 0 0 0] 830; + nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 830; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - m m [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + m m [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - k k [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + k k [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 4.252e-05; - rho rho [1 -3 0 0 0 0 0] 0.14; + nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 0.14; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - m m [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + m m [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - k k [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + k k [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties index dcadcf17cd..9ddab1bfcd 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties @@ -1,19 +1,21 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType LESModel; + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 index 9dc6572157..a7c7e625e5 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 @@ -1,29 +1,25 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4e-03 -1e-03 -1) (12e-3 1e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 index 0eb66c8739..470258895d 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 @@ -1,29 +1,25 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4.5e-03 -0.75e-03 -1) (9.5e-3 0.75e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 index c1833b014e..530c710e1f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 @@ -1,29 +1,25 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4.75e-03 -0.375e-03 -1) (9e-03 0.375e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict index 8c40820a16..073ada6caa 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict @@ -1,88 +1,85 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -startFrom latestTime; +startFrom latestTime; -startTime 0; +startTime 0; -stopAt endTime; +stopAt endTime; -endTime 2e-4; +endTime 0.0002; -deltaT 1e-8; +deltaT 1e-08; -writeControl adjustableRunTime; +writeControl adjustableRunTime; -writeInterval 2e-5; +writeInterval 2e-05; -purgeWrite 0; +purgeWrite 0; -writeFormat binary; +writeFormat binary; -writePrecision 6; +writePrecision 6; -writeCompression compressed; +writeCompression compressed; -timeFormat general; +timeFormat general; -runTimeModifiable yes; +runTimeModifiable yes; -adjustTimeStep on; +adjustTimeStep on; -maxCo 0.5; +maxCo 0.5; -maxAcousticCo 50.0; +maxAcousticCo 50; functions ( fieldAverage1 { - // Type of functionObject type fieldAverage; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - + functionObjectLibs ( "libfieldFunctionObjects.so" ); enabled false; - outputControl outputTime; - - // Fields to be probed. runTime modifiable! fields ( U { - mean on; - prime2Mean off; - base time; + mean on; + prime2Mean off; + base time; } + p { - mean on; - prime2Mean off; - base time; + mean on; + prime2Mean off; + base time; } + gamma { - mean on; - prime2Mean off; - base time; + mean on; + prime2Mean off; + base time; } ); } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes index 69156453d7..957a495352 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes @@ -1,57 +1,52 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } interpolationSchemes { - default linear; + default linear; } divSchemes { - default none; -// div(phiv,rho) Gauss upwind; -// div(phi,U) Gauss upwind; -// div(phiv,k) Gauss upwind; - - div(phiv,rho) Gauss limitedLinear 0.2; - div(phi,U) Gauss filteredLinear2V 0.2 0; - div(phiv,k) Gauss filteredLinear2 0.2 0; + default none; + div(phiv,rho) Gauss limitedLinear 0.2; + div(phi,U) Gauss filteredLinear2V 0.2 0; + div(phiv,k) Gauss filteredLinear2 0.2 0; } gradSchemes { - default Gauss linear; + default Gauss linear; } laplacianSchemes { - default none; - - laplacian(nuf,rhoU) Gauss linear corrected; - laplacian(muEff,U) Gauss linear corrected; + default none; + laplacian(nuf,rhoU) Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; laplacian(rrhoUAf,p) Gauss linear corrected; - laplacian(rUAf,p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - - laplacian(1,p) Gauss linear corrected; + laplacian(rUAf,p) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(1,p) Gauss linear corrected; } snGradSchemes @@ -62,9 +57,10 @@ snGradSchemes fluxRequired { - default none; - p; - rho; + default none; + p ; + rho ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution index f5b778ec9c..7aa0a3d54c 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution @@ -1,77 +1,78 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - omega PBiCG + omega { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - k PBiCG + k { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - rho PBiCG + rho { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - U PBiCG + U { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - p GAMG + p { - tolerance 1e-8; - relTol 0; - - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } } PISO { - nCorrectors 3; - nNonOrthogonalCorrectors 0; - -// removeSwirl 2; + nCorrectors 3; + nNonOrthogonalCorrectors 0; } SIMPLE { - } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict index 12b021090d..1cc48dd0cc 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict @@ -1,39 +1,37 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -set c0; +set c0; coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + tan1 ( 1 0 0 ); + tan2 ( 0 1 0 ); } -directions -( - tan1 - tan2 -); +directions ( tan1 tan2 ); -useHexTopology yes; +useHexTopology yes; -geometricCut no; +geometricCut no; + +writeMesh no; -writeMesh no; // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties index 86f1040611..ef3e3809da 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties @@ -1,15 +1,16 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object LESProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,96 +25,96 @@ laminarCoeffs devOneEqEddyCoeffs { - ck 0.07; - ce 1.05; + ck 0.07; + ce 1.05; } oneEqEddyCoeffs { - ck 0.07; - ce 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce 1.05; - ck 0.07; - cD2 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce 1.05; - ck 0.09; - cm 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; - CDES 0.65; - ck 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -128,6 +129,7 @@ PrandtlCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -135,9 +137,11 @@ PrandtlCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Cdelta 0.158; + + Cdelta 0.158; } vanDriestCoeffs @@ -147,6 +151,7 @@ vanDriestCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -154,10 +159,12 @@ vanDriestCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Aplus 26; - Cdelta 0.158; + + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -167,14 +174,16 @@ smoothCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } -kappa 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E 9; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary index 30c545703a..adffe02dd4 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties index 39d5cf170c..806b177923 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties @@ -1,29 +1,31 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -barotropicCompressibilityModel linear; //Chung; +barotropicCompressibilityModel linear; -psiv psiv [0 -2 2 0 0] 2.5e-06; +psiv psiv [ 0 -2 2 0 0 ] 2.5e-06; -rholSat rholSat [1 -3 0 0 0] 830; +rholSat rholSat [ 1 -3 0 0 0 ] 830; -psil psil [0 -2 2 0 0] 5e-07; +psil psil [ 0 -2 2 0 0 ] 5e-07; -pSat pSat [1 -1 -2 0 0] 4500; +pSat pSat [ 1 -1 -2 0 0 ] 4500; + +rhoMin rhoMin [ 1 -3 0 0 0 ] 0.001; -rhoMin rhoMin [1 -3 0 0 0] 0.001; // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties index dcf82123d2..7d254ddcf2 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties @@ -1,21 +1,23 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -mul mul [1 -1 -1 0 0] 6.500e-03; -muv muv [1 -1 -1 0 0] 5.953e-06; +mul mul [ 1 -1 -1 0 0 ] 0.0065; + +muv muv [ 1 -1 -1 0 0 ] 5.953e-06; twoPhase { @@ -27,43 +29,46 @@ twoPhase phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 7.831e-06; - rho rho [1 -3 0 0 0 0 0] 830; + nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 830; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - m m [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + m m [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - k k [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + k k [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 4.252e-05; - rho rho [1 -3 0 0 0 0 0] 0.14; + nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 0.14; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - m m [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + m m [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - k k [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + k k [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 index 9dc6572157..a7c7e625e5 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 @@ -1,29 +1,25 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4e-03 -1e-03 -1) (12e-3 1e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 index 0eb66c8739..470258895d 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 @@ -1,29 +1,25 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4.5e-03 -0.75e-03 -1) (9.5e-3 0.75e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 index c1833b014e..530c710e1f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 @@ -1,29 +1,25 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4.75e-03 -0.375e-03 -1) (9e-03 0.375e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict index 903c0569a5..0b3c876486 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict @@ -1,88 +1,85 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -startFrom latestTime; +startFrom latestTime; -startTime 0; +startTime 0; -stopAt endTime; +stopAt endTime; -endTime 1e-4; +endTime 0.0001; -deltaT 1e-8; +deltaT 1e-08; -writeControl adjustableRunTime; +writeControl adjustableRunTime; -writeInterval 5e-6; +writeInterval 5e-06; -purgeWrite 0; +purgeWrite 0; -writeFormat binary; +writeFormat binary; -writePrecision 6; +writePrecision 6; -writeCompression compressed; +writeCompression compressed; -timeFormat general; +timeFormat general; -runTimeModifiable yes; +runTimeModifiable yes; -adjustTimeStep on; +adjustTimeStep on; -maxCo 0.5; +maxCo 0.5; -maxAcousticCo 50.0; +maxAcousticCo 50; functions ( fieldAverage1 { - // Type of functionObject type fieldAverage; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - + functionObjectLibs ( "libfieldFunctionObjects.so" ); enabled false; - outputControl outputTime; - - // Fields to be probed. runTime modifiable! fields ( U { - mean on; - prime2Mean off; - base time; + mean on; + prime2Mean off; + base time; } + p { - mean on; - prime2Mean off; - base time; + mean on; + prime2Mean off; + base time ; } + gamma { - mean on; - prime2Mean off; - base time; + mean on; + prime2Mean off; + base time; } ); } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict index 30bfe19d72..14efcafd72 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict @@ -1,15 +1,16 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method simple; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (1 1 1); + n ( 1 1 1 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes index 69156453d7..957a495352 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes @@ -1,57 +1,52 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } interpolationSchemes { - default linear; + default linear; } divSchemes { - default none; -// div(phiv,rho) Gauss upwind; -// div(phi,U) Gauss upwind; -// div(phiv,k) Gauss upwind; - - div(phiv,rho) Gauss limitedLinear 0.2; - div(phi,U) Gauss filteredLinear2V 0.2 0; - div(phiv,k) Gauss filteredLinear2 0.2 0; + default none; + div(phiv,rho) Gauss limitedLinear 0.2; + div(phi,U) Gauss filteredLinear2V 0.2 0; + div(phiv,k) Gauss filteredLinear2 0.2 0; } gradSchemes { - default Gauss linear; + default Gauss linear; } laplacianSchemes { - default none; - - laplacian(nuf,rhoU) Gauss linear corrected; - laplacian(muEff,U) Gauss linear corrected; + default none; + laplacian(nuf,rhoU) Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; laplacian(rrhoUAf,p) Gauss linear corrected; - laplacian(rUAf,p) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - - laplacian(1,p) Gauss linear corrected; + laplacian(rUAf,p) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(1,p) Gauss linear corrected; } snGradSchemes @@ -62,9 +57,10 @@ snGradSchemes fluxRequired { - default none; - p; - rho; + default none; + p ; + rho ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution index f5b778ec9c..7aa0a3d54c 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution @@ -1,77 +1,78 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - omega PBiCG + omega { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - k PBiCG + k { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - rho PBiCG + rho { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - U PBiCG + U { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - p GAMG + p { - tolerance 1e-8; - relTol 0; - - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } } PISO { - nCorrectors 3; - nNonOrthogonalCorrectors 0; - -// removeSwirl 2; + nCorrectors 3; + nNonOrthogonalCorrectors 0; } SIMPLE { - } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict index bc87cbc6a4..f162b0b3ab 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict @@ -1,25 +1,23 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object mapFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -patchMap -( -); +patchMap ( ); + +cuttingPatches ( ); -cuttingPatches -( -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict index 91dd88b58a..b2ee8aaba8 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict @@ -1,41 +1,38 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -set c0; +set c0; coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); - tan3 (0 0 1); + tan1 ( 1 0 0 ); + tan2 ( 0 1 0 ); + tan3 ( 0 0 1 ); } -directions -( - tan1 - tan2 - tan3 -); +directions ( tan1 tan2 tan3 ); -useHexTopology yes; +useHexTopology yes; -geometricCut no; +geometricCut no; + +writeMesh no; -writeMesh no; // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties index ee5f9ee5d7..461a7c61ff 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kOmegaSST; +RASModel kOmegaSST; turbulence on; @@ -24,175 +25,175 @@ laminarCoeffs kOmegaSSTCoeffs { - alphaK1 0.85034; - alphaK2 1.0; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.0750; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - - Cmu 0.09; + alphaK1 0.85034; + alphaK2 1; + alphaOmega1 0.5; + alphaOmega2 0.85616; + gamma1 0.5532; + gamma2 0.4403; + beta1 0.075; + beta2 0.0828; + betaStar 0.09; + a1 0.31; + c1 10; + Cmu 0.09; } kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } realizableKECoeffs { - Cmu 0.09; - A0 4.0; - C2 1.9; - alphak 1; - alphaEps 0.833333; + Cmu 0.09; + A0 4; + C2 1.9; + alphak 1; + alphaEps 0.833333; } NonlinearKEShihCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76932; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } LienCubicKECoeffs { - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } QZetaCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LienLeschzinerLowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; + alphaR 1.22; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary index 716ff9df05..59f24d80d0 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties index 39d5cf170c..8e37778cf1 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,22 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -barotropicCompressibilityModel linear; //Chung; +barotropicCompressibilityModel linear; -psiv psiv [0 -2 2 0 0] 2.5e-06; +psiv psiv [ 0 -2 2 0 0 ] 2.5e-06; -rholSat rholSat [1 -3 0 0 0] 830; +rholSat rholSat [ 1 -3 0 0 0 ] 830; -psil psil [0 -2 2 0 0] 5e-07; +psil psil [ 0 -2 2 0 0 ] 5e-07; -pSat pSat [1 -1 -2 0 0] 4500; +pSat pSat [ 1 -1 -2 0 0 ] 4500; + +rhoMin rhoMin [ 1 -3 0 0 0 ] 0.001; -rhoMin rhoMin [1 -3 0 0 0] 0.001; // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties index dcf82123d2..d87d3805ca 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -mul mul [1 -1 -1 0 0] 6.500e-03; -muv muv [1 -1 -1 0 0] 5.953e-06; +mul mul [ 1 -1 -1 0 0 ] 0.0065; + +muv muv [ 1 -1 -1 0 0 ] 5.953e-06; twoPhase { @@ -27,43 +29,46 @@ twoPhase phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 7.831e-06; - rho rho [1 -3 0 0 0 0 0] 830; + nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 830; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - m m [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + m m [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - k k [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + k k [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 4.252e-05; - rho rho [1 -3 0 0 0 0 0] 0.14; + nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 0.14; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - m m [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + m m [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] -999; - nuInf nuInf [0 2 -1 0 0 0 0] -999; - k k [0 0 1 0 0 0 0] -999; - n n [0 0 0 0 0 0 0] -999; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999; + k k [ 0 0 1 0 0 0 0 ] -999; + n n [ 0 0 0 0 0 0 0 ] -999; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties index 07f85c68df..b70f6702e4 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType RASModel; + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1 index 9dc6572157..b693a8e265 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1 @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4e-03 -1e-03 -1) (12e-3 1e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2 index 0eb66c8739..bb0f5cec25 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2 @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4.5e-03 -0.75e-03 -1) (9.5e-3 0.75e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3 index c1833b014e..9108137402 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3 @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } ); -topoSetSources -( - boxToCell - { - box (4.75e-03 -0.375e-03 -1) (9e-03 0.375e-03 1); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict index 04b11dbad0..d541a7c7ef 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,40 +10,42 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -startFrom latestTime; +startFrom latestTime; -startTime 0; +startTime 0; -stopAt endTime; +stopAt endTime; -endTime 2e-3; +endTime 0.002; -deltaT 1e-8; +deltaT 1e-08; -writeControl adjustableRunTime; +writeControl adjustableRunTime; -writeInterval 1e-4; +writeInterval 0.0001; -purgeWrite 0; +purgeWrite 0; -writeFormat ascii; +writeFormat ascii; -writePrecision 6; +writePrecision 6; -writeCompression uncompressed; +writeCompression uncompressed; -timeFormat general; +timeFormat general; -runTimeModifiable yes; +runTimeModifiable yes; -adjustTimeStep on; +adjustTimeStep on; -maxCo 0.5; +maxCo 0.5; + +maxAcousticCo 50; -maxAcousticCo 50.0; // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes index fc43eb63b8..28237bd21c 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,45 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } interpolationSchemes { - default linear; + default linear; } divSchemes { - default none; - div(phiv,rho) Gauss limitedLinear 0.2; - div(phi,U) Gauss limitedLinearV 0.2; - div(phiv,omega) Gauss limitedLinear 0.2; - div(phiv,k) Gauss limitedLinear 0.2; + default none; + div(phiv,rho) Gauss limitedLinear 0.2; + div(phi,U) Gauss limitedLinearV 0.2; + div(phiv,omega) Gauss limitedLinear 0.2; + div(phiv,k) Gauss limitedLinear 0.2; } gradSchemes { - default Gauss linear; + default Gauss linear; } laplacianSchemes { - default none; - - laplacian(nuf,rhoU) Gauss linear corrected; - laplacian(muEff,U) Gauss linear corrected; + default none; + laplacian(nuf,rhoU) Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; laplacian(rrhoUAf,p) Gauss linear corrected; - laplacian(rUAf,p) Gauss linear corrected; + laplacian(rUAf,p) Gauss linear corrected; laplacian(DomegaEff,omega) Gauss linear corrected; - laplacian(DkEff,k) Gauss linear corrected; - - laplacian(1,p) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(1,p) Gauss linear corrected; } snGradSchemes @@ -60,9 +59,10 @@ snGradSchemes fluxRequired { - default none; - p; - rho; + default none; + p ; + rho ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution index f6bad1ada0..4f413e7ef1 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,66 +10,69 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - omega PBiCG + omega { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - k PBiCG + k { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - rho PBiCG + rho { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - U PBiCG + U { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } - p GAMG + p { - tolerance 1e-8; - relTol 0; - - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; cacheAgglomeration true; - nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } } PISO { - nCorrectors 2; - nNonOrthogonalCorrectors 1; - -// removeSwirl 2; + nCorrectors 2; + nNonOrthogonalCorrectors 1; } SIMPLE -{} +{ +} + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict index 12b021090d..0a46e4d667 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,28 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -set c0; +set c0; coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + tan1 ( 1 0 0 ); + tan2 ( 0 1 0 ); } -directions -( - tan1 - tan2 -); +directions ( tan1 tan2 ); -useHexTopology yes; +useHexTopology yes; -geometricCut no; +geometricCut no; + +writeMesh no; -writeMesh no; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/U b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/U index 367007d0c0..5b7a093a4f 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/U +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/alpha1.org b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/alpha1.org index f0a978580e..355df071cb 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/alpha1.org +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/alpha1.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org index dd6d6631ca..5f5f977f43 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/LESProperties index bb84772ba5..dd76a64b43 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/LESProperties +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/LESProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object LESProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,89 +27,89 @@ laminarCoeffs oneEqEddyCoeffs { - ck 0.07; - ce 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce 1.05; - ck 0.07; - cD2 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce 1.05; - ck 0.09; - cm 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - CDES 0.65; - ck 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -123,6 +124,7 @@ PrandtlCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -130,9 +132,11 @@ PrandtlCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Cdelta 0.158; + + Cdelta 0.158; } vanDriestCoeffs @@ -142,6 +146,7 @@ vanDriestCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -149,10 +154,12 @@ vanDriestCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Aplus 26; - Cdelta 0.158; + + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -162,14 +169,16 @@ smoothCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } -kappa 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E 9; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/environmentalProperties index c65ebf7f14..938322374a 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/environmentalProperties +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict index 56d39f67b2..0231b385df 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary index a6a3281fd7..52529b0c3d 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev-09ca1eb6b56f | +| \\ / O peration | Version: 1.5-09ca1eb6b56f | | \\ / A nd | | | \\/ M anipulation | www.OpenFOAM.org | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/transportProperties index 201e3b4946..67e66cd27d 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/transportProperties +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,32 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phase1 //water +phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-6; - rho rho [1 -3 0 0 0 0 0] 1000; - rho0 rho0 [1 -3 0 0 0 0 0] 1000; - psi psi [0 -2 2 0 0] 1e-5; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 1000; + rho0 rho0 [ 1 -3 0 0 0 0 0 ] 1000; + psi psi [ 0 -2 2 0 0 ] 1e-05; } -phase2 //air +phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.589e-5; - rho rho [1 -3 0 0 0 0 0] 1; - rho0 rho0 [1 -3 0 0 0 0 0] 0; - psi psi [0 -2 2 0 0] 1e-5; + nu nu [ 0 2 -1 0 0 0 0 ] 1.589e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; + rho0 rho0 [ 1 -3 0 0 0 0 0 ] 0; + psi psi [ 0 -2 2 0 0 ] 1e-05; } -pMin pMin [1 -1 -2 0 0 0 0] 1e4; +pMin pMin [ 1 -1 -2 0 0 0 0 ] 10000; + +sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07; -sigma sigma [1 0 -2 0 0 0 0] 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties index d3f32ecb06..a925d3cc2b 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//simulationType laminar; -//simulationType RASModel; -simulationType LESModel; +simulationType LESModel; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/controlDict index 03f0c207d6..53a30129f4 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -23,11 +23,11 @@ stopAt endTime; endTime 0.5; -deltaT 1e-04; +deltaT 0.0001; writeControl adjustableRunTime; -writeInterval 5e-03; +writeInterval 0.005; purgeWrite 0; @@ -49,4 +49,5 @@ maxCo 0.25; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes index ee05b3ed1d..373e1ca67d 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -26,15 +27,11 @@ gradSchemes divSchemes { - div(rho*phi,U) Gauss upwind; //linear; - + div(rho*phi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression 1.0; - - div(phi,pd) Gauss upwind; //vanLeer; //linear; - + div(phirb,alpha) Gauss interfaceCompression 1; + div(phi,pd) Gauss upwind; div(phi,k) Gauss vanLeer; - div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -45,7 +42,7 @@ laplacianSchemes interpolationSchemes { - default linear; + default linear; } snGradSchemes @@ -56,9 +53,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution index 8682524739..3416674d07 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,105 +10,112 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-5; - relTol 0; - - smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 1e-05; + relTol 0; + smoother DICGaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-5; - relTol 0; - maxIter 100; - }; + tolerance 1e-05; + relTol 0; + maxIter 100; + } - rho diagonal - {}; - - pd GAMG + rho { - tolerance 1e-7; - relTol 0.01; - - smoother DIC; //GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; + solver diagonal; + } + pd + { + solver GAMG; + tolerance 1e-07; + relTol 0.01; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-7; - relTol 0; - - nVcycles 2; - - smoother DICGaussSeidel; - nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 1e-07; + relTol 0; + nVcycles 2; + smoother DICGaussSeidel; + nPreSweeps 2; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-7; - relTol 0; - maxIter 20; - }; + tolerance 1e-07; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } - k PBiCG + k { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - B PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + B { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - nuTilda PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + nuTilda { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } } PISO @@ -123,4 +130,5 @@ PISO cAlpha 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict index 510871c44b..d199264332 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,39 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue alpha1 1 - volScalarFieldValue pd 1e5 -); +defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 ); -regions -( - sphereToCell - { - centre (0.5 0.5 0); - radius 0.1; +regions ( sphereToCell { centre ( 0.5 0.5 0 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } ); - fieldValues - ( - volScalarFieldValue alpha1 0 - volScalarFieldValue pd 10e5 - ); - } - - boxToCell - { - box (-10 1 -1) (10 10 1); - - fieldValues - ( - volScalarFieldValue alpha1 0 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/U b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/U index 6840d0129f..06fac63442 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/U +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/alpha1.org b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/alpha1.org index cf3931804f..38175b056a 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/alpha1.org +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/alpha1.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org index 57bee34347..efe6f4ca9c 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/LESProperties index bb84772ba5..dd76a64b43 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/LESProperties +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/LESProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object LESProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,89 +27,89 @@ laminarCoeffs oneEqEddyCoeffs { - ck 0.07; - ce 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce 1.05; - ck 0.07; - cD2 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce 1.05; - ck 0.09; - cm 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - CDES 0.65; - ck 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -123,6 +124,7 @@ PrandtlCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -130,9 +132,11 @@ PrandtlCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Cdelta 0.158; + + Cdelta 0.158; } vanDriestCoeffs @@ -142,6 +146,7 @@ vanDriestCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -149,10 +154,12 @@ vanDriestCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Aplus 26; - Cdelta 0.158; + + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -162,14 +169,16 @@ smoothCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } -kappa 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E 9; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/environmentalProperties index c65ebf7f14..938322374a 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/environmentalProperties +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict index 6a0e1ca9ce..c93921851e 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary index 3517ca55be..f3c84ef8fb 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev-09ca1eb6b56f | +| \\ / O peration | Version: 1.5-09ca1eb6b56f | | \\ / A nd | | | \\/ M anipulation | www.OpenFOAM.org | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/transportProperties index 201e3b4946..67e66cd27d 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/transportProperties +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,32 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phase1 //water +phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-6; - rho rho [1 -3 0 0 0 0 0] 1000; - rho0 rho0 [1 -3 0 0 0 0 0] 1000; - psi psi [0 -2 2 0 0] 1e-5; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 1000; + rho0 rho0 [ 1 -3 0 0 0 0 0 ] 1000; + psi psi [ 0 -2 2 0 0 ] 1e-05; } -phase2 //air +phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.589e-5; - rho rho [1 -3 0 0 0 0 0] 1; - rho0 rho0 [1 -3 0 0 0 0 0] 0; - psi psi [0 -2 2 0 0] 1e-5; + nu nu [ 0 2 -1 0 0 0 0 ] 1.589e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; + rho0 rho0 [ 1 -3 0 0 0 0 0 ] 0; + psi psi [ 0 -2 2 0 0 ] 1e-05; } -pMin pMin [1 -1 -2 0 0 0 0] 1e4; +pMin pMin [ 1 -1 -2 0 0 0 0 ] 10000; + +sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07; -sigma sigma [1 0 -2 0 0 0 0] 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties index fe67e8feca..a925d3cc2b 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//simulationType laminar; -//simulationType RASModel; -simulationType LESModel; +simulationType LESModel; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/controlDict index 03f0c207d6..53a30129f4 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -23,11 +23,11 @@ stopAt endTime; endTime 0.5; -deltaT 1e-04; +deltaT 0.0001; writeControl adjustableRunTime; -writeInterval 5e-03; +writeInterval 0.005; purgeWrite 0; @@ -49,4 +49,5 @@ maxCo 0.25; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/decomposeParDict index fd4a883241..59ad3aca88 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/decomposeParDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,24 +18,23 @@ FoamFile numberOfSubdomains 4; method hierarchical; -//method metis; -//method parMetis; simpleCoeffs { - n (1 4 1); + n ( 1 4 1 ); delta 0.001; } hierarchicalCoeffs { - n (1 4 1); + n ( 1 4 1 ); delta 0.001; order xyz; } metisCoeffs -{} +{ +} manualCoeffs { @@ -43,8 +43,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes index ee05b3ed1d..373e1ca67d 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -26,15 +27,11 @@ gradSchemes divSchemes { - div(rho*phi,U) Gauss upwind; //linear; - + div(rho*phi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss interfaceCompression 1.0; - - div(phi,pd) Gauss upwind; //vanLeer; //linear; - + div(phirb,alpha) Gauss interfaceCompression 1; + div(phi,pd) Gauss upwind; div(phi,k) Gauss vanLeer; - div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -45,7 +42,7 @@ laplacianSchemes interpolationSchemes { - default linear; + default linear; } snGradSchemes @@ -56,9 +53,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution index 8682524739..3416674d07 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,105 +10,112 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-5; - relTol 0; - - smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 1e-05; + relTol 0; + smoother DICGaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-5; - relTol 0; - maxIter 100; - }; + tolerance 1e-05; + relTol 0; + maxIter 100; + } - rho diagonal - {}; - - pd GAMG + rho { - tolerance 1e-7; - relTol 0.01; - - smoother DIC; //GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; + solver diagonal; + } + pd + { + solver GAMG; + tolerance 1e-07; + relTol 0.01; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-7; - relTol 0; - - nVcycles 2; - - smoother DICGaussSeidel; - nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 1e-07; + relTol 0; + nVcycles 2; + smoother DICGaussSeidel; + nPreSweeps 2; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-7; - relTol 0; - maxIter 20; - }; + tolerance 1e-07; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } - k PBiCG + k { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - B PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + B { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - nuTilda PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + nuTilda { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } } PISO @@ -123,4 +130,5 @@ PISO cAlpha 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict index d0e4350372..fb686e791c 100644 --- a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,39 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue alpha1 1 - volScalarFieldValue pd 1e5 -); +defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 ); -regions -( - sphereToCell - { - centre (0.5 0.5 0.5); - radius 0.1; +regions ( sphereToCell { centre ( 0.5 0.5 0.5 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } ); - fieldValues - ( - volScalarFieldValue alpha1 0 - volScalarFieldValue pd 10e5 - ); - } - - boxToCell - { - box (-10 1 -1) (10 10 1); - - fieldValues - ( - volScalarFieldValue alpha1 0 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/U b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/U index be74aea5a1..f37e2e0d0f 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/U +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma index e7dd5fba73..2e2bf16c3c 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org index e7dd5fba73..2e2bf16c3c 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd index bf55dd55f3..f5801776cf 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U index 92dbcc4672..e791ef363f 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma index f933566bb4..7602a0953b 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma.org b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma.org index e7dd5fba73..2e2bf16c3c 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma.org +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/gamma.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd index bf55dd55f3..f5801776cf 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/RASProperties b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/RASProperties index 919d435ff3..035a467881 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/RASProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,16 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// RASModel kEpsilon; -RASModel laminar; +RASModel laminar; -turbulence on; +turbulence on; -printCoeffs off; +printCoeffs off; laminarCoeffs { @@ -27,149 +27,150 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } NonlinearKEShihCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76932; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } LienCubicKECoeffs { - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } QZetaCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LienLeschzinerLowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; + alphaR 1.22; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict index 56b10abaf9..3ff397dfee 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,54 +10,26 @@ FoamFile version 2.0; format ascii; class dictionary; - object motionProperties; + location "constant"; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dynamicFvMesh dynamicRefineFvMesh; +dynamicFvMesh dynamicRefineFvMesh; -// Refinement dynamicRefineFvMeshCoeffs { - // Refine every refineInterval timesteps - refineInterval 1; - - // volScalarField to base refinement on - field gamma; - - // - // 1. interpolate field - // 2. mark any cell - // - using a point value >minLevel refineLevel - // - unrefine pointCells of point value < unrefineLevel and that - // are not within nBufferLayers of points marked for refinement. - - // All cells (neighbouring a cell with) gamma get refined + refineInterval 1; + field gamma; lowerRefineLevel 0.001; upperRefineLevel 0.999; - // All points are candidates for unrefining (gamma always <1) - unrefineLevel 10; - nBufferLayers 1; - - // Maximum refinement level (starts from 0) - maxRefinement 2; - - // Maximum cell limit (approximate) - maxCells 200000; - - // Fluxes to correct and variable they can be interpolated from - correctFluxes ((phi U)); - - // Write cellLevel? - dumpLevel true; + unrefineLevel 10; + nBufferLayers 1; + maxRefinement 2; + maxCells 200000; + correctFluxes ( ( phi U ) ); + dumpLevel true; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties index 40232c0c40..639bd90b06 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 -9.81); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict index 09be8b82ff..b31c669797 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary index 1300f15c76..924d99d937 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0 b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0 index 3ffad18a1e..2f7f7412e5 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0 +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0_old b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0_old index b39c920d13..e28610eeda 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0_old +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0_old @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/transportProperties index 3460aba08f..b8f03496c1 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/transportProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,45 +18,48 @@ FoamFile phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-06; - rho rho [1 -3 0 0 0 0 0] 1000; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 1000; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 0; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 0; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 99.6; - n n [0 0 0 0 0 0 0] 0.1003; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 99.6; + n n [ 0 0 0 0 0 0 0 ] 0.1003; } } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.48e-05; - rho rho [1 -3 0 0 0 0 0] 1; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 0; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 0; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 99.6; - n n [0 0 0 0 0 0 0] 0.1003; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 99.6; + n n [ 0 0 0 0 0 0 0 ] 0.1003; } } -sigma sigma [1 0 -2 0 0 0 0] 0.07; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07; + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/controlDict index f560d7c85b..4790e5fc3f 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/controlDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -25,9 +25,9 @@ endTime 2; deltaT 0.001; -writeControl adjustableRunTime; //timeStep; //adjustableRunTime; +writeControl adjustableRunTime; -writeInterval 0.02; //10; //0.02; +writeInterval 0.02; purgeWrite 0; @@ -49,4 +49,5 @@ maxCo 0.1; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/decomposeParDict index b7f14f7154..d4601d33a2 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/decomposeParDict +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/decomposeParDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,23 +18,23 @@ FoamFile numberOfSubdomains 6; method metis; -//method hierarchical; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; order xyz; } metisCoeffs -{} +{ +} manualCoeffs { @@ -42,8 +43,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes index a03b85207d..f08b9b1ac2 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -28,7 +29,7 @@ gradSchemes divSchemes { - div(rho*phi,U) Gauss upwind; //limitedLinearV 1; + div(rho*phi,U) Gauss upwind; div(phi,gamma) Gauss vanLeer; div(phirb,gamma) Gauss interfaceCompression; } @@ -51,9 +52,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution index ecb3469be2..e33d8a03f0 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,102 +10,107 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-3; - relTol 0; - - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 0.001; + relTol 0; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-4; - relTol 0; - maxIter 100; - }; + tolerance 0.0001; + relTol 0; + maxIter 100; + } - pd GAMG + pd { - tolerance 1e-8; - relTol 0.05; - - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0.05; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-8; - relTol 0; - - nVcycles 2; - - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 1e-08; + relTol 0; + nVcycles 2; + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-8; - relTol 0; - maxIter 20; - }; + tolerance 1e-08; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } - k PBiCG + k { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - B PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + B { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - nuTilda PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + nuTilda { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } } PISO @@ -120,9 +125,10 @@ PISO pdRefValue 0; pRefProbe { - fields (pd); - probeLocations ((0.51 0.51 0.51)); - }; + fields ( pd ); + probeLocations ( ( 0.51 0.51 0.51 ) ); + } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict index 708c1cacd6..892a12e442 100644 --- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,27 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue gamma 0 - volVectorFieldValue U (0 0 0) -); +defaultFieldValues ( volScalarFieldValue gamma 0 volVectorFieldValue U ( 0 0 0 ) ); -regions -( - boxToCell - { - box (0 0 0) (0.60 0.1875 0.75); +regions ( boxToCell { box ( 0 0 0 ) ( 0.6 0.1875 0.75 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } ); - fieldValues - ( - volScalarFieldValue gamma 1 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/U index ae062bdf0d..bf28b4a48e 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/U +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/gamma.org index 2711563003..e7fbe1d082 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/gamma.org +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/gamma.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/pd index cefcbb7d44..020ff7cc00 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/pd +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/pd @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/RASProperties index ac1efb34c5..ac647d4642 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// RASModel kEpsilon; -RASModel laminar; +RASModel laminar; turbulence off; @@ -25,149 +25,150 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } NonlinearKEShihCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76932; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } LienCubicKECoeffs { - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } QZetaCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LienLeschzinerLowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; + alphaR 1.22; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict index e7a0ec06d6..f8a9a9bd8b 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,51 +10,31 @@ FoamFile version 2.0; format ascii; class dictionary; - object motionProperties; + location "constant"; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dynamicFvMesh solidBodyMotionFvMesh; +dynamicFvMesh solidBodyMotionFvMesh; solidBodyMotionFvMeshCoeffs { solidBodyMotionFunction SDA; - SDACoeffs { - // Centre of gravity - CofG (0 0 0); - - // Model scale ratio - lamda 50; - - // Max roll amplitude [rad] - rollAmax 0.22654; - - // Min roll amplitude [rad] - rollAmin 0.10472; - - // Heave amplitude [m] - heaveA 3.79; - - // Sway amplitude [m] - swayA 2.34; - - // Damping Coefficient [-] - Q 2.00; - - // Time Period for liquid [sec] - Tp 13.93; - - // Natural Period of Ship [sec] - Tpn 11.93; - - // Reference time step [sec] - dTi 0.059; - - // Incr. in Tp/unit 'dTi'[-] - dTp -0.001; + CofG ( 0 0 0 ); + lamda 50; + rollAmax 0.22654; + rollAmin 0.10472; + heaveA 3.79; + swayA 2.34; + Q 2; + Tp 13.93; + Tpn 11.93; + dTi 0.059; + dTp -0.001; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/environmentalProperties index 40232c0c40..9fd11e4ef2 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/environmentalProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 -9.81); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict index 3c52247aa2..c7d3ee2dcd 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4 index b6c1cdd4ad..b56cbe4342 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4 +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary index 57267e87f7..53b37c41f6 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/transportProperties index c20854a903..02287f422b 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,17 +18,18 @@ FoamFile phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-6; - rho rho [1 -3 0 0 0 0 0] 998.2; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 998.2; } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.48e-05; - rho rho [1 -3 0 0 0 0 0] 1; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; } -sigma sigma [1 0 -2 0 0 0 0] 0.0; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict index a4d077ea19..f533a54408 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -53,24 +53,15 @@ functions ( probes { - // Type of functionObject type probes; - - // Output every outputControl timeStep; outputInterval 1; - - // Name of the directory for the probe data name probes; - - // Locations to be probed. runTime modifiable! probeLocations ( - (0 9.95 19.77) - (0 -9.95 19.77) + ( 0 9.95 19.77 ) + ( 0 -9.95 19.77 ) ); - - // Fields to be probed. runTime modifiable! fields ( p @@ -79,18 +70,11 @@ functions wallPressure { - // Type of functionObject type surfaces; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libsampling.so"); - - // Output every + functionObjectLibs ( "libsampling.so" ); outputControl timeStep; outputInterval 10; - surfaceFormat raw; - fields ( p @@ -100,12 +84,13 @@ functions ( walls { - type patch; - patchName walls; - triangulate false; + type patch; + patchName walls; + triangulate false; } ); } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/decomposeParDict index d4594e0947..fa967d3199 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/decomposeParDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method hierarchical; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (4 2 2); + n ( 4 2 2 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes index f089e4e5e6..a6a73ef77f 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -51,9 +52,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution index 3aaca52375..a4dc358cda 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,83 +10,83 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-5; - relTol 0; - - smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 1e-05; + relTol 0; + smoother DICGaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-5; - relTol 0; - maxIter 100; - }; + tolerance 1e-05; + relTol 0; + maxIter 100; + } - pd GAMG + pd { - tolerance 1e-8; - relTol 0.01; - - smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0.01; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 2e-9; - relTol 0; - - nVcycles 2; - - smoother DICGaussSeidel; - nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 2e-09; + relTol 0; + nVcycles 2; + smoother DICGaussSeidel; + nPreSweeps 2; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 2e-9; - relTol 0; - maxIter 20; - }; + tolerance 2e-09; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } } PISO @@ -98,26 +98,19 @@ PISO nGammaSubCycles 3; cGamma 1.5; correctPhi no; - pRefProbe { - fields - ( - p - ); - - probeLocations - ( - (0 0 0.15) - ); + fields ( p ); + probeLocations ( ( 0 0 0.15 ) ); } - pRefValue 1e5; + pRefValue 100000; } relaxationFactors { - U 1.0; + U 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict index 2c881a7ba4..7c6f106504 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,26 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue gamma 0 -); +defaultFieldValues ( volScalarFieldValue gamma 0 ); -regions -( - boxToCell - { - box (-100 -100 -100) (100 100 0); +regions ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } ); - fieldValues - ( - volScalarFieldValue gamma 1 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/U index ae062bdf0d..bf28b4a48e 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/U +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/gamma.org index 2711563003..e7fbe1d082 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/gamma.org +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/gamma.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/pd index cefcbb7d44..020ff7cc00 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/pd @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties index ac1efb34c5..ac647d4642 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// RASModel kEpsilon; -RASModel laminar; +RASModel laminar; turbulence off; @@ -25,149 +25,150 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } NonlinearKEShihCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76932; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } LienCubicKECoeffs { - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } QZetaCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LienLeschzinerLowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; + alphaR 1.22; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict index 2b9f0bed11..e9ca15c338 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,51 +10,31 @@ FoamFile version 2.0; format ascii; class dictionary; - object motionProperties; + location "constant"; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dynamicFvMesh solidBodyMotionFvMesh; +dynamicFvMesh solidBodyMotionFvMesh; solidBodyMotionFvMeshCoeffs { solidBodyMotionFunction SDA; - SDACoeffs { - // Centre of gravity - CofG (0 0 0); - - // Model scale ratio - lamda 50; - - // Max roll amplitude [rad] - rollAmax 0.2; - - // Min roll amplitude [rad] - rollAmin 0.1; - - // Heave amplitude [m] - heaveA 4; - - // Sway amplitude [m] - swayA 2.4; - - // Damping Coefficient [-] - Q 2; - - // Time Period for liquid [sec] - Tp 14; - - // Natural Period of Ship [sec] - Tpn 12; - - // Reference time step [sec] - dTi 0.06; - - // Incr. in Tp/unit 'dTi'[-] - dTp -0.001; + CofG ( 0 0 0 ); + lamda 50; + rollAmax 0.2; + rollAmin 0.1; + heaveA 4; + swayA 2.4; + Q 2; + Tp 14; + Tpn 12; + dTi 0.06; + dTp -0.001; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties index 40232c0c40..9fd11e4ef2 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 -9.81); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict index 3c52247aa2..c7d3ee2dcd 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4 index b6c1cdd4ad..b56cbe4342 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4 +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary index 57267e87f7..53b37c41f6 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties index c20854a903..02287f422b 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,17 +18,18 @@ FoamFile phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-6; - rho rho [1 -3 0 0 0 0 0] 998.2; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 998.2; } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.48e-05; - rho rho [1 -3 0 0 0 0 0] 1; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; } -sigma sigma [1 0 -2 0 0 0 0] 0.0; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict index 0bacce4c99..a4e44f2de3 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -53,24 +53,15 @@ functions ( probes { - // Type of functionObject type probes; - - // Output every 10th time step outputControl timeStep; outputInterval 10; - - // Name of the directory for the probe data name probes; - - // Locations to be probed. runTime modifiable! probeLocations ( - (0 9.95 19.77) - (0 -9.95 19.77) + ( 0 9.95 19.77 ) + ( 0 -9.95 19.77 ) ); - - // Fields to be probed. runTime modifiable! fields ( p @@ -79,33 +70,26 @@ functions wallPressure { - // Type of functionObject type surfaces; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libsampling.so"); - - // Output every 10th time step + functionObjectLibs ( "libsampling.so" ); outputControl timeStep; outputInterval 10; - surfaceFormat raw; - fields ( p ); - surfaces ( walls { - type patch; - patchName walls; - triangulate false; + type patch; + patchName walls; + triangulate false; } ); } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict index d4594e0947..fa967d3199 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method hierarchical; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (4 2 2); + n ( 4 2 2 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes index f089e4e5e6..a6a73ef77f 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -51,9 +52,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution index 3aaca52375..a4dc358cda 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,83 +10,83 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-5; - relTol 0; - - smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 1e-05; + relTol 0; + smoother DICGaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-5; - relTol 0; - maxIter 100; - }; + tolerance 1e-05; + relTol 0; + maxIter 100; + } - pd GAMG + pd { - tolerance 1e-8; - relTol 0.01; - - smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0.01; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 2e-9; - relTol 0; - - nVcycles 2; - - smoother DICGaussSeidel; - nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 2e-09; + relTol 0; + nVcycles 2; + smoother DICGaussSeidel; + nPreSweeps 2; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 2e-9; - relTol 0; - maxIter 20; - }; + tolerance 2e-09; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } } PISO @@ -98,26 +98,19 @@ PISO nGammaSubCycles 3; cGamma 1.5; correctPhi no; - pRefProbe { - fields - ( - p - ); - - probeLocations - ( - (0 0 0.15) - ); + fields ( p ); + probeLocations ( ( 0 0 0.15 ) ); } - pRefValue 1e5; + pRefValue 100000; } relaxationFactors { - U 1.0; + U 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict index 2c881a7ba4..7c6f106504 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,26 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue gamma 0 -); +defaultFieldValues ( volScalarFieldValue gamma 0 ); -regions -( - boxToCell - { - box (-100 -100 -100) (100 100 0); +regions ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } ); - fieldValues - ( - volScalarFieldValue gamma 1 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/U index df1f4c5a6c..da644fd824 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/U +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/gamma.org index 85902dcba5..f1c22f9741 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/gamma.org +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/gamma.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/pd index 25379b239c..ac7e49da81 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/pd +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/pd @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/RASProperties index ac1efb34c5..ac647d4642 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// RASModel kEpsilon; -RASModel laminar; +RASModel laminar; turbulence off; @@ -25,149 +25,150 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } NonlinearKEShihCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76932; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } LienCubicKECoeffs { - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } QZetaCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LienLeschzinerLowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; + alphaR 1.22; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict index e7a0ec06d6..f8a9a9bd8b 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,51 +10,31 @@ FoamFile version 2.0; format ascii; class dictionary; - object motionProperties; + location "constant"; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dynamicFvMesh solidBodyMotionFvMesh; +dynamicFvMesh solidBodyMotionFvMesh; solidBodyMotionFvMeshCoeffs { solidBodyMotionFunction SDA; - SDACoeffs { - // Centre of gravity - CofG (0 0 0); - - // Model scale ratio - lamda 50; - - // Max roll amplitude [rad] - rollAmax 0.22654; - - // Min roll amplitude [rad] - rollAmin 0.10472; - - // Heave amplitude [m] - heaveA 3.79; - - // Sway amplitude [m] - swayA 2.34; - - // Damping Coefficient [-] - Q 2.00; - - // Time Period for liquid [sec] - Tp 13.93; - - // Natural Period of Ship [sec] - Tpn 11.93; - - // Reference time step [sec] - dTi 0.059; - - // Incr. in Tp/unit 'dTi'[-] - dTp -0.001; + CofG ( 0 0 0 ); + lamda 50; + rollAmax 0.22654; + rollAmin 0.10472; + heaveA 3.79; + swayA 2.34; + Q 2; + Tp 13.93; + Tpn 11.93; + dTi 0.059; + dTp -0.001; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/environmentalProperties index 40232c0c40..9fd11e4ef2 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/environmentalProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 -9.81); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict index 0d21d11148..98820d1a00 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4 index f97859e6bf..4d323b9c97 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4 +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary index 28068f37d4..31c74e19c2 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/transportProperties index c20854a903..02287f422b 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,17 +18,18 @@ FoamFile phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-6; - rho rho [1 -3 0 0 0 0 0] 998.2; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 998.2; } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.48e-05; - rho rho [1 -3 0 0 0 0 0] 1; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; } -sigma sigma [1 0 -2 0 0 0 0] 0.0; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict index 959e229e95..1b122632d3 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -53,61 +53,21 @@ functions ( probes { - // Type of functionObject type probes; - - // Output every outputControl timeStep; outputInterval 1; - - // Name of the directory for the probe data name probes; - - // Locations to be probed. runTime modifiable! probeLocations ( - (0 9.95 19.77) - (0 -9.95 19.77) + ( 0 9.95 19.77 ) + ( 0 -9.95 19.77 ) ); - - // Fields to be probed. runTime modifiable! fields ( p ); } - - /* - wallPressure - { - // Type of functionObject - type surfaces; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libsampling.so"); - - // Output every 10th time step - outputControl timeStep; - outputInterval 10; - - surfaceFormat raw; - - fields - ( - p - ); - - surfaces - ( - walls - { - type patch; - patchName walls; - triangulate false; - } - ); - } - */ ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/decomposeParDict index d4594e0947..fa967d3199 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/decomposeParDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method hierarchical; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (4 2 2); + n ( 4 2 2 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes index f089e4e5e6..a6a73ef77f 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -51,9 +52,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution index 3aaca52375..a4dc358cda 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,83 +10,83 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-5; - relTol 0; - - smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 1e-05; + relTol 0; + smoother DICGaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-5; - relTol 0; - maxIter 100; - }; + tolerance 1e-05; + relTol 0; + maxIter 100; + } - pd GAMG + pd { - tolerance 1e-8; - relTol 0.01; - - smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0.01; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 2e-9; - relTol 0; - - nVcycles 2; - - smoother DICGaussSeidel; - nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 2e-09; + relTol 0; + nVcycles 2; + smoother DICGaussSeidel; + nPreSweeps 2; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 2e-9; - relTol 0; - maxIter 20; - }; + tolerance 2e-09; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } } PISO @@ -98,26 +98,19 @@ PISO nGammaSubCycles 3; cGamma 1.5; correctPhi no; - pRefProbe { - fields - ( - p - ); - - probeLocations - ( - (0 0 0.15) - ); + fields ( p ); + probeLocations ( ( 0 0 0.15 ) ); } - pRefValue 1e5; + pRefValue 100000; } relaxationFactors { - U 1.0; + U 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict index 2c881a7ba4..7c6f106504 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,26 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue gamma 0 -); +defaultFieldValues ( volScalarFieldValue gamma 0 ); -regions -( - boxToCell - { - box (-100 -100 -100) (100 100 0); +regions ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } ); - fieldValues - ( - volScalarFieldValue gamma 1 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/U index df1f4c5a6c..da644fd824 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/U +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/gamma.org index 85902dcba5..f1c22f9741 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/gamma.org +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/gamma.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/pd index 25379b239c..ac7e49da81 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/pd @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties index ac1efb34c5..ac647d4642 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// RASModel kEpsilon; -RASModel laminar; +RASModel laminar; turbulence off; @@ -25,149 +25,150 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } NonlinearKEShihCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76932; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } LienCubicKECoeffs { - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } QZetaCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LienLeschzinerLowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; + alphaR 1.22; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict index 2b9f0bed11..e9ca15c338 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,51 +10,31 @@ FoamFile version 2.0; format ascii; class dictionary; - object motionProperties; + location "constant"; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dynamicFvMesh solidBodyMotionFvMesh; +dynamicFvMesh solidBodyMotionFvMesh; solidBodyMotionFvMeshCoeffs { solidBodyMotionFunction SDA; - SDACoeffs { - // Centre of gravity - CofG (0 0 0); - - // Model scale ratio - lamda 50; - - // Max roll amplitude [rad] - rollAmax 0.2; - - // Min roll amplitude [rad] - rollAmin 0.1; - - // Heave amplitude [m] - heaveA 4; - - // Sway amplitude [m] - swayA 2.4; - - // Damping Coefficient [-] - Q 2; - - // Time Period for liquid [sec] - Tp 14; - - // Natural Period of Ship [sec] - Tpn 12; - - // Reference time step [sec] - dTi 0.06; - - // Incr. in Tp/unit 'dTi'[-] - dTp -0.001; + CofG ( 0 0 0 ); + lamda 50; + rollAmax 0.2; + rollAmin 0.1; + heaveA 4; + swayA 2.4; + Q 2; + Tp 14; + Tpn 12; + dTi 0.06; + dTp -0.001; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties index 40232c0c40..9fd11e4ef2 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 -9.81); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict index 0d21d11148..98820d1a00 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4 index f97859e6bf..4d323b9c97 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4 +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary index 28068f37d4..31c74e19c2 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties index c20854a903..02287f422b 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,17 +18,18 @@ FoamFile phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-6; - rho rho [1 -3 0 0 0 0 0] 998.2; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 998.2; } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.48e-05; - rho rho [1 -3 0 0 0 0 0] 1; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; } -sigma sigma [1 0 -2 0 0 0 0] 0.0; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict index 959e229e95..1b122632d3 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -53,61 +53,21 @@ functions ( probes { - // Type of functionObject type probes; - - // Output every outputControl timeStep; outputInterval 1; - - // Name of the directory for the probe data name probes; - - // Locations to be probed. runTime modifiable! probeLocations ( - (0 9.95 19.77) - (0 -9.95 19.77) + ( 0 9.95 19.77 ) + ( 0 -9.95 19.77 ) ); - - // Fields to be probed. runTime modifiable! fields ( p ); } - - /* - wallPressure - { - // Type of functionObject - type surfaces; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libsampling.so"); - - // Output every 10th time step - outputControl timeStep; - outputInterval 10; - - surfaceFormat raw; - - fields - ( - p - ); - - surfaces - ( - walls - { - type patch; - patchName walls; - triangulate false; - } - ); - } - */ ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict index d4594e0947..fa967d3199 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method hierarchical; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (4 2 2); + n ( 4 2 2 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes index f089e4e5e6..a6a73ef77f 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -51,9 +52,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution index 3aaca52375..a4dc358cda 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,83 +10,83 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-5; - relTol 0; - - smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 1e-05; + relTol 0; + smoother DICGaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-5; - relTol 0; - maxIter 100; - }; + tolerance 1e-05; + relTol 0; + maxIter 100; + } - pd GAMG + pd { - tolerance 1e-8; - relTol 0.01; - - smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0.01; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 2e-9; - relTol 0; - - nVcycles 2; - - smoother DICGaussSeidel; - nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 2e-09; + relTol 0; + nVcycles 2; + smoother DICGaussSeidel; + nPreSweeps 2; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 2e-9; - relTol 0; - maxIter 20; - }; + tolerance 2e-09; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } } PISO @@ -98,26 +98,19 @@ PISO nGammaSubCycles 3; cGamma 1.5; correctPhi no; - pRefProbe { - fields - ( - p - ); - - probeLocations - ( - (0 0 0.15) - ); + fields ( p ); + probeLocations ( ( 0 0 0.15 ) ); } - pRefValue 1e5; + pRefValue 100000; } relaxationFactors { - U 1.0; + U 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict index 2c881a7ba4..7c6f106504 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,26 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue gamma 0 -); +defaultFieldValues ( volScalarFieldValue gamma 0 ); -regions -( - boxToCell - { - box (-100 -100 -100) (100 100 0); +regions ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } ); - fieldValues - ( - volScalarFieldValue gamma 1 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/U index df1f4c5a6c..da644fd824 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/U +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/gamma.org index 85902dcba5..f1c22f9741 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/gamma.org +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/gamma.org @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/pd index 25379b239c..ac7e49da81 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/pd @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties index ac1efb34c5..ac647d4642 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,12 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// RASModel kEpsilon; -RASModel laminar; +RASModel laminar; turbulence off; @@ -25,149 +25,150 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } NonlinearKEShihCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76932; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } LienCubicKECoeffs { - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } QZetaCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LienLeschzinerLowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; + alphaR 1.22; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict index 639bcd053b..caba842ea5 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,24 +10,22 @@ FoamFile version 2.0; format ascii; class dictionary; - object motionProperties; + location "constant"; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dynamicFvMesh solidBodyMotionFvMesh; +dynamicFvMesh solidBodyMotionFvMesh; solidBodyMotionFvMeshCoeffs { solidBodyMotionFunction SKA; - SKACoeffs { - // Centre of gravity - CofG (0 0 0); - - // Time data file name + CofG ( 0 0 0 ); timeDataFileName "constant/6DoF.dat"; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties index 40232c0c40..9fd11e4ef2 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 -9.81); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict index 0d21d11148..98820d1a00 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4 index f97859e6bf..4d323b9c97 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4 +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary index 28068f37d4..31c74e19c2 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties index c20854a903..02287f422b 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,17 +18,18 @@ FoamFile phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-6; - rho rho [1 -3 0 0 0 0 0] 998.2; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 998.2; } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.48e-05; - rho rho [1 -3 0 0 0 0 0] 1; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; } -sigma sigma [1 0 -2 0 0 0 0] 0.0; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict index 959e229e95..1b122632d3 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -53,61 +53,21 @@ functions ( probes { - // Type of functionObject type probes; - - // Output every outputControl timeStep; outputInterval 1; - - // Name of the directory for the probe data name probes; - - // Locations to be probed. runTime modifiable! probeLocations ( - (0 9.95 19.77) - (0 -9.95 19.77) + ( 0 9.95 19.77 ) + ( 0 -9.95 19.77 ) ); - - // Fields to be probed. runTime modifiable! fields ( p ); } - - /* - wallPressure - { - // Type of functionObject - type surfaces; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libsampling.so"); - - // Output every 10th time step - outputControl timeStep; - outputInterval 10; - - surfaceFormat raw; - - fields - ( - p - ); - - surfaces - ( - walls - { - type patch; - patchName walls; - triangulate false; - } - ); - } - */ ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict index d4594e0947..fa967d3199 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method hierarchical; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (4 2 2); + n ( 4 2 2 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes index f089e4e5e6..a6a73ef77f 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -51,9 +52,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution index 3aaca52375..a4dc358cda 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,83 +10,83 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-5; - relTol 0; - - smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 1e-05; + relTol 0; + smoother DICGaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-5; - relTol 0; - maxIter 100; - }; + tolerance 1e-05; + relTol 0; + maxIter 100; + } - pd GAMG + pd { - tolerance 1e-8; - relTol 0.01; - - smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0.01; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 2e-9; - relTol 0; - - nVcycles 2; - - smoother DICGaussSeidel; - nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 2e-09; + relTol 0; + nVcycles 2; + smoother DICGaussSeidel; + nPreSweeps 2; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 2e-9; - relTol 0; - maxIter 20; - }; + tolerance 2e-09; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } } PISO @@ -98,26 +98,19 @@ PISO nGammaSubCycles 3; cGamma 1.5; correctPhi no; - pRefProbe { - fields - ( - p - ); - - probeLocations - ( - (0 0 0.15) - ); + fields ( p ); + probeLocations ( ( 0 0 0.15 ) ); } - pRefValue 1e5; + pRefValue 100000; } relaxationFactors { - U 1.0; + U 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict index 2c881a7ba4..7c6f106504 100644 --- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,26 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue gamma 0 -); +defaultFieldValues ( volScalarFieldValue gamma 0 ); -regions -( - boxToCell - { - box (-100 -100 -100) (100 100 0); +regions ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } ); - fieldValues - ( - volScalarFieldValue gamma 1 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/U b/tutorials/multiphase/interFoam/laminar/damBreak/0/U index 9dcf5eae9a..dca001ffb0 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/0/U +++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict index c87164cda2..cea5c19ae6 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; - object motionProperties; + location "constant"; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dynamicFvMesh staticFvMesh; +dynamicFvMesh staticFvMesh; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties index 03e0adce89..a866ff549f 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties +++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary index eb22ec5273..3a6342293a 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary +++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties index 117a1c9169..b8f03496c1 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,45 +18,48 @@ FoamFile phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-06; - rho rho [1 -3 0 0 0 0 0] 1000; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 1000; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 0; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 0; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 99.6; - n n [0 0 0 0 0 0 0] 0.1003; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 99.6; + n n [ 0 0 0 0 0 0 0 ] 0.1003; } } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.48e-05; - rho rho [1 -3 0 0 0 0 0] 1; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 0; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 0; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 99.6; - n n [0 0 0 0 0 0 0] 0.1003; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 99.6; + n n [ 0 0 0 0 0 0 0 ] 0.1003; } } -sigma sigma [1 0 -2 0 0 0 0] 0.07; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties index 0efb448180..886d34bdef 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict index 8415c7bc84..5546d05292 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -49,4 +49,5 @@ maxCo 0.5; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict index cf0067afd3..bf8dffb737 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method simple; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (1 1 1); + n ( 1 1 1 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes index 6b8e4385b4..d242b76b75 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -51,9 +52,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - alpha1; + pd ; + pcorr ; + alpha1 ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution index 57f8292777..b1b00223fc 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,36 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner DIC; - tolerance 1e-10; - relTol 0; - }; - pd PCG + solver PCG; + preconditioner DIC; + tolerance 1e-10; + relTol 0; + } + + pd { - preconditioner DIC; - tolerance 1e-7; - relTol 0.05; - }; - pdFinal PCG + solver PCG; + preconditioner DIC; + tolerance 1e-07; + relTol 0.05; + } + + pdFinal { - preconditioner DIC; - tolerance 1e-7; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-07; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } } PISO @@ -52,4 +60,5 @@ PISO cAlpha 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict index 8e031272ac..21e4416d79 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,27 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue alpha1 0 - volVectorFieldValue U (0 0 0) -); +defaultFieldValues ( volScalarFieldValue alpha1 0 volVectorFieldValue U ( 0 0 0 ) ); -regions -( - boxToCell - { - box (0 0 -1) (0.1461 0.292 1); +regions ( boxToCell { box ( 0 0 -1 ) ( 0.1461 0.292 1 ) ; fieldValues ( volScalarFieldValue alpha1 1 ) ; } ); - fieldValues - ( - volScalarFieldValue alpha1 1 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties index 568799d223..1d34e2477f 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,17 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object LESProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -LESModel oneEqEddy; +LESModel oneEqEddy; -turbulence on; +turbulence on; -delta smooth; +delta smooth; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -28,90 +29,90 @@ laminarCoeffs oneEqEddyCoeffs { - ck 0.07; - ce 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce 1.05; - ck 0.07; - cD2 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce 1.05; - ck 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce 1.05; - ck 0.09; - cm 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; - CDES 0.65; - ck 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -126,6 +127,7 @@ PrandtlCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -133,9 +135,11 @@ PrandtlCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Cdelta 0.158; + + Cdelta 0.158; } vanDriestCoeffs @@ -145,6 +149,7 @@ vanDriestCoeffs { deltaCoeff 1; } + smoothCoeffs { delta cubeRootVol; @@ -152,10 +157,12 @@ vanDriestCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } - Aplus 26; - Cdelta 0.158; + + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -165,14 +172,16 @@ smoothCoeffs { deltaCoeff 1; } + maxDeltaRatio 1.1; } -kappa 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E 9; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties index ca80af21ee..645c9af099 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 0 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0 index e2320b01cf..04d478574a 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0 +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old index 250a0c6d53..5fbe1c4c4b 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells index 383d411db8..276e2ccb5f 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties index ef321fd883..295d67f644 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,45 +25,48 @@ twoPhase phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 5.952e-06; - rho rho [1 -3 0 0 0 0 0] 840; + nu nu [ 0 2 -1 0 0 0 0 ] 5.952e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 840; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 0; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 0; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 99.6; - n n [0 0 0 0 0 0 0] 0.1003; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 99.6; + n n [ 0 0 0 0 0 0 0 ] 0.1003; } } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 8.5e-07; - rho rho [1 -3 0 0 0 0 0] 20; + nu nu [ 0 2 -1 0 0 0 0 ] 8.5e-07; + rho rho [ 1 -3 0 0 0 0 0 ] 20; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 0; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 0; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 99.6; - n n [0 0 0 0 0 0 0] 0.1003; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 99.6; + n n [ 0 0 0 0 0 0 0 ] 0.1003; } } -sigma sigma [1 0 -2 0 0 0 0] 0.0261; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0.0261; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties index dcadcf17cd..2e42797ca9 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType LESModel; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict index d56de07c7f..cc4838bb42 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object cellSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 ) ; } ); -topoSetSources -( - boxToCell - { - box (0 0 -20e-06) (3600e-6 300e-06 20e-06); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1 index ae151cca9d..b2294190d0 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1 +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1 @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0008 4e-05 ) ; } ); -topoSetSources -( - boxToCell - { - box (0 0 -20e-06) (3600e-6 800e-06 40e-06); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2 index d56de07c7f..e5e1a3c5c9 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2 +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2 @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,20 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; - object cellSetDict; + location "system"; + object cellSetDict.2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -name c0; +name c0; -action new; +action new; + +topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 ) ; } ); -topoSetSources -( - boxToCell - { - box (0 0 -20e-06) (3600e-6 300e-06 20e-06); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict index e7a4ac1b84..58243b4b8d 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -49,4 +49,5 @@ maxCo 0.5; maxDeltaT 1e-08; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes index 2d28e02de0..2a273c5e51 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -55,9 +56,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - alpha1; + pd ; + pcorr ; + alpha1 ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution index 8d5181515e..660482ad37 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,102 +10,107 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-5; - relTol 0; - - smoother DICGaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nBottomSweeps 2; - + preconditioner GAMG; + tolerance 1e-05; + relTol 0; + smoother DICGaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; cacheAgglomeration false; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-5; - relTol 0; - maxIter 100; - }; + tolerance 1e-05; + relTol 0; + maxIter 100; + } - pd GAMG + pd { - tolerance 1e-7; - relTol 0.01; - - smoother DIC; //GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-07; + relTol 0.01; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - pdFinal PCG + pdFinal { - preconditioner GAMG + solver PCG; + preconditioner { - tolerance 1e-7; - relTol 0; - - nVcycles 2; - - smoother DICGaussSeidel; - nPreSweeps 2; - nPostSweeps 2; - nFinestSweeps 2; - + preconditioner GAMG; + tolerance 1e-07; + relTol 0; + nVcycles 2; + smoother DICGaussSeidel; + nPreSweeps 2; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } - tolerance 1e-7; - relTol 0; - maxIter 20; - }; + tolerance 1e-07; + relTol 0; + maxIter 20; + } - U smoothSolver + U { - smoother GaussSeidel; - tolerance 1e-6; - relTol 0; - nSweeps 1; - }; + solver smoothSolver; + smoother GaussSeidel; + tolerance 1e-06; + relTol 0; + nSweeps 1; + } - k PBiCG + k { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - B PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + B { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - nuTilda PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + nuTilda { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } } PISO @@ -118,4 +123,5 @@ PISO cAlpha 2; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict index 170cf1ffab..d4922505f7 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,35 +10,34 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -set c0; +set c0; coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + tan1 ( 1 0 0 ); + tan2 ( 0 1 0 ); } patchLocalCoeffs { - patch outside; - tan1 (1 0 0); + patch outside; + tan1 ( 1 0 0 ); } -directions -( - tan1 -); +directions ( tan1 ); -useHexTopology no; +useHexTopology no; -geometricCut yes; +geometricCut yes; + +writeMesh no; -writeMesh no; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties index 8bf244a605..ce5406cd7a 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties +++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,158 +27,159 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } realizableKECoeffs { - Cmu 0.09; - A0 4.0; - C2 1.9; - alphak 1; - alphaEps 0.833333; + Cmu 0.09; + A0 4; + C2 1.9; + alphak 1; + alphaEps 0.833333; } NonlinearKEShihCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76932; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } LienCubicKECoeffs { - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; } QZetaCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + A1 1.25; + A2 1000; + Ctau1 -4; + Ctau2 13; + Ctau3 -2; + alphaKsi 0.9; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LienLeschzinerLowReCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; + Am 0.016; + Aepsilon 0.263; + Amu 0.00222; } LRRCoeffs { - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; } LaunderGibsonRSTMCoeffs { - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaEps 0.76923; + alphaR 1.22; } SpalartAllmarasCoeffs { - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties index 03e0adce89..a866ff549f 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties +++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties index f2b23a57f1..79161dad1b 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties +++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,45 +25,48 @@ twoPhase phase1 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1e-06; - rho rho [1 -3 0 0 0 0 0] 1000; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 1000; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 0; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 0; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 99.6; - n n [0 0 0 0 0 0 0] 0.1003; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 99.6; + n n [ 0 0 0 0 0 0 0 ] 0.1003; } } phase2 { transportModel Newtonian; - nu nu [0 2 -1 0 0 0 0] 1.48e-05; - rho rho [1 -3 0 0 0 0 0] 1; + nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; CrossPowerLawCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 1e-06; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - m m [0 0 1 0 0 0 0] 1; - n n [0 0 0 0 0 0 0] 0; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 0; } + BirdCarreauCoeffs { - nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515; - nuInf nuInf [0 2 -1 0 0 0 0] 1e-06; - k k [0 0 1 0 0 0 0] 99.6; - n n [0 0 0 0 0 0 0] 0.1003; + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 99.6; + n n [ 0 0 0 0 0 0 0 ] 0.1003; } } -sigma sigma [1 0 -2 0 0 0 0] 0.07; +sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties index 07f85c68df..b70f6702e4 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType RASModel; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict index 92227befc1..e2b799e52f 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -49,4 +49,5 @@ maxCo 0.2; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict index cf0067afd3..bf8dffb737 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,26 +21,20 @@ method simple; simpleCoeffs { - n (2 2 1); + n ( 2 2 1 ); delta 0.001; } hierarchicalCoeffs { - n (1 1 1); + n ( 1 1 1 ); delta 0.001; order xyz; } metisCoeffs { - processorWeights - ( - 1 - 1 - 1 - 1 - ); + processorWeights ( 1 1 1 1 ); } manualCoeffs @@ -49,8 +44,7 @@ manualCoeffs distributed no; -roots -( -); +roots ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes index fd4e9a3519..499ad01e5c 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -34,7 +35,6 @@ divSchemes div(phi,R) Gauss upwind; div(R) Gauss linear; div(phi,nuTilda) Gauss upwind; - div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -57,9 +57,10 @@ snGradSchemes fluxRequired { default no; - pd; - pcorr; - gamma; + pd ; + pcorr ; + gamma ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution index edb52854d0..ea7bd97c27 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,60 +10,76 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - pcorr PCG + pcorr { - preconditioner DIC; - tolerance 1e-10; - relTol 0; - }; - pd PCG + solver PCG; + preconditioner DIC; + tolerance 1e-10; + relTol 0; + } + + pd { - preconditioner DIC; - tolerance 1e-7; - relTol 0.05; - }; - pdFinal PCG + solver PCG; + preconditioner DIC; + tolerance 1e-07; + relTol 0.05; + } + + pdFinal { - preconditioner DIC; - tolerance 1e-7; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-07; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-06; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - R PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + R { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; - nuTilda PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } + + nuTilda { - preconditioner DILU; - tolerance 1e-08; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-08; + relTol 0; + } } PISO @@ -76,4 +92,5 @@ PISO cGamma 2; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict index e7666438bb..bafb3a32c0 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,27 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue gamma 0 - volVectorFieldValue U (0 0 0) -); +defaultFieldValues ( volScalarFieldValue gamma 0 volVectorFieldValue U ( 0 0 0 ) ); -regions -( - boxToCell - { - box (0 0 -1) (0.1461 0.292 1); +regions ( boxToCell { box ( 0 0 -1 ) ( 0.1461 0.292 1 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } ); - fieldValues - ( - volScalarFieldValue gamma 1 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/dahl/constant/RASProperties b/tutorials/multiphase/settlingFoam/dahl/constant/RASProperties index 808b6f2aea..7d55e238e4 100644 --- a/tutorials/multiphase/settlingFoam/dahl/constant/RASProperties +++ b/tutorials/multiphase/settlingFoam/dahl/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,18 +27,19 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphak 1; + alphaEps 0.76923; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/dahl/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/dahl/constant/environmentalProperties index 03e0adce89..a866ff549f 100644 --- a/tutorials/multiphase/settlingFoam/dahl/constant/environmentalProperties +++ b/tutorials/multiphase/settlingFoam/dahl/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/dahl/constant/transportProperties b/tutorials/multiphase/settlingFoam/dahl/constant/transportProperties index 9614962b90..db12081a21 100644 --- a/tutorials/multiphase/settlingFoam/dahl/constant/transportProperties +++ b/tutorials/multiphase/settlingFoam/dahl/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,44 +10,46 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -muc muc [1 -1 -1 0 0 0 0] 0.00178; +muc muc [ 1 -1 -1 0 0 0 0 ] 0.00178; -plasticViscosityCoeff plasticViscosityCoeff [1 -1 -1 0 0 0 0] 0.00023143; +plasticViscosityCoeff plasticViscosityCoeff [ 1 -1 -1 0 0 0 0 ] 0.00023143; -plasticViscosityExponent plasticViscosityExponent [0 0 0 0 0 0 0] 179.26; +plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 179.26; BinghamPlastic on; -yieldStressCoeff yieldStressCoeff [1 -1 -2 0 0 0 0] 0.00042189; +yieldStressCoeff yieldStressCoeff [ 1 -1 -2 0 0 0 0 ] 0.00042189; -yieldStressExponent yieldStressExponent [0 0 0 0 0 0 0] 1050.8; +yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 1050.8; -yieldStressOffset yieldStressOffset [0 0 0 0 0 0 0] 0; +yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0; -rhoc rhoc [1 -3 0 0 0 0 0] 996; +rhoc rhoc [ 1 -3 0 0 0 0 0 ] 996; -rhod rhod [1 -3 0 0 0 0 0] 1996; +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; + 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; + 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/tutorials/multiphase/settlingFoam/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/dahl/system/controlDict index 7b2093120b..e4ca7a8049 100644 --- a/tutorials/multiphase/settlingFoam/dahl/system/controlDict +++ b/tutorials/multiphase/settlingFoam/dahl/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes b/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes index 0eb0bf6bad..bf1fbc9a82 100644 --- a/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes +++ b/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -57,7 +58,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/dahl/system/fvSolution b/tutorials/multiphase/settlingFoam/dahl/system/fvSolution index 994dcde6c9..04bab7f93f 100644 --- a/tutorials/multiphase/settlingFoam/dahl/system/fvSolution +++ b/tutorials/multiphase/settlingFoam/dahl/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,48 +10,60 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-07; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-07; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; - rho PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } + + rho { - preconditioner DIC; - tolerance 1e-07; - relTol 0; - }; - Alpha PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-07; + relTol 0; + } + + Alpha { - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } } PISO @@ -60,4 +72,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/RASProperties b/tutorials/multiphase/settlingFoam/tank3D/constant/RASProperties index 808b6f2aea..a19f0292e2 100644 --- a/tutorials/multiphase/settlingFoam/tank3D/constant/RASProperties +++ b/tutorials/multiphase/settlingFoam/tank3D/constant/RASProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,15 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence on; +turbulence on; -printCoeffs on; +printCoeffs on; laminarCoeffs { @@ -26,18 +27,19 @@ laminarCoeffs kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphak 1; + alphaEps 0.76923; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/tank3D/constant/environmentalProperties index 03e0adce89..938322374a 100644 --- a/tutorials/multiphase/settlingFoam/tank3D/constant/environmentalProperties +++ b/tutorials/multiphase/settlingFoam/tank3D/constant/environmentalProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/transportProperties b/tutorials/multiphase/settlingFoam/tank3D/constant/transportProperties index 1d92419af4..559067579f 100644 --- a/tutorials/multiphase/settlingFoam/tank3D/constant/transportProperties +++ b/tutorials/multiphase/settlingFoam/tank3D/constant/transportProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,44 +10,46 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -muc muc [1 -1 -1 0 0 0 0] 0.00178; +muc muc [ 1 -1 -1 0 0 0 0 ] 0.00178; -plasticViscosityCoeff plasticViscosityCoeff [1 -1 -1 0 0 0 0] 0.00023143; +plasticViscosityCoeff plasticViscosityCoeff [ 1 -1 -1 0 0 0 0 ] 0.00023143; -plasticViscosityExponent plasticViscosityExponent [0 0 0 0 0 0 0] 0.17926; +plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 0.17926; BinghamPlastic on; -yieldStressCoeff yieldStressCoeff [1 -1 -2 0 0 0 0] 5.5469e-07; +yieldStressCoeff yieldStressCoeff [ 1 -1 -2 0 0 0 0 ] 5.5469e-07; -yieldStressExponent yieldStressExponent [0 0 0 0 0 0 0] 95.25; +yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 95.25; -yieldStressOffset yieldStressOffset [0 0 0 0 0 0 0] 0; +yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0; -rhoc rhoc [1 -3 0 0 0 0 0] 1000; +rhoc rhoc [ 1 -3 0 0 0 0 0 ] 1000; -rhod rhod [1 -3 0 0 0 0 0] 1042; +rhod rhod [ 1 -3 0 0 0 0 0 ] 1042; 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] 8.84; - a1 a1 [0 0 0 0 0 0 0] 0; - alphaMin alphaMin [0 0 0 0 0 0 0] 0; + V0 V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 ); + a a [ 0 0 0 0 0 0 0 ] 8.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; + 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/tutorials/multiphase/settlingFoam/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/tank3D/system/controlDict index f7c7ecd1d6..1adf79151c 100644 --- a/tutorials/multiphase/settlingFoam/tank3D/system/controlDict +++ b/tutorials/multiphase/settlingFoam/tank3D/system/controlDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,4 +43,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes b/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes index 0eb0bf6bad..5b0849d52b 100644 --- a/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes +++ b/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -57,7 +58,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution index 994dcde6c9..8c14a9fae9 100644 --- a/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution +++ b/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,48 +10,60 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p PCG + p { - preconditioner DIC; - tolerance 1e-07; - relTol 0; - }; - U PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-07; + relTol 0; + } + + U { - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; - rho PCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } + + rho { - preconditioner DIC; - tolerance 1e-07; - relTol 0; - }; - Alpha PBiCG + solver PCG; + preconditioner DIC; + tolerance 1e-07; + relTol 0; + } + + Alpha { - preconditioner DILU; - tolerance 1e-07; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-07; + relTol 0; + } } PISO @@ -60,4 +72,5 @@ PISO nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties index 9a6e83d8de..5306594565 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties @@ -2,45 +2,38 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Switch turbulence model on or off +turbulence on; -turbulence on; - -printCoeffs on; - -// Standard k-epsilon model coefficients -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +printCoeffs on; kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.375; - - alphak 1.0; - alphaEps 0.82142; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.375; + alphak 1; + alphaEps 0.82142; } -// Wall function coefficients -// ~~~~~~~~~~~~~~~~~~~~~~~~~~ - wallFunctionCoeffs { - kappa 0.4187; - E 9.0; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties index bf423d1c51..d1abb1921f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties @@ -2,18 +2,20 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0] (0 0 -9.81); +g g [ 0 1 -2 0 0 ] ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties index 79c0a96d71..2c236c7d44 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties @@ -2,25 +2,26 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object filterProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -filter off; +filter off; -// filterNormal has to be in the direction of trapped particles -filterNormal (0 0 1); +filterNormal ( 0 0 1 ); -filterPosition filterPosition [0 1 0 0 0] (0 0 0.02); +filterPosition filterPosition [ 0 1 0 0 0 ] ( 0 0 0.02 ); + +filterThickness filterThickness [ 0 1 0 0 0 ] 1e-06; -filterThickness filterThickness [0 1 0 0 0] 1.0e-6; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties index c7f7b93365..800dbd9adc 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties @@ -2,21 +2,24 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object interfacialProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dragModela GidaspowSchillerNaumann; -dragModelb GidaspowSchillerNaumann; +dragModela GidaspowSchillerNaumann; + +dragModelb GidaspowSchillerNaumann; + +dragPhase a; -dragPhase a; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties index 5477398396..ba6ef530f1 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties @@ -2,49 +2,51 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object kineticTheoryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -kineticTheory off; +kineticTheory off; -equilibrium on; +equilibrium on; -e e [ 0 0 0 0 0 0 0 ] 0.9 ; +e e [ 0 0 0 0 0 0 0 ] 0.9; -alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6 ; +alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6; -alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5 ; +alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5; -Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05 ; +Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05; -eta eta [ 0 0 0 0 0 0 0 ] 2.0 ; +eta eta [ 0 0 0 0 0 0 0 ] 2; -p p [ 0 0 0 0 0 0 0 ] 5.0 ; +p p [ 0 0 0 0 0 0 0 ] 5; -phi phi [ 0 0 0 0 0 0 0 ] 25.0 ; +phi phi [ 0 0 0 0 0 0 0 ] 25; -viscosityModel Syamlal; +viscosityModel Syamlal; -conductivityModel HrenyaSinclair; +conductivityModel HrenyaSinclair; -granularPressureModel Lun; +granularPressureModel Lun; -frictionalStressModel JohnsonJackson; +frictionalStressModel JohnsonJackson; -radialModel Gidaspow; +radialModel Gidaspow; HrenyaSinclairCoeffs { - L L [ 0 1 0 0 0 0 0 ] 5.0e-4 ; + L L [ 0 1 0 0 0 0 0 ] 0.0005; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties index 67edcc1047..73ff7f8d09 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties @@ -2,26 +2,28 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object ppProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -preAlphaExp 500; +preAlphaExp 500; -expMax 1.0e+3; +expMax 1000; -alphaMax 0.6; +alphaMax 0.6; -g0 g0 [1 -1 -2 0 0 0 0 ] 1000 ; +g0 g0 [ 1 -1 -2 0 0 0 0 ] 1000; + +packingLimiter no; -packingLimiter no; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties index 657b38074e..9a08405bdb 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties @@ -2,40 +2,40 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// a is the discrete phase and -// b is the continuous phase - -// sand phasea { - rho rho [1 -3 0 0 0] 2640; - nu nu [0 2 -1 0 0] 1.0e-6; - d d [0 1 0 0 0 0 0] 480.0e-6; + rho rho [ 1 -3 0 0 0 ] 2640; + nu nu [ 0 2 -1 0 0 ] 1e-06; + d d [ 0 1 0 0 0 0 0 ] 0.00048; } -// air phaseb { - rho rho [1 -3 0 0 0] 1.28; - nu nu [0 2 -1 0 0] 1.328e-5; - d d [0 1 0 0 0 0 0] 1.0; + rho rho [ 1 -3 0 0 0 ] 1.28; + nu nu [ 0 2 -1 0 0 ] 1.328e-05; + d d [ 0 1 0 0 0 0 0 ] 1; } -Cvm Cvm [0 0 0 0 0] 0.0; -Cl Cl [0 0 0 0 0] 0.0; -Ct Ct [0 0 0 0 0] 0.0; -alphaAlpha alphaAlpha [0 0 0 0 0] 0.0; +Cvm Cvm [ 0 0 0 0 0 ] 0; + +Cl Cl [ 0 0 0 0 0 ] 0; + +Ct Ct [ 0 0 0 0 0 ] 0; + +alphaAlpha alphaAlpha [ 0 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict index 026a5ed2a4..8b29ef416e 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict @@ -2,19 +2,19 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -23,7 +23,7 @@ stopAt endTime; endTime 10; -deltaT 1e-3; +deltaT 0.001; writeControl adjustableRunTime; @@ -41,53 +41,15 @@ timeFormat general; timePrecision 6; -runTimeModifiable on; +runTimeModifiable on; adjustTimeStep yes; maxCo 0.5; -maxDeltaT 1; +maxDeltaT 1; -functions -( - fieldAverage1 - { - // Type of functionObject - type fieldAverage; +functions ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; fields ( Ua { mean on ; prime2Mean off ; base time ; } Ub { mean on ; prime2Mean off ; base time ; } alpha { mean on ; prime2Mean off ; base time ; } p { mean on ; prime2Mean off ; base time ; } ) ; } ); - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - - // Fields to be averaged - runTime modifiable - fields - ( - Ua - { - mean on; - prime2Mean off; - base time; - } - Ub - { - mean on; - prime2Mean off; - base time; - } - alpha - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes index e9a33d28ee..1e881ca7e5 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes @@ -2,14 +2,15 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -62,7 +63,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution index 2cd36751bd..7b4017d70c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution @@ -2,77 +2,91 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; - format ascii; + format binary; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p GAMG + p { - tolerance 1e-8; - relTol 0; - - smoother DIC; //GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; - Ua PBiCG + agglomerator faceAreaPair; + mergeLevels 1; + } + + Ua { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Ub PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Ub { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - alpha PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + alpha { - preconditioner DILU; - tolerance 1e-10; - relTol 0; - }; - beta PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-10; + relTol 0; + } + + beta { - preconditioner DILU; - tolerance 1e-10; - relTol 0; - }; - Theta PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-10; + relTol 0; + } + + Theta { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -85,4 +99,5 @@ PISO pRefValue 0; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties index 9a6e83d8de..803255b5a0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,37 +10,30 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Switch turbulence model on or off +turbulence on; -turbulence on; - -printCoeffs on; - -// Standard k-epsilon model coefficients -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +printCoeffs on; kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.375; - - alphak 1.0; - alphaEps 0.82142; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.375; + alphak 1; + alphaEps 0.82142; } -// Wall function coefficients -// ~~~~~~~~~~~~~~~~~~~~~~~~~~ - wallFunctionCoeffs { - kappa 0.4187; - E 9.0; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties index d7a56e9b2f..6a8eb74fb8 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/filterProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/filterProperties index 79c0a96d71..2ab1a87e80 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/filterProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/filterProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,17 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object filterProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -filter off; +filter off; -// filterNormal has to be in the direction of trapped particles -filterNormal (0 0 1); +filterNormal ( 0 0 1 ); -filterPosition filterPosition [0 1 0 0 0] (0 0 0.02); +filterPosition filterPosition [ 0 1 0 0 0 ] ( 0 0 0.02 ); + +filterThickness filterThickness [ 0 1 0 0 0 ] 1e-06; -filterThickness filterThickness [0 1 0 0 0] 1.0e-6; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties index e321ce4023..8b6c5044c9 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object interfacialProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dragModela GidaspowErgunWenYu; + dragModelb GidaspowErgunWenYu; dragPhase a; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties index 88224645ce..cd52e8b208 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,41 +10,43 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object kineticTheoryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -kineticTheory on; +kineticTheory on; -equilibrium on; +equilibrium on; -e e [ 0 0 0 0 0 0 0 ] 0.8 ; +e e [ 0 0 0 0 0 0 0 ] 0.8; -alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.62 ; +alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.62; -alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.65 ; +alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.65; -Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05 ; +Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05; -eta eta [ 0 0 0 0 0 0 0 ] 2.0 ; +eta eta [ 0 0 0 0 0 0 0 ] 2; -p p [ 0 0 0 0 0 0 0 ] 5.0 ; +p p [ 0 0 0 0 0 0 0 ] 5; -phi phi [ 0 0 0 0 0 0 0 ] 0.0 ; +phi phi [ 0 0 0 0 0 0 0 ] 0; -viscosityModel Gidaspow; +viscosityModel Gidaspow; -conductivityModel Gidaspow; +conductivityModel Gidaspow; -granularPressureModel Lun; +granularPressureModel Lun; -frictionalStressModel JohnsonJackson; +frictionalStressModel JohnsonJackson; -radialModel Gidaspow; +radialModel Gidaspow; HrenyaSinclairCoeffs { - L L [ 0 1 0 0 0 0 0 ] 5.0e-4 ; + L L [ 0 1 0 0 0 0 0 ] 0.0005; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary index e2e0e3a9f2..a861e9875c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev-8cbffd16687e | +| \\ / O peration | Version: 1.5-8cbffd16687e | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties index 1a484d0b9c..cb6ac970f0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object ppProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -preAlphaExp 500; +preAlphaExp 500; -expMax 1.0e+3; +expMax 1000; -alphaMax 0.62; +alphaMax 0.62; -g0 g0 [ 1 -1 -2 0 0 0 0 ] 0 ; +g0 g0 [ 1 -1 -2 0 0 0 0 ] 0; + +packingLimiter no; -packingLimiter no; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties index 02e67fa12a..c58d767175 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,32 +10,32 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// a is the discrete phase and -// b is the continuous phase - -// sand phasea { - rho rho [1 -3 0 0 0] 2500; - nu nu [0 2 -1 0 0] 1.0e-6; - d d [0 1 0 0 0 0 0] 300.0e-6; + rho rho [ 1 -3 0 0 0 ] 2500; + nu nu [ 0 2 -1 0 0 ] 1e-06; + d d [ 0 1 0 0 0 0 0 ] 0.0003; } -// air phaseb { - rho rho [1 -3 0 0 0] 1.2; - nu nu [0 2 -1 0 0] 1.5e-5; - d d [0 1 0 0 0 0 0] 1.0; + rho rho [ 1 -3 0 0 0 ] 1.2; + nu nu [ 0 2 -1 0 0 ] 1.5e-05; + d d [ 0 1 0 0 0 0 0 ] 1; } -Cvm Cvm [0 0 0 0 0] 0.0; -Cl Cl [0 0 0 0 0] 0.0; -Ct Ct [0 0 0 0 0] 0.0; -alphaAlpha alphaAlpha [0 0 0 0 0] 0.0; +Cvm Cvm [ 0 0 0 0 0 ] 0; + +Cl Cl [ 0 0 0 0 0 ] 0; + +Ct Ct [ 0 0 0 0 0 ] 0; + +alphaAlpha alphaAlpha [ 0 0 0 0 0 ] 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict index df4a5a205e..2a969d4d7a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom latestTime; startTime 0; @@ -23,7 +23,7 @@ stopAt endTime; endTime 2; -deltaT 5e-4; +deltaT 0.0005; writeControl adjustableRunTime; @@ -47,50 +47,9 @@ adjustTimeStep no; maxCo 0.9; -maxDeltaT 1e-5; +maxDeltaT 1e-05; -functions -( - fieldAverage1 - { - // Type of functionObject - type fieldAverage; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - - outputControl outputTime; - - // Fields to be averaged - runTime modifiable - fields - ( - Ua - { - mean on; - prime2Mean off; - base time; - } - Ub - { - mean on; - prime2Mean off; - base time; - } - alpha - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } - ); - } -); +functions ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; outputControl outputTime ; fields ( Ua { mean on ; prime2Mean off ; base time ; } Ub { mean on ; prime2Mean off ; base time ; } alpha { mean on ; prime2Mean off ; base time ; } p { mean on ; prime2Mean off ; base time ; } ) ; } ); // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes index e175e1530e..d007d55f78 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -29,13 +30,13 @@ divSchemes default none; div(phia,Ua) Gauss limitedLinearV 1; div(phib,Ub) Gauss limitedLinearV 1; - div(phib,k) Gauss limitedLinear 1; + div(phib,k) Gauss limitedLinear 1; div(phib,epsilon) Gauss limitedLinear 1; div(phi,alpha) Gauss limitedLinear01 1; div(phir,alpha) Gauss limitedLinear01 1; - div(phi,Theta) Gauss limitedLinear 1; - div(Rca) Gauss linear; - div(Rcb) Gauss linear; + div(phi,Theta) Gauss limitedLinear 1; + div(Rca) Gauss linear; + div(Rcb) Gauss linear; } laplacianSchemes @@ -64,7 +65,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution index 9fb3867d93..3c5f789ef5 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,69 +10,83 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p GAMG + p { - tolerance 1e-8; - relTol 0; - - smoother DIC; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; - Ua PBiCG + agglomerator faceAreaPair; + mergeLevels 1; + } + + Ua { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Ub PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Ub { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - alpha PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + alpha { - preconditioner DILU; - tolerance 1e-10; - relTol 0; - }; - beta PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-10; + relTol 0; + } + + beta { - preconditioner DILU; - tolerance 1e-10; - relTol 0; - }; - Theta PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-10; + relTol 0; + } + + Theta { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -96,4 +110,5 @@ relaxationFactors epsilon 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict index 6ea881e1f6..a25df870f6 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,26 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues -( - volScalarFieldValue alpha 0.0 -); +defaultFieldValues ( volScalarFieldValue alpha 0 ); -regions -( - boxToCell - { - box (0 0 -0.1) (0.15 0.5 0.1); +regions ( boxToCell { box ( 0 0 -0.1 ) ( 0.15 0.5 0.1 ) ; fieldValues ( volScalarFieldValue alpha 0.55 ) ; } ); - fieldValues - ( - volScalarFieldValue alpha 0.55 - ); - } -); // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties index 63f3e2fac1..b84915eafc 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,29 +10,31 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object RASProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASModel kEpsilon; +RASModel kEpsilon; -turbulence off; +turbulence off; -printCoeffs off; +printCoeffs off; kEpsilonCoeffs { - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; } wallFunctionCoeffs { - kappa 0.4187; - E 9; + kappa 0.4187; + E 9; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties index 03e0adce89..a866ff549f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,10 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object environmentalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -g g [0 1 -2 0 0 0 0] (0 -9.81 0); +g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties index 9c1430c9f1..28e9538668 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object interfacialProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dragModela SchillerNaumann; -dragModelb SchillerNaumann; +dragModela SchillerNaumann; + +dragModelb SchillerNaumann; + +dragPhase blended; -dragPhase blended; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties index 5477398396..3ac1fd2b30 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,41 +10,43 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object kineticTheoryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -kineticTheory off; +kineticTheory off; -equilibrium on; +equilibrium on; -e e [ 0 0 0 0 0 0 0 ] 0.9 ; +e e [ 0 0 0 0 0 0 0 ] 0.9; -alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6 ; +alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6; -alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5 ; +alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5; -Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05 ; +Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05; -eta eta [ 0 0 0 0 0 0 0 ] 2.0 ; +eta eta [ 0 0 0 0 0 0 0 ] 2; -p p [ 0 0 0 0 0 0 0 ] 5.0 ; +p p [ 0 0 0 0 0 0 0 ] 5; -phi phi [ 0 0 0 0 0 0 0 ] 25.0 ; +phi phi [ 0 0 0 0 0 0 0 ] 25; -viscosityModel Syamlal; +viscosityModel Syamlal; -conductivityModel HrenyaSinclair; +conductivityModel HrenyaSinclair; -granularPressureModel Lun; +granularPressureModel Lun; -frictionalStressModel JohnsonJackson; +frictionalStressModel JohnsonJackson; -radialModel Gidaspow; +radialModel Gidaspow; HrenyaSinclairCoeffs { - L L [ 0 1 0 0 0 0 0 ] 5.0e-4 ; + L L [ 0 1 0 0 0 0 0 ] 0.0005; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties index 9829a5d8d0..30e82b6435 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,18 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object ppProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -preAlphaExp 300; +preAlphaExp 300; -expMax 10.0; +expMax 10; -alphaMax 0.6; +alphaMax 0.6; -g0 g0 [ 1 -1 -2 0 0 0 0 ] 0 ; +g0 g0 [ 1 -1 -2 0 0 0 0 ] 0; + +packingLimiter off; -packingLimiter off; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties index a8b0138b70..fbea88e144 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,30 +10,30 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; 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; + nu nu [ 0 2 -1 0 0 0 0 ] 1e-06; + rho rho [ 1 -3 0 0 0 0 0 ] 1000; + 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; + nu nu [ 0 2 -1 0 0 0 0 ] 1.6e-05; + rho rho [ 1 -3 0 0 0 0 0 ] 1; + d d [ 0 1 0 0 0 0 0 ] 0.003; } -Cvm Cvm [0 0 0 0 0 0 0] 0.5; +Cvm Cvm [ 0 0 0 0 0 0 0 ] 0.5; -Cl Cl [0 0 0 0 0 0 0] 0; +Cl Cl [ 0 0 0 0 0 0 0 ] 0; + +Ct Ct [ 0 0 0 0 0 0 0 ] 1; -Ct Ct [0 0 0 0 0 0 0] 1.0; // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict index c2e280e5dc..342ea403e6 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -43,52 +43,13 @@ timePrecision 6; runTimeModifiable yes; -adjustTimeStep no; +adjustTimeStep no; -maxCo 0.5; +maxCo 0.5; -maxDeltaT 1; +maxDeltaT 1; -functions -( - fieldAverage1 - { - // Type of functionObject - type fieldAverage; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - - // Fields to be averaged - runTime modifiable - fields - ( - Ua - { - mean on; - prime2Mean off; - base time; - } - Ub - { - mean on; - prime2Mean off; - base time; - } - alpha - { - mean on; - prime2Mean off; - base time; - } - p - { - mean on; - prime2Mean off; - base time; - } - ); - } -); +functions ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; fields ( Ua { mean on ; prime2Mean off ; base time ; } Ub { mean on ; prime2Mean off ; base time ; } alpha { mean on ; prime2Mean off ; base time ; } p { mean on ; prime2Mean off ; base time ; } ) ; } ); // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes index 520b6d769f..ab97d5edfd 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -29,7 +30,7 @@ divSchemes default none; div(phia,Ua) Gauss limitedLinearV 1; div(phib,Ub) Gauss limitedLinearV 1; - div(phib,k) Gauss limitedLinear 1; + div(phib,k) Gauss limitedLinear 1; div(phib,epsilon) Gauss limitedLinear 1; div(phi,alpha) Gauss limitedLinear01 1; div(phir,alpha) Gauss limitedLinear01 1; @@ -62,7 +63,8 @@ snGradSchemes fluxRequired { default no; - p; + p ; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution index 9e33807320..2bc97a6bde 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,69 +10,83 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - p GAMG + p { - tolerance 1e-8; - relTol 0; - - smoother DIC; //GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - + solver GAMG; + tolerance 1e-08; + relTol 0; + smoother DIC; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; cacheAgglomeration true; nCellsInCoarsestLevel 10; - agglomerator faceAreaPair; - mergeLevels 1; - }; - Ua PBiCG + agglomerator faceAreaPair; + mergeLevels 1; + } + + Ua { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - Ub PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + Ub { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - alpha PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + alpha { - preconditioner DILU; - tolerance 1e-10; - relTol 0; - }; - beta PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-10; + relTol 0; + } + + beta { - preconditioner DILU; - tolerance 1e-10; - relTol 0; - }; - Theta PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-10; + relTol 0; + } + + Theta { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - k PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + k { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; - epsilon PBiCG + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + epsilon { - preconditioner DILU; - tolerance 1e-05; - relTol 0; - }; + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } } PISO @@ -85,4 +99,5 @@ PISO pRefValue 0; } + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties index e3320fa73f..3cfd7ac9ea 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,16 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object mechanicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rho rho [1 -3 0 0 0 0 0] 7854; +rho rho [ 1 -3 0 0 0 0 0 ] 7854; -nu nu [0 0 0 0 0 0 0] 0.3; +nu nu [ 0 0 0 0 0 0 0 ] 0.3; -E E [1 -1 -2 0 0 0 0] 2e+11; +E E [ 1 -1 -2 0 0 0 0 ] 2e+11; planeStress yes; + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties index 6976538445..cc2766f73f 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,16 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -C C [0 2 -2 -1 0 0 0] 434; +C C [ 0 2 -2 -1 0 0 0 ] 434; -k k [1 1 -3 -1 0 0 0] 60.5; +k k [ 1 1 -3 -1 0 0 0 ] 60.5; -alpha alpha [0 0 0 -1 0 0 0] 1.1e-05; +alpha alpha [ 0 0 0 -1 0 0 0 ] 1.1e-05; thermalStress no; + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict index 14218ed2cf..a6c2f2ec34 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - startFrom startTime; startTime 0; @@ -45,4 +45,5 @@ graphFormat raw; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes index 80a280328f..04aadf3244 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,13 +10,14 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // d2dt2Schemes { - default steadyState; + default steadyState; } gradSchemes @@ -56,4 +57,5 @@ fluxRequired T no; } + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution index 322eae2559..e940f183e1 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,41 +10,36 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - D GAMG + D { - tolerance 1e-06; - relTol 0.9; - - smoother GaussSeidel; - + solver GAMG; + tolerance 1e-06; + relTol 0.9; + smoother GaussSeidel; cacheAgglomeration true; - nCellsInCoarsestLevel 20; + agglomerator faceAreaPair; + mergeLevels 1; + } - agglomerator faceAreaPair; - mergeLevels 1; - }; - - T GAMG + T { - tolerance 1e-06; - relTol 0.9; - - smoother GaussSeidel; - + solver GAMG; + tolerance 1e-06; + relTol 0.9; + smoother GaussSeidel; cacheAgglomeration true; - nCellsInCoarsestLevel 20; - - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } } stressAnalysis @@ -54,4 +49,5 @@ stressAnalysis D 1e-06; } + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict index 3fa6bffca4..db2a9715f2 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,32 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object sampleDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPoint; -setFormat raw; +setFormat raw; -sets -( - leftPatch - { - type uniform; - axis y; - start (0 0.5 0.25); - end (0 2 0.25); - nPoints 100; - } -); +sets ( leftPatch { type uniform ; axis y ; start ( 0 0.5 0.25 ) ; end ( 0 2 0.25 ) ; nPoints 100 ; } ); -surfaces -(); +surfaces ( ); + +fields ( sigmaxx ); -fields -( - sigmaxx -); // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict index 48cc2fbe89..71e26c1837 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,27 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - object sampleDict; + location "system"; + object sampleSurfaceDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // interpolationScheme cellPoint; -surfaceFormat dx; +surfaceFormat dx; -surfaces -( - constantPlane - { - name plate; - basePoint (0 0 0.25); - normalVector (0 0 1); - } -); +surfaces ( constantPlane { name plate ; basePoint ( 0 0 0.25 ) ; normalVector ( 0 0 1 ) ; } ); + +fields ( sigmaxx ); -fields -( - sigmaxx -); // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties index 247cf4f822..fa331e2c1d 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,14 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object mechanicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -rho rho [1 -3 0 0 0 0 0] 7854; -E E [1 -1 -2 0 0 0 0] 2e+11; -nu nu [0 0 0 0 0 0 0] 0.0; -planeStress yes; +rho rho [ 1 -3 0 0 0 0 0 ] 7854; + +E E [ 1 -1 -2 0 0 0 0 ] 2e+11; + +nu nu [ 0 0 0 0 0 0 0 ] 0; + +planeStress yes; + // ************************************************************************* // - diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties index 6976538445..cc2766f73f 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,16 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object thermalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -C C [0 2 -2 -1 0 0 0] 434; +C C [ 0 2 -2 -1 0 0 0 ] 434; -k k [1 1 -3 -1 0 0 0] 60.5; +k k [ 1 1 -3 -1 0 0 0 ] 60.5; -alpha alpha [0 0 0 -1 0 0 0] 1.1e-05; +alpha alpha [ 0 0 0 -1 0 0 0 ] 1.1e-05; thermalStress no; + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict index a4cb735f88..70865b72da 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -40,4 +41,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org index 40023235e7..4118e538da 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,7 +10,8 @@ FoamFile version 2.0; format ascii; class dictionary; - object controlDict; + location "system"; + object controlDict.org; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,7 +27,7 @@ deltaT 2e-05; writeControl runTime; -writeInterval 2.5e-02; +writeInterval 0.025; purgeWrite 0; @@ -40,4 +41,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes index 46da299431..8a9bcb77cf 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,23 +10,24 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // d2dt2Schemes { - default steadyState; + default steadyState; } gradSchemes { - default Gauss cubic; //fourth; //Gauss linear; + default Gauss cubic; } divSchemes { - default Gauss cubic; //Gauss linear; + default Gauss cubic; } laplacianSchemes @@ -47,7 +48,8 @@ snGradSchemes fluxRequired { default no; - D; + D ; } + // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution index 1263539c22..eef2e5a2db 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution @@ -2,7 +2,7 @@ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,48 +10,44 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - D GAMG + D { - tolerance 1e-06; - relTol 0.99; - - smoother GaussSeidel; - + solver GAMG; + tolerance 1e-06; + relTol 0.99; + smoother GaussSeidel; cacheAgglomeration true; - nCellsInCoarsestLevel 6; + agglomerator faceAreaPair; + mergeLevels 1; + } - agglomerator faceAreaPair; - mergeLevels 1; - }; - - Dcorr GAMG + Dcorr { - tolerance 1e-06; - relTol 0.99; - - smoother GaussSeidel; - + solver GAMG; + tolerance 1e-06; + relTol 0.99; + smoother GaussSeidel; cacheAgglomeration true; - nCellsInCoarsestLevel 6; - - agglomerator faceAreaPair; - mergeLevels 1; - }; + agglomerator faceAreaPair; + mergeLevels 1; + } } stressAnalysis { - nCorrectors 1; - D 1e-10; + nCorrectors 1; + D 1e-10; accelerationFactor 2; } + // ************************************************************************* //